diff options
Diffstat (limited to 'src')
500 files changed, 45223 insertions, 25216 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index fabc76d581..ca00a5373f 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -222,7 +222,10 @@ public class GT_Mod implements IGT_Mod { Configuration tMainConfig = GT_PreLoad.getConfiguration(aEvent.getModConfigurationDirectory()); GT_PreLoad.initCompat(); - GT_PreLoad.createLogFiles(aEvent.getModConfigurationDirectory().getParentFile(), tMainConfig); + GT_PreLoad.createLogFiles( + aEvent.getModConfigurationDirectory() + .getParentFile(), + tMainConfig); gregtechproxy.onPreLoad(); @@ -239,7 +242,9 @@ public class GT_Mod implements IGT_Mod { GT_Log.out.println("GT_Mod: Saving Main Config"); tMainConfig.save(); - GT_PreLoad.initLocalization(aEvent.getModConfigurationDirectory().getParentFile()); + GT_PreLoad.initLocalization( + aEvent.getModConfigurationDirectory() + .getParentFile()); GT_PreLoad.adjustScrap(); EntityRegistry.registerModEntity(GT_Entity_Arrow.class, "GT_Entity_Arrow", 1, GT_Values.GT, 160, 1, true); @@ -279,7 +284,10 @@ public class GT_Mod implements IGT_Mod { } } - if (FMLCommonHandler.instance().getEffectiveSide().isServer()) GT_Assemblyline_Server.fillMap(aEvent); + if (FMLCommonHandler.instance() + .getEffectiveSide() + .isServer()) + GT_Assemblyline_Server.fillMap(aEvent); } @Mod.EventHandler @@ -441,8 +449,10 @@ public class GT_Mod implements IGT_Mod { aThermalCentrifugeRecipeList); if (GT_Values.D1) { - GT_ModHandler.sSingleNonBlockDamagableRecipeList - .forEach(iRecipe -> GT_Log.out.println("=> " + iRecipe.getRecipeOutput().getDisplayName())); + GT_ModHandler.sSingleNonBlockDamagableRecipeList.forEach( + iRecipe -> GT_Log.out.println( + "=> " + iRecipe.getRecipeOutput() + .getDisplayName())); } new GT_CraftingRecipeLoader().run(); if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "ic2forgehammer", true)) { @@ -463,8 +473,13 @@ public class GT_Mod implements IGT_Mod { } if (GregTech_API.mAE2) { GT_MetaTileEntity_DigitalChestBase.registerAEIntegration(); - ItemStack facade = AEApi.instance().definitions().items().facade().maybeItem() - .transform(i -> new ItemStack(i, 1, GT_Values.W)).orNull(); + ItemStack facade = AEApi.instance() + .definitions() + .items() + .facade() + .maybeItem() + .transform(i -> new ItemStack(i, 1, GT_Values.W)) + .orNull(); if (facade != null) { GregTech_API.registerCover(facade, null, new GT_Cover_FacadeAE()); } @@ -474,10 +489,13 @@ public class GT_Mod implements IGT_Mod { new String[] { "blastfurnace", "blockcutter", "inductionFurnace", "generator", "windMill", "waterMill", "solarPanel", "centrifuge", "electrolyzer", "compressor", "electroFurnace", "extractor", "macerator", "recycler", "metalformer", "orewashingplant", "massFabricator", "replicator", }) - .filter( - tName -> GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, aTextIC2 + tName, true)) - .map(tName -> GT_ModHandler.getIC2Item(tName, 1L)).forEach(GT_ModHandler::removeRecipeByOutputDelayed); + .filter( + tName -> GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, + aTextIC2 + tName, + true)) + .map(tName -> GT_ModHandler.getIC2Item(tName, 1L)) + .forEach(GT_ModHandler::removeRecipeByOutputDelayed); GT_PostLoad.nerfVanillaTools(); new GT_ExtremeDieselFuelLoader().run(); @@ -595,61 +613,110 @@ public class GT_Mod implements IGT_Mod { ArrayList<ItemStack> tStacks = new ArrayList<>(10000); GT_Log.out.println("GT_Mod: IC2 Machines"); - ic2.api.recipe.Recipes.cannerBottle.getRecipes().values().stream().map(t -> t.items).forEach(tStacks::addAll); - ic2.api.recipe.Recipes.centrifuge.getRecipes().values().stream().map(t -> t.items).forEach(tStacks::addAll); - ic2.api.recipe.Recipes.compressor.getRecipes().values().stream().map(t -> t.items).forEach(tStacks::addAll); - ic2.api.recipe.Recipes.extractor.getRecipes().values().stream().map(t -> t.items).forEach(tStacks::addAll); - ic2.api.recipe.Recipes.macerator.getRecipes().values().stream().map(t -> t.items).forEach(tStacks::addAll); - ic2.api.recipe.Recipes.metalformerCutting.getRecipes().values().stream().map(t -> t.items) - .forEach(tStacks::addAll); - ic2.api.recipe.Recipes.metalformerExtruding.getRecipes().values().stream().map(t -> t.items) - .forEach(tStacks::addAll); - ic2.api.recipe.Recipes.metalformerRolling.getRecipes().values().stream().map(t -> t.items) - .forEach(tStacks::addAll); - ic2.api.recipe.Recipes.matterAmplifier.getRecipes().values().stream().map(t -> t.items) - .forEach(tStacks::addAll); - ic2.api.recipe.Recipes.oreWashing.getRecipes().values().stream().map(t -> t.items).forEach(tStacks::addAll); + ic2.api.recipe.Recipes.cannerBottle.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.centrifuge.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.compressor.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.extractor.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.macerator.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.metalformerCutting.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.metalformerExtruding.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.metalformerRolling.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.matterAmplifier.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); + ic2.api.recipe.Recipes.oreWashing.getRecipes() + .values() + .stream() + .map(t -> t.items) + .forEach(tStacks::addAll); GT_Log.out.println("GT_Mod: Dungeon Loot"); - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("dungeonChest").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("dungeonChest") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("bonusChest").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("bonusChest") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("villageBlacksmith").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("villageBlacksmith") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("strongholdCrossing").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("strongholdCrossing") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("strongholdLibrary").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("strongholdLibrary") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("strongholdCorridor").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("strongholdCorridor") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("pyramidJungleDispenser") - .getItems(new XSTR())) { + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("pyramidJungleChest").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("pyramidJungleChest") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("pyramidDesertyChest").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("pyramidDesertyChest") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } - for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("mineshaftCorridor").getItems(new XSTR())) { + for (WeightedRandomChestContent tContent : ChestGenHooks.getInfo("mineshaftCorridor") + .getItems(new XSTR())) { tStacks.add(tContent.theItemId); } GT_Log.out.println("GT_Mod: Smelting"); // noinspection unchecked// Deal with legacy Minecraft raw types - FurnaceRecipes.smelting().getSmeltingList().values().forEach(k -> tStacks.add((ItemStack) k)); + FurnaceRecipes.smelting() + .getSmeltingList() + .values() + .forEach(k -> tStacks.add((ItemStack) k)); if (gregtechproxy.mCraftingUnification) { GT_Log.out.println("GT_Mod: Crafting Recipes"); - for (Object tRecipe : CraftingManager.getInstance().getRecipeList()) { + for (Object tRecipe : CraftingManager.getInstance() + .getRecipeList()) { if ((tRecipe instanceof IRecipe)) { tStacks.add(((IRecipe) tRecipe).getRecipeOutput()); } @@ -662,8 +729,8 @@ public class GT_Mod implements IGT_Mod { "A Recipe used an OreDict Item as Output directly, without copying it before!!! This is a typical CallByReference/CallByValue Error"); GT_FML_LOGGER.error( "Said Item will be renamed to make the invalid Recipe visible, so that you can report it properly."); - GT_FML_LOGGER - .error("Please check all Recipes outputting this Item, and report the Recipes to their Owner."); + GT_FML_LOGGER.error( + "Please check all Recipes outputting this Item, and report the Recipes to their Owner."); GT_FML_LOGGER.error( "The Owner of the ==>RECIPE<==, NOT the Owner of the Item, which has been mentioned above!!!"); GT_FML_LOGGER.error( @@ -675,8 +742,8 @@ public class GT_Mod implements IGT_Mod { GT_FML_LOGGER.error("And speaking of failed Reports:"); GT_FML_LOGGER.error( "Both IC2 and GregTech CANNOT be the CAUSE of this Problem, so don't report it to either of them."); - GT_FML_LOGGER - .error("I REPEAT, BOTH, IC2 and GregTech CANNOT be the source of THIS BUG. NO MATTER WHAT."); + GT_FML_LOGGER.error( + "I REPEAT, BOTH, IC2 and GregTech CANNOT be the source of THIS BUG. NO MATTER WHAT."); GT_FML_LOGGER.error( "Asking in the IC2 Forums, which Mod is causing that, won't help anyone, since it is not possible to determine, which Mod it is."); GT_FML_LOGGER.error( diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index d8ad1ca07b..7a8b495a4b 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -185,12 +185,13 @@ public class GregTech_API { sHeatHazmatList = new GT_HashSet<>(), sRadioHazmatList = new GT_HashSet<>(), sElectroHazmatList = new GT_HashSet<>(); - private static final Multimap<Integer, ItemStack> sRealConfigurationList = Multimaps - .newListMultimap(new TreeMap<>(), ArrayList::new); + private static final Multimap<Integer, ItemStack> sRealConfigurationList = Multimaps.newListMultimap( + new TreeMap<>(), + ArrayList::new); private static final Map<Integer, List<ItemStack>> sConfigurationLists = new ConcurrentHashMap<>(); private static final Map<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> sRealCircuitProgrammerList = new LinkedHashMap<>(); - public static final Map<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> sCircuitProgrammerList = Collections - .unmodifiableMap(sRealCircuitProgrammerList); + public static final Map<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> sCircuitProgrammerList = Collections.unmodifiableMap( + sRealCircuitProgrammerList); /** * The List of Dimensions, which are Whitelisted for the Teleporter. This list should not contain other Planets. @@ -455,34 +456,36 @@ public class GregTech_API { int aTier, int aDamageEnergyCost, int aSpecials, double aArmorAbsorbtionPercentage, boolean aChargeProvider, int aType, int aArmorIndex) { try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmorIC_Item").getConstructors()[0].newInstance( - aUnlocalized, - aEnglish, - aCharge, - aTransfer, - aTier, - aDamageEnergyCost, - aSpecials, - aArmorAbsorbtionPercentage, - aChargeProvider, - aType, - aArmorIndex); + return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmorIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aCharge, + aTransfer, + aTier, + aDamageEnergyCost, + aSpecials, + aArmorAbsorbtionPercentage, + aChargeProvider, + aType, + aArmorIndex); } catch (Throwable e) { /* Do nothing */ } try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmor_Item").getConstructors()[0].newInstance( - aUnlocalized, - aEnglish, - aCharge, - aTransfer, - aTier, - aDamageEnergyCost, - aSpecials, - aArmorAbsorbtionPercentage, - aChargeProvider, - aType, - aArmorIndex); + return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmor_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aCharge, + aTransfer, + aTier, + aDamageEnergyCost, + aSpecials, + aArmorAbsorbtionPercentage, + aChargeProvider, + aType, + aArmorIndex); } catch (Throwable e) { /* Do nothing */ } @@ -499,14 +502,28 @@ public class GregTech_API { public static Item constructElectricEnergyStorageItem(String aUnlocalized, String aEnglish, int aCharge, int aTransfer, int aTier, int aEmptyID, int aFullID) { try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStoreIC_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aCharge, aTransfer, aTier, aEmptyID, aFullID); + return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStoreIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aCharge, + aTransfer, + aTier, + aEmptyID, + aFullID); } catch (Throwable e) { /* Do nothing */ } try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStore_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aCharge, aTransfer, aTier, aEmptyID, aFullID); + return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStore_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aCharge, + aTransfer, + aTier, + aEmptyID, + aFullID); } catch (Throwable e) { /* Do nothing */ } @@ -523,8 +540,12 @@ public class GregTech_API { public static GT_Tool_Item constructHardHammerItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_HardHammer_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_HardHammer_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage); } catch (Throwable e) { /* Do nothing */ } @@ -543,14 +564,22 @@ public class GregTech_API { public static GT_Tool_Item constructCrowbarItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_CrowbarRC_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_CrowbarRC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage); } catch (Throwable e) { /* Do nothing */ } try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Crowbar_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Crowbar_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage); } catch (Throwable e) { /* Do nothing */ } @@ -569,8 +598,13 @@ public class GregTech_API { public static GT_Tool_Item constructWrenchItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Wrench_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Wrench_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage, + aDisChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -589,8 +623,13 @@ public class GregTech_API { public static GT_Tool_Item constructElectricScrewdriverItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_ScrewdriverIC_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_ScrewdriverIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage, + aDisChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -609,8 +648,13 @@ public class GregTech_API { public static GT_Tool_Item constructElectricWrenchItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_WrenchIC_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_WrenchIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage, + aDisChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -630,15 +674,16 @@ public class GregTech_API { int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_SawIC_Item").getConstructors()[0].newInstance( - aUnlocalized, - aEnglish, - aMaxDamage, - aEntityDamage, - aToolQuality, - aToolStrength, - aEnergyConsumptionPerBlockBreak, - aDisChargedGTID); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_SawIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage, + aToolQuality, + aToolStrength, + aEnergyConsumptionPerBlockBreak, + aDisChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -658,16 +703,16 @@ public class GregTech_API { int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_DrillIC_Item").getConstructors()[0] - .newInstance( - aUnlocalized, - aEnglish, - aMaxDamage, - aEntityDamage, - aToolQuality, - aToolStrength, - aEnergyConsumptionPerBlockBreak, - aDisChargedGTID); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_DrillIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage, + aToolQuality, + aToolStrength, + aEnergyConsumptionPerBlockBreak, + aDisChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -686,8 +731,13 @@ public class GregTech_API { public static GT_Tool_Item constructElectricSolderingToolItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_SolderingToolIC_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_SolderingToolIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage, + aDisChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -706,8 +756,12 @@ public class GregTech_API { public static GT_Tool_Item constructEmptyElectricToolItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_EmptyToolIC_Item").getConstructors()[0] - .newInstance(aUnlocalized, aEnglish, aMaxDamage, aChargedGTID); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_EmptyToolIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -763,8 +817,10 @@ public class GregTech_API { sRealConfigurationList.put(minTier, stack); for (Map.Entry<Integer, List<ItemStack>> e : sConfigurationLists.entrySet()) { if (e.getKey() >= minTier) { - e.getValue().add(stack); - e.getValue().sort(getConfigurationCircuitsComparator()); + e.getValue() + .add(stack); + e.getValue() + .sort(getConfigurationCircuitsComparator()); } } } @@ -780,9 +836,12 @@ public class GregTech_API { return Collections.unmodifiableList( sConfigurationLists.computeIfAbsent( machineTier, - (t) -> sRealConfigurationList.entries().stream().filter(e -> e.getKey() <= machineTier) - .map(Map.Entry::getValue).sorted(getConfigurationCircuitsComparator()) - .collect(Collectors.toList()))); + (t) -> sRealConfigurationList.entries() + .stream() + .filter(e -> e.getKey() <= machineTier) + .map(Map.Entry::getValue) + .sorted(getConfigurationCircuitsComparator()) + .collect(Collectors.toList()))); } public static Comparator<ItemStack> getConfigurationCircuitsComparator() { @@ -794,7 +853,9 @@ public class GregTech_API { return GT_Mod.gregtechproxy.mCircuitsOrder.getOrDefault( String.valueOf(GameRegistry.findUniqueIdentifierFor(is.getItem())), Integer.MAX_VALUE); - }).thenComparing(ItemStack::getUnlocalizedName).thenComparing(ItemStack::getItemDamage); + }) + .thenComparing(ItemStack::getUnlocalizedName) + .thenComparing(ItemStack::getItemDamage); } public static void registerCircuitProgrammer(ItemStack stack, boolean ignoreNBT, boolean useContainer) { @@ -802,8 +863,11 @@ public class GregTech_API { } public static void registerCircuitProgrammer(Predicate<ItemStack> predicate, boolean useContainer) { - sRealCircuitProgrammerList - .put(predicate, useContainer ? (s, p) -> s.getItem().getContainerItem(s) : (s, p) -> s); + sRealCircuitProgrammerList.put( + predicate, + useContainer ? (s, p) -> s.getItem() + .getContainerItem(s) + : (s, p) -> s); } public static void registerCircuitProgrammer(Predicate<ItemStack> predicate, @@ -994,7 +1058,9 @@ public class GregTech_API { */ public static boolean registerTool(ItemStack aTool, Collection<GT_ItemStack> aToolList) { if (aTool == null || GT_Utility.isStackInList(aTool, sToolList) - || (!aTool.getItem().isDamageable() && !GT_ModHandler.isElectricItem(aTool) + || (!aTool.getItem() + .isDamageable() + && !GT_ModHandler.isElectricItem(aTool) && !(aTool.getItem() instanceof IDamagableItem))) return false; aToolList.add(new GT_ItemStack(GT_Utility.copyAmount(1, aTool))); diff --git a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java b/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java index 52fd3b1134..e48b3e5b19 100644 --- a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java +++ b/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java @@ -46,14 +46,22 @@ public class Enchantment_EnderDamage extends EnchantmentDamage { @Override public void func_151367_b(EntityLivingBase aHurtEntity, Entity aDamagingEntity, int aLevel) { if ((aHurtEntity instanceof EntityEnderman || aHurtEntity instanceof EntityDragon - || (aHurtEntity.getClass().getName().contains(".") && aHurtEntity.getClass().getName() - .substring(aHurtEntity.getClass().getName().lastIndexOf(".")).contains("Ender")))) { + || (aHurtEntity.getClass() + .getName() + .contains(".") + && aHurtEntity.getClass() + .getName() + .substring( + aHurtEntity.getClass() + .getName() + .lastIndexOf(".")) + .contains("Ender")))) { // Weakness causes Endermen to not be able to teleport with GT being installed. - aHurtEntity - .addPotionEffect(new PotionEffect(Potion.weakness.id, aLevel * 200, Math.max(1, (5 * aLevel) / 7))); + aHurtEntity.addPotionEffect( + new PotionEffect(Potion.weakness.id, aLevel * 200, Math.max(1, (5 * aLevel) / 7))); // They also get Poisoned. If you have this Enchant on an Arrow, you can kill the Ender Dragon easier. - aHurtEntity - .addPotionEffect(new PotionEffect(Potion.poison.id, aLevel * 200, Math.max(1, (5 * aLevel) / 7))); + aHurtEntity.addPotionEffect( + new PotionEffect(Potion.poison.id, aLevel * 200, Math.max(1, (5 * aLevel) / 7))); } } diff --git a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java b/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java index 34035c9457..bf4cc00be4 100644 --- a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java +++ b/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java @@ -18,11 +18,16 @@ public class Enchantment_Radioactivity extends EnchantmentDamage { public Enchantment_Radioactivity() { super(GT_Config.addIDConfig(ConfigCategories.IDs.enchantments, "Radioactivity", 14), 0, -1); GT_LanguageManager.addStringLocalization(getName(), "Radioactivity"); - Materials.Plutonium.setEnchantmentForTools(this, 1).setEnchantmentForArmors(this, 1); - Materials.Uranium235.setEnchantmentForTools(this, 2).setEnchantmentForArmors(this, 2); - Materials.Plutonium241.setEnchantmentForTools(this, 3).setEnchantmentForArmors(this, 3); - Materials.NaquadahEnriched.setEnchantmentForTools(this, 4).setEnchantmentForArmors(this, 4); - Materials.Naquadria.setEnchantmentForTools(this, 5).setEnchantmentForArmors(this, 5); + Materials.Plutonium.setEnchantmentForTools(this, 1) + .setEnchantmentForArmors(this, 1); + Materials.Uranium235.setEnchantmentForTools(this, 2) + .setEnchantmentForArmors(this, 2); + Materials.Plutonium241.setEnchantmentForTools(this, 3) + .setEnchantmentForArmors(this, 3); + Materials.NaquadahEnriched.setEnchantmentForTools(this, 4) + .setEnchantmentForArmors(this, 4); + Materials.Naquadria.setEnchantmentForTools(this, 5) + .setEnchantmentForArmors(this, 5); INSTANCE = this; } diff --git a/src/main/java/gregtech/api/enums/GT_HatchElement.java b/src/main/java/gregtech/api/enums/GT_HatchElement.java index 8d8603a10e..ac8dc7c4dd 100644 --- a/src/main/java/gregtech/api/enums/GT_HatchElement.java +++ b/src/main/java/gregtech/api/enums/GT_HatchElement.java @@ -86,7 +86,8 @@ public enum GT_HatchElement implements IHatchElement<GT_MetaTileEntity_MultiBloc @Override public long count(GT_MetaTileEntity_MultiBlockBase t) { - return t.getExoticEnergyHatches().size(); + return t.getExoticEnergyHatches() + .size(); } },; diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index 6ccf092461..eb742c902f 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -86,9 +86,13 @@ public class GT_Values { * tier. These leave a bit of headroom for cable and transformer losses, but not enough to make it a great gain. */ // this will correctly map ULV to 7. - public static final long[] VP = Arrays.stream(V).map( - i -> BigInteger.valueOf(i).multiply(BigInteger.valueOf(30)).divide(BigInteger.valueOf(32)).longValueExact()) - .toArray(); + public static final long[] VP = Arrays.stream(V) + .map( + i -> BigInteger.valueOf(i) + .multiply(BigInteger.valueOf(30)) + .divide(BigInteger.valueOf(32)) + .longValueExact()) + .toArray(); // Why -7? Mystery of the universe. Something may break if you change this so please do not without extensive // testing. // TODO:Adding that in coremod!!! diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 25957078aa..e1b6ada3e6 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -2163,8 +2163,12 @@ public enum ItemList implements IItemContainer { StringBuilder tCamelCasedDisplayNameBuilder = new StringBuilder(); final String[] tDisplayNameWords = aDisplayName.split("\\W"); for (String tWord : tDisplayNameWords) { - if (tWord.length() > 0) tCamelCasedDisplayNameBuilder.append(tWord.substring(0, 1).toUpperCase(Locale.US)); - if (tWord.length() > 1) tCamelCasedDisplayNameBuilder.append(tWord.substring(1).toLowerCase(Locale.US)); + if (tWord.length() > 0) tCamelCasedDisplayNameBuilder.append( + tWord.substring(0, 1) + .toUpperCase(Locale.US)); + if (tWord.length() > 1) tCamelCasedDisplayNameBuilder.append( + tWord.substring(1) + .toLowerCase(Locale.US)); } if (tCamelCasedDisplayNameBuilder.length() == 0) { // CamelCased DisplayName is empty, so use hash of aDisplayName diff --git a/src/main/java/gregtech/api/enums/MaterialBuilder.java b/src/main/java/gregtech/api/enums/MaterialBuilder.java index d265faae8e..fd131bbc8c 100644 --- a/src/main/java/gregtech/api/enums/MaterialBuilder.java +++ b/src/main/java/gregtech/api/enums/MaterialBuilder.java @@ -42,7 +42,8 @@ public class MaterialBuilder { public MaterialBuilder(int metaItemSubID, TextureSet iconSet, String defaultLocalName) { this.metaItemSubID = metaItemSubID; this.iconSet = iconSet; - this.name = defaultLocalName.replace(" ", "").replace("-", ""); + this.name = defaultLocalName.replace(" ", "") + .replace("-", ""); this.defaultLocalName = defaultLocalName; } @@ -72,7 +73,8 @@ public class MaterialBuilder { color, extraData, materialList, - aspects).setHasCorrespondingFluid(hasCorrespondingFluid).setHasCorrespondingGas(hasCorrespondingGas) + aspects).setHasCorrespondingFluid(hasCorrespondingFluid) + .setHasCorrespondingGas(hasCorrespondingGas) .setCanBeCracked(canBeCracked); } diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 3ff4d70920..c64b7a6d14 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1329,9 +1329,12 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { aColor); mExtraData = aExtraData; mMaterialList.addAll(aMaterialList); - if (mMaterialList.size() == 1) mChemicalFormula = mMaterialList.get(0).toString(true); - else mChemicalFormula = mMaterialList.stream().map(MaterialStack::toString).collect(Collectors.joining()) - .replaceAll("_", "-"); + if (mMaterialList.size() == 1) mChemicalFormula = mMaterialList.get(0) + .toString(true); + else mChemicalFormula = mMaterialList.stream() + .map(MaterialStack::toString) + .collect(Collectors.joining()) + .replaceAll("_", "-"); int tAmountOfComponents = 0, tMeltingPoint = 0; for (MaterialStack tMaterial : mMaterialList) { @@ -1352,18 +1355,39 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void setSmeltingInto() { - SamariumMagnetic.setSmeltingInto(Samarium).setMaceratingInto(Samarium).setArcSmeltingInto(Samarium); - NeodymiumMagnetic.setSmeltingInto(Neodymium).setMaceratingInto(Neodymium).setArcSmeltingInto(Neodymium); - SteelMagnetic.setSmeltingInto(Steel).setMaceratingInto(Steel).setArcSmeltingInto(Steel); - Iron.setSmeltingInto(Iron).setMaceratingInto(Iron).setArcSmeltingInto(WroughtIron); - AnyIron.setSmeltingInto(Iron).setMaceratingInto(Iron).setArcSmeltingInto(WroughtIron); - PigIron.setSmeltingInto(Iron).setMaceratingInto(Iron).setArcSmeltingInto(WroughtIron); - WroughtIron.setSmeltingInto(WroughtIron).setMaceratingInto(WroughtIron).setArcSmeltingInto(WroughtIron); - IronMagnetic.setSmeltingInto(Iron).setMaceratingInto(Iron).setArcSmeltingInto(WroughtIron); - Copper.setSmeltingInto(Copper).setMaceratingInto(Copper).setArcSmeltingInto(AnnealedCopper); - AnyCopper.setSmeltingInto(Copper).setMaceratingInto(Copper).setArcSmeltingInto(AnnealedCopper); - AnnealedCopper.setSmeltingInto(AnnealedCopper).setMaceratingInto(AnnealedCopper) - .setArcSmeltingInto(AnnealedCopper); + SamariumMagnetic.setSmeltingInto(Samarium) + .setMaceratingInto(Samarium) + .setArcSmeltingInto(Samarium); + NeodymiumMagnetic.setSmeltingInto(Neodymium) + .setMaceratingInto(Neodymium) + .setArcSmeltingInto(Neodymium); + SteelMagnetic.setSmeltingInto(Steel) + .setMaceratingInto(Steel) + .setArcSmeltingInto(Steel); + Iron.setSmeltingInto(Iron) + .setMaceratingInto(Iron) + .setArcSmeltingInto(WroughtIron); + AnyIron.setSmeltingInto(Iron) + .setMaceratingInto(Iron) + .setArcSmeltingInto(WroughtIron); + PigIron.setSmeltingInto(Iron) + .setMaceratingInto(Iron) + .setArcSmeltingInto(WroughtIron); + WroughtIron.setSmeltingInto(WroughtIron) + .setMaceratingInto(WroughtIron) + .setArcSmeltingInto(WroughtIron); + IronMagnetic.setSmeltingInto(Iron) + .setMaceratingInto(Iron) + .setArcSmeltingInto(WroughtIron); + Copper.setSmeltingInto(Copper) + .setMaceratingInto(Copper) + .setArcSmeltingInto(AnnealedCopper); + AnyCopper.setSmeltingInto(Copper) + .setMaceratingInto(Copper) + .setArcSmeltingInto(AnnealedCopper); + AnnealedCopper.setSmeltingInto(AnnealedCopper) + .setMaceratingInto(AnnealedCopper) + .setArcSmeltingInto(AnnealedCopper); Netherrack.setSmeltingInto(NetherBrick); MeatRaw.setSmeltingInto(MeatCooked); Sand.setSmeltingInto(Glass); @@ -1378,18 +1402,29 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void setDirectSmelting() { - Cinnabar.setDirectSmelting(Mercury).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT).add(SubTag.SMELTING_TO_GEM); - Tetrahedrite.setDirectSmelting(Copper).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) - .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); - Chalcopyrite.setDirectSmelting(Copper).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) - .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); - Malachite.setDirectSmelting(Copper).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); - Pentlandite.setDirectSmelting(Nickel).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); - Sphalerite.setDirectSmelting(Zinc).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); - Pyrite.setDirectSmelting(Iron).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); - BasalticMineralSand.setDirectSmelting(Iron).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); - GraniticMineralSand.setDirectSmelting(Iron).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); - YellowLimonite.setDirectSmelting(Iron).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + Cinnabar.setDirectSmelting(Mercury) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) + .add(SubTag.SMELTING_TO_GEM); + Tetrahedrite.setDirectSmelting(Copper) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + Chalcopyrite.setDirectSmelting(Copper) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + Malachite.setDirectSmelting(Copper) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + Pentlandite.setDirectSmelting(Nickel) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + Sphalerite.setDirectSmelting(Zinc) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + Pyrite.setDirectSmelting(Iron) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + BasalticMineralSand.setDirectSmelting(Iron) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + GraniticMineralSand.setDirectSmelting(Iron) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + YellowLimonite.setDirectSmelting(Iron) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); BrownLimonite.setDirectSmelting(Iron); BandedIron.setDirectSmelting(Iron); Magnetite.setDirectSmelting(Iron); @@ -1399,8 +1434,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Garnierite.setDirectSmelting(Nickel); Cobaltite.setDirectSmelting(Cobalt); Stibnite.setDirectSmelting(Antimony); - Cooperite.setDirectSmelting(Platinum).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); - Molybdenite.setDirectSmelting(Molybdenum).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + Cooperite.setDirectSmelting(Platinum) + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + Molybdenite.setDirectSmelting(Molybdenum) + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); Galena.setDirectSmelting(Lead); RoastedIron.setDirectSmelting(Iron); RoastedAntimony.setDirectSmelting(Antimony); @@ -1413,35 +1450,69 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void setMultipliers() { - Amber.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedAir.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedFire.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedEarth.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedWater.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedEntropy.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedOrder.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedVis.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedDull.setOreMultiplier(2).setSmeltingMultiplier(2); - Salt.setOreMultiplier(2).setSmeltingMultiplier(2); - RockSalt.setOreMultiplier(2).setSmeltingMultiplier(2); - Scheelite.setOreMultiplier(2).setSmeltingMultiplier(2); - Tungstate.setOreMultiplier(2).setSmeltingMultiplier(2); - Cassiterite.setOreMultiplier(2).setSmeltingMultiplier(2); - CassiteriteSand.setOreMultiplier(2).setSmeltingMultiplier(2); - NetherQuartz.setOreMultiplier(2).setSmeltingMultiplier(2); - CertusQuartz.setOreMultiplier(2).setSmeltingMultiplier(2); - TricalciumPhosphate.setOreMultiplier(3).setSmeltingMultiplier(3); - Saltpeter.setOreMultiplier(4).setSmeltingMultiplier(4); - Apatite.setOreMultiplier(4).setSmeltingMultiplier(4).setByProductMultiplier(2); - Electrotine.setOreMultiplier(5).setSmeltingMultiplier(5); - Teslatite.setOreMultiplier(5).setSmeltingMultiplier(5); - Redstone.setOreMultiplier(5).setSmeltingMultiplier(5); - Glowstone.setOreMultiplier(5).setSmeltingMultiplier(5); - Lapis.setOreMultiplier(6).setSmeltingMultiplier(6).setByProductMultiplier(4); - Sodalite.setOreMultiplier(6).setSmeltingMultiplier(6).setByProductMultiplier(4); - Lazurite.setOreMultiplier(6).setSmeltingMultiplier(6).setByProductMultiplier(4); - Monazite.setOreMultiplier(8).setSmeltingMultiplier(8).setByProductMultiplier(2); - Cryolite.setOreMultiplier(4).setByProductMultiplier(4); + Amber.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedAir.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedFire.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedEarth.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedWater.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedEntropy.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedOrder.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedVis.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedDull.setOreMultiplier(2) + .setSmeltingMultiplier(2); + Salt.setOreMultiplier(2) + .setSmeltingMultiplier(2); + RockSalt.setOreMultiplier(2) + .setSmeltingMultiplier(2); + Scheelite.setOreMultiplier(2) + .setSmeltingMultiplier(2); + Tungstate.setOreMultiplier(2) + .setSmeltingMultiplier(2); + Cassiterite.setOreMultiplier(2) + .setSmeltingMultiplier(2); + CassiteriteSand.setOreMultiplier(2) + .setSmeltingMultiplier(2); + NetherQuartz.setOreMultiplier(2) + .setSmeltingMultiplier(2); + CertusQuartz.setOreMultiplier(2) + .setSmeltingMultiplier(2); + TricalciumPhosphate.setOreMultiplier(3) + .setSmeltingMultiplier(3); + Saltpeter.setOreMultiplier(4) + .setSmeltingMultiplier(4); + Apatite.setOreMultiplier(4) + .setSmeltingMultiplier(4) + .setByProductMultiplier(2); + Electrotine.setOreMultiplier(5) + .setSmeltingMultiplier(5); + Teslatite.setOreMultiplier(5) + .setSmeltingMultiplier(5); + Redstone.setOreMultiplier(5) + .setSmeltingMultiplier(5); + Glowstone.setOreMultiplier(5) + .setSmeltingMultiplier(5); + Lapis.setOreMultiplier(6) + .setSmeltingMultiplier(6) + .setByProductMultiplier(4); + Sodalite.setOreMultiplier(6) + .setSmeltingMultiplier(6) + .setByProductMultiplier(4); + Lazurite.setOreMultiplier(6) + .setSmeltingMultiplier(6) + .setByProductMultiplier(4); + Monazite.setOreMultiplier(8) + .setSmeltingMultiplier(8) + .setByProductMultiplier(2); + Cryolite.setOreMultiplier(4) + .setByProductMultiplier(4); } private static void setEnchantmentKnockbackTools() { @@ -1630,7 +1701,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { YellowLimonite.addOreByProducts(Nickel, BrownLimonite, Cobalt); Lepidolite.addOreByProducts(Lithium, Caesium); Andradite.addOreByProducts(GarnetYellow, Iron); - Pyrolusite.addOreByProducts(Manganese, Tantalite, Niobium).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + Pyrolusite.addOreByProducts(Manganese, Tantalite, Niobium) + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); TricalciumPhosphate.addOreByProducts(Apatite, Phosphate, Pyrochlore); Apatite.addOreByProducts(TricalciumPhosphate, Phosphate, Pyrochlore); Pyrochlore.addOreByProducts(Apatite, Calcite, Niobium); @@ -1838,8 +1910,11 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { private static void initSubTags() { SubTag.ELECTROMAGNETIC_SEPERATION_NEODYMIUM.addTo(Bastnasite, Monazite, Forcicium, Forcillium); - SubTag.ELECTROMAGNETIC_SEPERATION_GOLD - .addTo(Magnetite, VanadiumMagnetite, BasalticMineralSand, GraniticMineralSand); + SubTag.ELECTROMAGNETIC_SEPERATION_GOLD.addTo( + Magnetite, + VanadiumMagnetite, + BasalticMineralSand, + GraniticMineralSand); SubTag.NO_RECIPES.addTo(MagnetohydrodynamicallyConstrainedStarMatter); @@ -1861,8 +1936,13 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Chromite, Andradite); - SubTag.BLASTFURNACE_CALCITE_DOUBLE - .addTo(Pyrite, BrownLimonite, YellowLimonite, BasalticMineralSand, GraniticMineralSand, Magnetite); + SubTag.BLASTFURNACE_CALCITE_DOUBLE.addTo( + Pyrite, + BrownLimonite, + YellowLimonite, + BasalticMineralSand, + GraniticMineralSand, + Magnetite); SubTag.BLASTFURNACE_CALCITE_TRIPLE.addTo(Iron, PigIron, DeepIron, ShadowIron, WroughtIron, MeteoricIron); @@ -2240,14 +2320,22 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Monazite.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE); Quartzite.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); Quartz.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); - SiliconDioxide - .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); + SiliconDioxide.add( + SubTag.CRYSTAL, + SubTag.NO_SMASHING, + SubTag.NO_SMELTING, + SubTag.CRYSTALLISABLE, + SubTag.QUARTZ); Dilithium.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); NetherQuartz.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); CertusQuartz.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); Fluix.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); - TricalciumPhosphate - .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.EXPLOSIVE); + TricalciumPhosphate.add( + SubTag.CRYSTAL, + SubTag.NO_SMASHING, + SubTag.NO_SMELTING, + SubTag.FLAMMABLE, + SubTag.EXPLOSIVE); Phosphate.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.EXPLOSIVE); InfusedAir.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.MAGICAL, SubTag.UNBURNABLE); InfusedFire.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.MAGICAL, SubTag.UNBURNABLE); @@ -2313,16 +2401,19 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { mMaterialHandlers.forEach(IMaterialHandler::onMaterialsInit); // This is where addon mods can add/manipulate // materials initMaterialProperties(); // No more material addition or manipulation should be done past this point! - MATERIALS_ARRAY = MATERIALS_MAP.values().toArray(new Materials[0]); // Generate standard object array. This is a - // lot faster to loop over. + MATERIALS_ARRAY = MATERIALS_MAP.values() + .toArray(new Materials[0]); // Generate standard object array. This is a + // lot faster to loop over. VALUES = Arrays.asList(MATERIALS_ARRAY); if (!NewHorizonsCoreMod.isModLoaded() && !GT_Mod.gregtechproxy.mEnableAllComponents) OrePrefixes.initMaterialComponents(); else { OrePrefixes.ingotHot.mDisabledItems.addAll( - Arrays.stream(Materials.values()).parallel().filter(OrePrefixes.ingotHot::doGenerateItem) - .filter(m -> m.mBlastFurnaceTemp < 1750 && m.mAutoGenerateBlastFurnaceRecipes) - .collect(Collectors.toSet())); + Arrays.stream(Materials.values()) + .parallel() + .filter(OrePrefixes.ingotHot::doGenerateItem) + .filter(m -> m.mBlastFurnaceTemp < 1750 && m.mAutoGenerateBlastFurnaceRecipes) + .collect(Collectors.toSet())); OrePrefixes.ingotHot.disableComponent(Materials.Reinforced); OrePrefixes.ingotHot.disableComponent(Materials.ConductiveIron); OrePrefixes.ingotHot.disableComponent(Materials.FierySteel); @@ -2384,22 +2475,32 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void addTemperatureValues(Materials aMaterial, String aConfigPath) { - aMaterial.mMeltingPoint = GregTech_API.sMaterialProperties - .get(aConfigPath, "MeltingPoint", aMaterial.mMeltingPoint); - aMaterial.mBlastFurnaceRequired = GregTech_API.sMaterialProperties - .get(aConfigPath, "BlastFurnaceRequired", aMaterial.mBlastFurnaceRequired); - aMaterial.mBlastFurnaceTemp = (short) GregTech_API.sMaterialProperties - .get(aConfigPath, "BlastFurnaceTemp", aMaterial.mBlastFurnaceTemp); + aMaterial.mMeltingPoint = GregTech_API.sMaterialProperties.get( + aConfigPath, + "MeltingPoint", + aMaterial.mMeltingPoint); + aMaterial.mBlastFurnaceRequired = GregTech_API.sMaterialProperties.get( + aConfigPath, + "BlastFurnaceRequired", + aMaterial.mBlastFurnaceRequired); + aMaterial.mBlastFurnaceTemp = (short) GregTech_API.sMaterialProperties.get( + aConfigPath, + "BlastFurnaceTemp", + aMaterial.mBlastFurnaceTemp); aMaterial.mGasTemp = GregTech_API.sMaterialProperties.get(aConfigPath, "GasTemp", aMaterial.mGasTemp); aMaterial.setHeatDamage( (float) GregTech_API.sMaterialProperties.get(aConfigPath, "HeatDamage", aMaterial.mHeatDamage)); } private static void addDensityValues(Materials aMaterial, String aConfigPath) { - aMaterial.mDensityMultiplier = GregTech_API.sMaterialProperties - .get(aConfigPath, "DensityMultiplier", aMaterial.mDensityMultiplier); - aMaterial.mDensityDivider = GregTech_API.sMaterialProperties - .get(aConfigPath, "DensityDivider", aMaterial.mDensityDivider); + aMaterial.mDensityMultiplier = GregTech_API.sMaterialProperties.get( + aConfigPath, + "DensityMultiplier", + aMaterial.mDensityMultiplier); + aMaterial.mDensityDivider = GregTech_API.sMaterialProperties.get( + aConfigPath, + "DensityDivider", + aMaterial.mDensityDivider); aMaterial.mDensity = (long) GregTech_API.sMaterialProperties.get( aConfigPath, "Density", @@ -2408,10 +2509,14 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void addColorValues(Materials aMaterial, String aConfigPath) { - aMaterial.mTransparent = GregTech_API.sMaterialProperties - .get(aConfigPath, "Transparent", aMaterial.mTransparent); - String aColor = GregTech_API.sMaterialProperties - .get(aConfigPath, "DyeColor", aMaterial.mColor == Dyes._NULL ? "None" : aMaterial.mColor.toString()); + aMaterial.mTransparent = GregTech_API.sMaterialProperties.get( + aConfigPath, + "Transparent", + aMaterial.mTransparent); + String aColor = GregTech_API.sMaterialProperties.get( + aConfigPath, + "DyeColor", + aMaterial.mColor == Dyes._NULL ? "None" : aMaterial.mColor.toString()); aMaterial.mColor = aColor.equals("None") ? Dyes._NULL : Dyes.get(aColor); String[] aRGBA = GregTech_API.sMaterialProperties.get( aConfigPath, @@ -2423,7 +2528,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { + "," + aMaterial.mRGBa[3] + ",") - .split(","); + .split(","); aMaterial.mRGBa[0] = Short.parseShort(aRGBA[0]); aMaterial.mRGBa[1] = Short.parseShort(aRGBA[1]); aMaterial.mRGBa[2] = Short.parseShort(aRGBA[2]); @@ -2431,12 +2536,18 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void addToolValues(Materials aMaterial, String aConfigPath) { - aMaterial.mDurability = GregTech_API.sMaterialProperties - .get(aConfigPath, "ToolDurability", aMaterial.mDurability); - aMaterial.mToolSpeed = (float) GregTech_API.sMaterialProperties - .get(aConfigPath, "ToolSpeed", aMaterial.mToolSpeed); - aMaterial.mToolQuality = (byte) GregTech_API.sMaterialProperties - .get(aConfigPath, "ToolQuality", aMaterial.mToolQuality); + aMaterial.mDurability = GregTech_API.sMaterialProperties.get( + aConfigPath, + "ToolDurability", + aMaterial.mDurability); + aMaterial.mToolSpeed = (float) GregTech_API.sMaterialProperties.get( + aConfigPath, + "ToolSpeed", + aMaterial.mToolSpeed); + aMaterial.mToolQuality = (byte) GregTech_API.sMaterialProperties.get( + aConfigPath, + "ToolQuality", + aMaterial.mToolQuality); // Moved from GT_Proxy? (Not sure) aMaterial.mHandleMaterial = (aMaterial == Desh ? aMaterial.mHandleMaterial : aMaterial == Diamond || aMaterial == Thaumium ? Wood @@ -2456,32 +2567,42 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void addEnchantmentValues(Materials aMaterial, String aConfigPath) { - aMaterial.mEnchantmentToolsLevel = (byte) GregTech_API.sMaterialProperties - .get(aConfigPath, "EnchantmentLevel", aMaterial.mEnchantmentToolsLevel); + aMaterial.mEnchantmentToolsLevel = (byte) GregTech_API.sMaterialProperties.get( + aConfigPath, + "EnchantmentLevel", + aMaterial.mEnchantmentToolsLevel); String aEnchantmentName = GregTech_API.sMaterialProperties.get( aConfigPath, "Enchantment", aMaterial.mEnchantmentTools != null ? aMaterial.mEnchantmentTools.getName() : ""); if (aMaterial.mEnchantmentTools != null && !aEnchantmentName.equals(aMaterial.mEnchantmentTools.getName())) IntStream.range(0, Enchantment.enchantmentsList.length) - .filter(i -> aEnchantmentName.equals(Enchantment.enchantmentsList[i].getName())) - .forEach(i -> aMaterial.mEnchantmentTools = Enchantment.enchantmentsList[i]); + .filter(i -> aEnchantmentName.equals(Enchantment.enchantmentsList[i].getName())) + .forEach(i -> aMaterial.mEnchantmentTools = Enchantment.enchantmentsList[i]); } private static void addProcessingIntoValues(Materials aMaterial, String aConfigPath) { aMaterial.mSmeltInto = MATERIALS_MAP.get( GregTech_API.sMaterialProperties.get(aConfigPath, "MaterialSmeltInto", aMaterial.mSmeltInto.mName)); aMaterial.mMacerateInto = MATERIALS_MAP.get( - GregTech_API.sMaterialProperties - .get(aConfigPath, "MaterialMacerateInto", aMaterial.mMacerateInto.mName)); + GregTech_API.sMaterialProperties.get( + aConfigPath, + "MaterialMacerateInto", + aMaterial.mMacerateInto.mName)); aMaterial.mArcSmeltInto = MATERIALS_MAP.get( - GregTech_API.sMaterialProperties - .get(aConfigPath, "MaterialArcSmeltInto", aMaterial.mArcSmeltInto.mName)); + GregTech_API.sMaterialProperties.get( + aConfigPath, + "MaterialArcSmeltInto", + aMaterial.mArcSmeltInto.mName)); aMaterial.mDirectSmelting = MATERIALS_MAP.get( - GregTech_API.sMaterialProperties - .get(aConfigPath, "MaterialDirectSmeltInto", aMaterial.mDirectSmelting.mName)); - aMaterial.mAutoGenerateBlastFurnaceRecipes = GregTech_API.sMaterialProperties - .get(aConfigPath, "AutoGenerateBlastFurnaceRecipes", aMaterial.mAutoGenerateBlastFurnaceRecipes); + GregTech_API.sMaterialProperties.get( + aConfigPath, + "MaterialDirectSmeltInto", + aMaterial.mDirectSmelting.mName)); + aMaterial.mAutoGenerateBlastFurnaceRecipes = GregTech_API.sMaterialProperties.get( + aConfigPath, + "AutoGenerateBlastFurnaceRecipes", + aMaterial.mAutoGenerateBlastFurnaceRecipes); } private static void addMultiplierValues(Materials aMaterial, String aConfigPath) { @@ -2489,11 +2610,15 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { aMaterial.setOreMultiplier( GregTech_API.sMaterialProperties.get(aConfigPath, "OreMultiplier", aMaterial.mOreMultiplier)); aMaterial.setSmeltingMultiplier( - GregTech_API.sMaterialProperties - .get(aConfigPath, "OreSmeltingMultiplier", aMaterial.mSmeltingMultiplier)); + GregTech_API.sMaterialProperties.get( + aConfigPath, + "OreSmeltingMultiplier", + aMaterial.mSmeltingMultiplier)); aMaterial.setByProductMultiplier( - GregTech_API.sMaterialProperties - .get(aConfigPath, "OreByProductMultiplier", aMaterial.mByProductMultiplier)); + GregTech_API.sMaterialProperties.get( + aConfigPath, + "OreByProductMultiplier", + aMaterial.mByProductMultiplier)); } private static void addHasGasFluid(Materials aMaterial, String aConfigPath) { @@ -2516,16 +2641,22 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void addInternalStuff(Materials aMaterial, String aConfigPath) { - aMaterial.mMetaItemSubID = GregTech_API.sMaterialProperties - .get(aConfigPath, "MaterialID", aMaterial.mCustomOre ? -1 : aMaterial.mMetaItemSubID); + aMaterial.mMetaItemSubID = GregTech_API.sMaterialProperties.get( + aConfigPath, + "MaterialID", + aMaterial.mCustomOre ? -1 : aMaterial.mMetaItemSubID); aMaterial.mTypes = GregTech_API.sMaterialProperties.get( aConfigPath, "MaterialTypes", aMaterial.mCustomOre ? 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 : aMaterial.mTypes); - aMaterial.mUnificatable = GregTech_API.sMaterialProperties - .get(aConfigPath, "Unificatable", aMaterial.mUnificatable); - aMaterial.mHasParentMod = GregTech_API.sMaterialProperties - .get(aConfigPath, "HasParentMod", aMaterial.mHasParentMod); + aMaterial.mUnificatable = GregTech_API.sMaterialProperties.get( + aConfigPath, + "Unificatable", + aMaterial.mUnificatable); + aMaterial.mHasParentMod = GregTech_API.sMaterialProperties.get( + aConfigPath, + "HasParentMod", + aMaterial.mHasParentMod); } private static void addLocalisation(Materials aMaterial, String aConfigPath) { @@ -2533,8 +2664,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { aConfigPath, "MaterialName", aMaterial.mCustomOre ? "CustomOre" + aMaterial.mCustomID : aMaterial.mDefaultLocalName); - aMaterial.mChemicalFormula = GregTech_API.sMaterialProperties - .get(aConfigPath, "ChemicalFormula", aMaterial.mChemicalFormula); + aMaterial.mChemicalFormula = GregTech_API.sMaterialProperties.get( + aConfigPath, + "ChemicalFormula", + aMaterial.mChemicalFormula); } private static String getConfigPath(Materials aMaterial) { @@ -2547,18 +2680,25 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { if (GT_Mod.gregtechproxy.mChangeHarvestLevels && aMaterial.mToolQuality > 0 && aMaterial.mMetaItemSubID < GT_Mod.gregtechproxy.mHarvestLevel.length && aMaterial.mMetaItemSubID >= 0) { - GT_Mod.gregtechproxy.mHarvestLevel[aMaterial.mMetaItemSubID] = GregTech_API.sMaterialProperties - .get(aConfigPath, "HarvestLevel", aMaterial.mToolQuality); + GT_Mod.gregtechproxy.mHarvestLevel[aMaterial.mMetaItemSubID] = GregTech_API.sMaterialProperties.get( + aConfigPath, + "HarvestLevel", + aMaterial.mToolQuality); } } private static void addHarvestLevels() { - GT_Mod.gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties - .get("harvestlevel", "ActivateHarvestLevelChange", false); - GT_Mod.gregtechproxy.mMaxHarvestLevel = Math - .min(15, GregTech_API.sMaterialProperties.get("harvestlevel", "MaxHarvestLevel", 7)); - GT_Mod.gregtechproxy.mGraniteHavestLevel = GregTech_API.sMaterialProperties - .get("harvestlevel", "GraniteHarvestLevel", 3); + GT_Mod.gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties.get( + "harvestlevel", + "ActivateHarvestLevelChange", + false); + GT_Mod.gregtechproxy.mMaxHarvestLevel = Math.min( + 15, + GregTech_API.sMaterialProperties.get("harvestlevel", "MaxHarvestLevel", 7)); + GT_Mod.gregtechproxy.mGraniteHavestLevel = GregTech_API.sMaterialProperties.get( + "harvestlevel", + "GraniteHarvestLevel", + 3); } public static void initMaterialProperties() { @@ -2590,15 +2730,21 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { private static void aspectCalculation(Materials aMaterial, String aConfigPath) { - String aDefaultAspectString = aMaterial.mAspects.stream().map(aAspectStack -> aAspectStack.mAspect.toString()) - .collect(Collectors.joining(",", ",", "")); + String aDefaultAspectString = aMaterial.mAspects.stream() + .map(aAspectStack -> aAspectStack.mAspect.toString()) + .collect(Collectors.joining(",", ",", "")); String aDefaultAspectAmountString = aMaterial.mAspects.stream() - .map(aAspectStack -> String.valueOf(aAspectStack.mAmount)).collect(Collectors.joining(",", ",", "")); + .map(aAspectStack -> String.valueOf(aAspectStack.mAmount)) + .collect(Collectors.joining(",", ",", "")); - String aConfigAspectString = GregTech_API.sMaterialProperties - .get(aConfigPath, "ListTCAspects", aDefaultAspectString); - String aConfigAspectAmountString = GregTech_API.sMaterialProperties - .get(aConfigPath, "ListTCAspectAmounts", aDefaultAspectAmountString); + String aConfigAspectString = GregTech_API.sMaterialProperties.get( + aConfigPath, + "ListTCAspects", + aDefaultAspectString); + String aConfigAspectAmountString = GregTech_API.sMaterialProperties.get( + aConfigPath, + "ListTCAspectAmounts", + aDefaultAspectAmountString); if (!aConfigAspectString.equals(aDefaultAspectString) || !aConfigAspectAmountString.equals(aDefaultAspectAmountString)) { @@ -2617,29 +2763,39 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void OreReRegistrationsCalculation(Materials aMaterial, String aConfigPath) { - String aDefaultMatReRegString = aMaterial.mOreReRegistrations.stream().map(aTag -> aTag.mName) - .collect(Collectors.joining(",", ",", "")); - String aConfigMatMatReRegString = GregTech_API.sMaterialProperties - .get(aConfigPath, "ListMaterialReRegistrations", aDefaultMatReRegString); + String aDefaultMatReRegString = aMaterial.mOreReRegistrations.stream() + .map(aTag -> aTag.mName) + .collect(Collectors.joining(",", ",", "")); + String aConfigMatMatReRegString = GregTech_API.sMaterialProperties.get( + aConfigPath, + "ListMaterialReRegistrations", + aDefaultMatReRegString); if (!aConfigMatMatReRegString.equals(aDefaultMatReRegString)) { aMaterial.mOreReRegistrations.clear(); if (aConfigMatMatReRegString.length() > 0) { - Arrays.stream(aConfigMatMatReRegString.split(",")).map(MATERIALS_MAP::get).filter(Objects::nonNull) - .forEach(aMat -> aMaterial.mOreReRegistrations.add(aMat)); + Arrays.stream(aConfigMatMatReRegString.split(",")) + .map(MATERIALS_MAP::get) + .filter(Objects::nonNull) + .forEach(aMat -> aMaterial.mOreReRegistrations.add(aMat)); } } } private static void OreByProductsCalculation(Materials aMaterial, String aConfigPath) { - String aDefaultMatByProString = aMaterial.mOreByProducts.stream().map(aTag -> aTag.mName) - .collect(Collectors.joining(",", ",", "")); - String aConfigMatByProString = GregTech_API.sMaterialProperties - .get(aConfigPath, "ListMaterialByProducts", aDefaultMatByProString); + String aDefaultMatByProString = aMaterial.mOreByProducts.stream() + .map(aTag -> aTag.mName) + .collect(Collectors.joining(",", ",", "")); + String aConfigMatByProString = GregTech_API.sMaterialProperties.get( + aConfigPath, + "ListMaterialByProducts", + aDefaultMatByProString); if (!aConfigMatByProString.equals(aDefaultMatByProString)) { aMaterial.mOreByProducts.clear(); if (aConfigMatByProString.length() > 0) { - Arrays.stream(aConfigMatByProString.split(",")).map(MATERIALS_MAP::get).filter(Objects::nonNull) - .forEach(aMat -> aMaterial.mOreByProducts.add(aMat)); + Arrays.stream(aConfigMatByProString.split(",")) + .map(MATERIALS_MAP::get) + .filter(Objects::nonNull) + .forEach(aMat -> aMaterial.mOreByProducts.add(aMat)); } } } @@ -2651,14 +2807,17 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { * from the config string. */ private static void SubTagCalculation(Materials aMaterial, String aConfigPath) { - String aDefaultTagString = aMaterial.mSubTags.stream().map(aTag -> aTag.mName) - .collect(Collectors.joining(",", ",", "")); + String aDefaultTagString = aMaterial.mSubTags.stream() + .map(aTag -> aTag.mName) + .collect(Collectors.joining(",", ",", "")); String aConfigTagString = GregTech_API.sMaterialProperties.get(aConfigPath, "ListSubTags", aDefaultTagString); if (!aConfigTagString.equals(aDefaultTagString)) { aMaterial.mSubTags.clear(); if (aConfigTagString.length() > 0) { - Arrays.stream(aConfigTagString.split(",")).map(SubTag.sSubTags::get).filter(Objects::nonNull) - .forEach(aTag -> aMaterial.mSubTags.add(aTag)); + Arrays.stream(aConfigTagString.split(",")) + .map(SubTag.sSubTags::get) + .filter(Objects::nonNull) + .forEach(aTag -> aMaterial.mSubTags.add(aTag)); } } } @@ -2751,7 +2910,9 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public boolean isRadioactive() { if (mElement != null) return mElement.mHalfLifeSeconds >= 0; - return mMaterialList.stream().map(stack -> stack.mMaterial).anyMatch(Materials::isRadioactive); + return mMaterialList.stream() + .map(stack -> stack.mMaterial) + .anyMatch(Materials::isRadioactive); } public long getProtons() { @@ -2826,9 +2987,14 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { */ public boolean contains(ItemStack... aStacks) { if (aStacks == null || aStacks.length == 0) return false; - return mMaterialItems.stream().anyMatch( - tStack -> Arrays.stream(aStacks) - .anyMatch(aStack -> GT_Utility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound()))); + return mMaterialItems.stream() + .anyMatch( + tStack -> Arrays.stream(aStacks) + .anyMatch( + aStack -> GT_Utility.areStacksEqual( + aStack, + tStack, + !tStack.hasTagCompound()))); } /** @@ -3018,13 +3184,19 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } public String getDefaultLocalizedNameForItem(String aFormat) { - return String.format(aFormat.replace("%s", "%temp").replace("%material", "%s"), this.mDefaultLocalName) - .replace("%temp", "%s"); + return String.format( + aFormat.replace("%s", "%temp") + .replace("%material", "%s"), + this.mDefaultLocalName) + .replace("%temp", "%s"); } public String getLocalizedNameForItem(String aFormat) { - return String.format(aFormat.replace("%s", "%temp").replace("%material", "%s"), this.mLocalizedName) - .replace("%temp", "%s"); + return String.format( + aFormat.replace("%s", "%temp") + .replace("%material", "%s"), + this.mLocalizedName) + .replace("%temp", "%s"); } public boolean hasCorrespondingFluid() { diff --git a/src/main/java/gregtech/api/enums/MaterialsBotania.java b/src/main/java/gregtech/api/enums/MaterialsBotania.java index f6ae06408e..d93b941e39 100644 --- a/src/main/java/gregtech/api/enums/MaterialsBotania.java +++ b/src/main/java/gregtech/api/enums/MaterialsBotania.java @@ -9,41 +9,86 @@ import gregtech.api.enums.TC_Aspects.TC_AspectStack; public class MaterialsBotania { // Botania materials. - public static Materials Manasteel = new MaterialBuilder(201, TextureSet.SET_METALLIC, "Manasteel") - .setName("Manasteel").setRGBA(150, 219, 252, 255).addDustItems().addMetalItems().addToolHeadItems() - .addGearItems().setToolSpeed(8.0F).setDurability(5120).setToolQuality(4).setMeltingPoint(1500) - .setBlastFurnaceTemp(1500).setBlastFurnaceRequired(true) - .setAspects( - Arrays.asList( - new TC_AspectStack(TC_Aspects.METALLUM, 3), - new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))) - .constructMaterial(); - public static Materials Terrasteel = new MaterialBuilder(202, TextureSet.SET_METALLIC, "Terrasteel") - .setName("Terrasteel").setRGBA(76, 191, 38, 255).addDustItems().addMetalItems().addToolHeadItems() - .addGearItems().setToolSpeed(32.0F).setDurability(10240).setToolQuality(5).setMeltingPoint(5400) - .setBlastFurnaceTemp(5400).setBlastFurnaceRequired(true) - .setAspects( - Arrays.asList( - new TC_AspectStack(TC_Aspects.METALLUM, 2), - new TC_AspectStack(TC_Aspects.TERRA, 1), - new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))) - .constructMaterial(); - public static Materials ElvenElementium = new MaterialBuilder(203, TextureSet.SET_METALLIC, "Elven Elementium") - .setName("ElvenElementium").setRGBA(219, 37, 205, 255).addDustItems().addMetalItems().addToolHeadItems() - .addGearItems().setToolSpeed(20.0F).setDurability(32768).setToolQuality(7).setMeltingPoint(7200) - .setBlastFurnaceTemp(7200).setBlastFurnaceRequired(true) - .setAspects( - Arrays.asList( - new TC_AspectStack(TC_Aspects.METALLUM, 3), - new TC_AspectStack(TC_Aspects.PRAECANTATIO, 2), - new TC_AspectStack(TC_Aspects.AURAM, 1))) - .constructMaterial(); - public static Materials Livingrock = new MaterialBuilder(204, new TextureSet("Livingrock", true), "Livingrock") - .setName("Livingrock").addDustItems().addToolHeadItems().addGearItems().setToolSpeed(1.0F).setDurability(0) - .setToolQuality(3).setOreValue(3).setDensityMultiplier(1).setDensityDivider(1) - .setAspects( - Arrays.asList(new TC_AspectStack(TC_Aspects.TERRA, 2), new TC_AspectStack(TC_Aspects.VICTUS, 2))) - .constructMaterial(); + public static Materials Manasteel = new MaterialBuilder( + 201, + TextureSet.SET_METALLIC, + "Manasteel").setName("Manasteel") + .setRGBA(150, 219, 252, 255) + .addDustItems() + .addMetalItems() + .addToolHeadItems() + .addGearItems() + .setToolSpeed(8.0F) + .setDurability(5120) + .setToolQuality(4) + .setMeltingPoint(1500) + .setBlastFurnaceTemp(1500) + .setBlastFurnaceRequired(true) + .setAspects( + Arrays.asList( + new TC_AspectStack(TC_Aspects.METALLUM, 3), + new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))) + .constructMaterial(); + public static Materials Terrasteel = new MaterialBuilder( + 202, + TextureSet.SET_METALLIC, + "Terrasteel").setName("Terrasteel") + .setRGBA(76, 191, 38, 255) + .addDustItems() + .addMetalItems() + .addToolHeadItems() + .addGearItems() + .setToolSpeed(32.0F) + .setDurability(10240) + .setToolQuality(5) + .setMeltingPoint(5400) + .setBlastFurnaceTemp(5400) + .setBlastFurnaceRequired(true) + .setAspects( + Arrays.asList( + new TC_AspectStack(TC_Aspects.METALLUM, 2), + new TC_AspectStack(TC_Aspects.TERRA, 1), + new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))) + .constructMaterial(); + public static Materials ElvenElementium = new MaterialBuilder( + 203, + TextureSet.SET_METALLIC, + "Elven Elementium").setName("ElvenElementium") + .setRGBA(219, 37, 205, 255) + .addDustItems() + .addMetalItems() + .addToolHeadItems() + .addGearItems() + .setToolSpeed(20.0F) + .setDurability(32768) + .setToolQuality(7) + .setMeltingPoint(7200) + .setBlastFurnaceTemp(7200) + .setBlastFurnaceRequired(true) + .setAspects( + Arrays.asList( + new TC_AspectStack(TC_Aspects.METALLUM, 3), + new TC_AspectStack(TC_Aspects.PRAECANTATIO, 2), + new TC_AspectStack(TC_Aspects.AURAM, 1))) + .constructMaterial(); + public static Materials Livingrock = new MaterialBuilder( + 204, + new TextureSet("Livingrock", true), + "Livingrock").setName("Livingrock") + .addDustItems() + .addToolHeadItems() + .addGearItems() + .setToolSpeed(1.0F) + .setDurability(0) + .setToolQuality(3) + .setOreValue(3) + .setDensityMultiplier(1) + .setDensityDivider(1) + .setAspects( + Arrays.asList( + new TC_AspectStack(TC_Aspects.TERRA, 2), + new TC_AspectStack(TC_Aspects.VICTUS, 2))) + .constructMaterial(); public static Materials GaiaSpirit = new Materials( 205, TextureSet.SET_METALLIC.withBlockTextures("GaiaSpirit"), @@ -72,21 +117,45 @@ public class MaterialsBotania { new TC_AspectStack(TC_Aspects.AURAM, 24), new TC_AspectStack(TC_Aspects.VICTUS, 24), new TC_AspectStack(TC_Aspects.METALLUM, 1))); - public static Materials Livingwood = new MaterialBuilder(206, new TextureSet("Livingwood", true), "Livingwood") - .setName("Livingwood").addDustItems().addMetalItems().addToolHeadItems().addGearItems().setToolSpeed(1.0F) - .setDurability(0).setToolQuality(3).setOreValue(3).setDensityMultiplier(1).setDensityDivider(1) - .setAspects( - Arrays.asList(new TC_AspectStack(TC_Aspects.ARBOR, 4), new TC_AspectStack(TC_Aspects.VICTUS, 2))) - .constructMaterial(); - public static Materials Dreamwood = new MaterialBuilder(207, new TextureSet("Dreamwood", true), "Dreamwood") - .setName("Dreamwood").addDustItems().addMetalItems().addToolHeadItems().addGearItems().setToolSpeed(1.0F) - .setDurability(0).setToolQuality(3).setOreValue(3).setDensityMultiplier(1).setDensityDivider(1) - .setAspects( - Arrays.asList( - new TC_AspectStack(TC_Aspects.ARBOR, 4), - new TC_AspectStack(TC_Aspects.AURAM, 2), - new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))) - .constructMaterial(); + public static Materials Livingwood = new MaterialBuilder( + 206, + new TextureSet("Livingwood", true), + "Livingwood").setName("Livingwood") + .addDustItems() + .addMetalItems() + .addToolHeadItems() + .addGearItems() + .setToolSpeed(1.0F) + .setDurability(0) + .setToolQuality(3) + .setOreValue(3) + .setDensityMultiplier(1) + .setDensityDivider(1) + .setAspects( + Arrays.asList( + new TC_AspectStack(TC_Aspects.ARBOR, 4), + new TC_AspectStack(TC_Aspects.VICTUS, 2))) + .constructMaterial(); + public static Materials Dreamwood = new MaterialBuilder( + 207, + new TextureSet("Dreamwood", true), + "Dreamwood").setName("Dreamwood") + .addDustItems() + .addMetalItems() + .addToolHeadItems() + .addGearItems() + .setToolSpeed(1.0F) + .setDurability(0) + .setToolQuality(3) + .setOreValue(3) + .setDensityMultiplier(1) + .setDensityDivider(1) + .setAspects( + Arrays.asList( + new TC_AspectStack(TC_Aspects.ARBOR, 4), + new TC_AspectStack(TC_Aspects.AURAM, 2), + new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))) + .constructMaterial(); public static Materials ManaDiamond = new Materials( 208, TextureSet.SET_DIAMOND, diff --git a/src/main/java/gregtech/api/enums/MaterialsKevlar.java b/src/main/java/gregtech/api/enums/MaterialsKevlar.java index 1c23f17698..a5c38b0f7a 100644 --- a/src/main/java/gregtech/api/enums/MaterialsKevlar.java +++ b/src/main/java/gregtech/api/enums/MaterialsKevlar.java @@ -9,394 +9,688 @@ public class MaterialsKevlar { public static Materials DiphenylmethaneDiisocyanate = new MaterialBuilder( 796, TextureSet.SET_DULL, - "4,4'-Diphenylmethane Diisocyanate").setName("DiphenylmethaneDiisocyanate").addDustItems() - .setRGB(255, 230, 50).setColor(Dyes.dyeYellow).setMeltingPoint(310) - .setMaterialList( - new MaterialStack(Materials.Carbon, 15), - new MaterialStack(Materials.Hydrogen, 10), - new MaterialStack(Materials.Nitrogen, 2), - new MaterialStack(Materials.Oxygen, 2)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))) - .constructMaterial(); // C15H10N2O2 + "4,4'-Diphenylmethane Diisocyanate").setName("DiphenylmethaneDiisocyanate") + .addDustItems() + .setRGB(255, 230, 50) + .setColor(Dyes.dyeYellow) + .setMeltingPoint(310) + .setMaterialList( + new MaterialStack(Materials.Carbon, 15), + new MaterialStack(Materials.Hydrogen, 10), + new MaterialStack(Materials.Nitrogen, 2), + new MaterialStack(Materials.Oxygen, 2)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))) + .constructMaterial(); // C15H10N2O2 public static Materials DiaminodiphenylmethanMixture = new MaterialBuilder( 795, TextureSet.SET_FLUID, - "Diaminodiphenylmethane Mixture").setName("DiaminodiphenylmethanMixture").addCell().addFluid() - .setRGB(255, 243, 122).setColor(Dyes.dyeYellow).setMeltingPoint(365) - .setMaterialList( - new MaterialStack(Materials.Carbon, 13), - new MaterialStack(Materials.Hydrogen, 14), - new MaterialStack(Materials.Nitrogen, 2)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))) - .constructMaterial(); // C13H14N2 + "Diaminodiphenylmethane Mixture").setName("DiaminodiphenylmethanMixture") + .addCell() + .addFluid() + .setRGB(255, 243, 122) + .setColor(Dyes.dyeYellow) + .setMeltingPoint(365) + .setMaterialList( + new MaterialStack(Materials.Carbon, 13), + new MaterialStack(Materials.Hydrogen, 14), + new MaterialStack(Materials.Nitrogen, 2)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))) + .constructMaterial(); // C13H14N2 public static Materials DiphenylmethaneDiisocyanateMixture = new MaterialBuilder( 794, TextureSet.SET_FLUID, - "Diphenylmethane Diisocyanate Mixture").setName("DiphenylmethaneDiisocyanateMixture").addCell().addFluid() - .setRGB(255, 230, 50).setColor(Dyes.dyeYellow).setMeltingPoint(310) - .setMaterialList( - new MaterialStack(Materials.Carbon, 15), - new MaterialStack(Materials.Hydrogen, 10), - new MaterialStack(Materials.Nitrogen, 2), - new MaterialStack(Materials.Oxygen, 2)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))) - .constructMaterial(); // C15H10N2O2 - public static Materials Butyraldehyde = new MaterialBuilder(793, TextureSet.SET_FLUID, "Butyraldehyde") - .setName("Butyraldehyde").addCell().addFluid().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .setMeltingPoint(176) - .setMaterialList( - new MaterialStack(Materials.Carbon, 4), - new MaterialStack(Materials.Hydrogen, 8), - new MaterialStack(Materials.Oxygen, 1)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) - .constructMaterial(); // C4H8O - public static Materials Isobutyraldehyde = new MaterialBuilder(792, TextureSet.SET_FLUID, "Isobutyraldehyde") - .setName("Isobutyraldehyde").addCell().addFluid().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .setMeltingPoint(208).setExtraData(1) - .setMaterialList( - new MaterialStack(Materials.Carbon, 4), - new MaterialStack(Materials.Hydrogen, 8), - new MaterialStack(Materials.Oxygen, 1)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) - .constructMaterial(); // C4H8O - public static Materials NickelTetracarbonyl = new MaterialBuilder(791, TextureSet.SET_FLUID, "Nickel Tetracarbonyl") - .setName("NickelTetracarbonyl").addCell().addFluid().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .setMeltingPoint(256) - .setMaterialList( - new MaterialStack(Materials.Carbon, 4), - new MaterialStack(Materials.Nickel, 1), - new MaterialStack(Materials.Oxygen, 4)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1))) - .constructMaterial(); // C4NiO4 - public static Materials KevlarCatalyst = new MaterialBuilder(790, TextureSet.SET_DULL, "Polyurethane Catalyst A") - .setName("PolyurethaneCatalystADust").addDustItems().setRGB(50, 50, 50).setColor(Dyes.dyeBlack) - .setMeltingPoint(300) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1))) - .constructMaterial(); - public static Materials EthyleneOxide = new MaterialBuilder(789, TextureSet.SET_FLUID, "Ethylene Oxide") - .setName("EthyleneOxide").addCell().addGas().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .setMeltingPoint(160) - .setMaterialList( - new MaterialStack(Materials.Carbon, 2), - new MaterialStack(Materials.Hydrogen, 4), - new MaterialStack(Materials.Oxygen, 1)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) - .constructMaterial(); // C2H4O - public static Materials SiliconOil = new MaterialBuilder(788, TextureSet.SET_FLUID, "Silicon Oil") - .setName("SiliconOil").addCell().addFluid().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .setMeltingPoint(473) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1))) - .constructMaterial(); - public static Materials Ethyleneglycol = new MaterialBuilder(787, TextureSet.SET_FLUID, "Ethylene Glycol") - .setName("EthyleneGlycol").addCell().addFluid().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .setMeltingPoint(260) - .setMaterialList( - new MaterialStack(Materials.Carbon, 2), - new MaterialStack(Materials.Hydrogen, 6), - new MaterialStack(Materials.Oxygen, 2)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) - .constructMaterial(); // C2H6O2 - public static Materials Acetaldehyde = new MaterialBuilder(786, TextureSet.SET_FLUID, "Acetaldehyde") - .setName("Acetaldehyde").addCell().addGas().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .setMeltingPoint(150) - .setMaterialList( - new MaterialStack(Materials.Carbon, 2), - new MaterialStack(Materials.Hydrogen, 4), - new MaterialStack(Materials.Oxygen, 1)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) - .constructMaterial(); // C2H4O - public static Materials Pentaerythritol = new MaterialBuilder(785, TextureSet.SET_DULL, "Pentaerythritol") - .setName("Pentaerythritol").addDustItems().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .setMeltingPoint(533) - .setMaterialList( - new MaterialStack(Materials.Carbon, 5), - new MaterialStack(Materials.Hydrogen, 12), - new MaterialStack(Materials.Oxygen, 4)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1))) - .constructMaterial(); // C5H12O4 - public static Materials PolyurethaneResin = new MaterialBuilder(784, TextureSet.SET_FLUID, "Polyurethane Resin") - .setName("PolyurethaneResin").addCell().addFluid().setRGB(230, 230, 120).setColor(Dyes.dyeYellow) - .constructMaterial(); + "Diphenylmethane Diisocyanate Mixture").setName("DiphenylmethaneDiisocyanateMixture") + .addCell() + .addFluid() + .setRGB(255, 230, 50) + .setColor(Dyes.dyeYellow) + .setMeltingPoint(310) + .setMaterialList( + new MaterialStack(Materials.Carbon, 15), + new MaterialStack(Materials.Hydrogen, 10), + new MaterialStack(Materials.Nitrogen, 2), + new MaterialStack(Materials.Oxygen, 2)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack( + TC_Aspects.VENENUM, + 1))) + .constructMaterial(); // C15H10N2O2 + public static Materials Butyraldehyde = new MaterialBuilder( + 793, + TextureSet.SET_FLUID, + "Butyraldehyde").setName("Butyraldehyde") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(176) + .setMaterialList( + new MaterialStack(Materials.Carbon, 4), + new MaterialStack(Materials.Hydrogen, 8), + new MaterialStack(Materials.Oxygen, 1)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) + .constructMaterial(); // C4H8O + public static Materials Isobutyraldehyde = new MaterialBuilder( + 792, + TextureSet.SET_FLUID, + "Isobutyraldehyde").setName("Isobutyraldehyde") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(208) + .setExtraData(1) + .setMaterialList( + new MaterialStack(Materials.Carbon, 4), + new MaterialStack(Materials.Hydrogen, 8), + new MaterialStack(Materials.Oxygen, 1)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) + .constructMaterial(); // C4H8O + public static Materials NickelTetracarbonyl = new MaterialBuilder( + 791, + TextureSet.SET_FLUID, + "Nickel Tetracarbonyl").setName("NickelTetracarbonyl") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(256) + .setMaterialList( + new MaterialStack(Materials.Carbon, 4), + new MaterialStack(Materials.Nickel, 1), + new MaterialStack(Materials.Oxygen, 4)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1))) + .constructMaterial(); // C4NiO4 + public static Materials KevlarCatalyst = new MaterialBuilder( + 790, + TextureSet.SET_DULL, + "Polyurethane Catalyst A").setName("PolyurethaneCatalystADust") + .addDustItems() + .setRGB(50, 50, 50) + .setColor(Dyes.dyeBlack) + .setMeltingPoint(300) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1))) + .constructMaterial(); + public static Materials EthyleneOxide = new MaterialBuilder( + 789, + TextureSet.SET_FLUID, + "Ethylene Oxide").setName("EthyleneOxide") + .addCell() + .addGas() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(160) + .setMaterialList( + new MaterialStack(Materials.Carbon, 2), + new MaterialStack(Materials.Hydrogen, 4), + new MaterialStack(Materials.Oxygen, 1)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) + .constructMaterial(); // C2H4O + public static Materials SiliconOil = new MaterialBuilder( + 788, + TextureSet.SET_FLUID, + "Silicon Oil").setName("SiliconOil") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(473) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1))) + .constructMaterial(); + public static Materials Ethyleneglycol = new MaterialBuilder( + 787, + TextureSet.SET_FLUID, + "Ethylene Glycol").setName("EthyleneGlycol") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(260) + .setMaterialList( + new MaterialStack(Materials.Carbon, 2), + new MaterialStack(Materials.Hydrogen, 6), + new MaterialStack(Materials.Oxygen, 2)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) + .constructMaterial(); // C2H6O2 + public static Materials Acetaldehyde = new MaterialBuilder( + 786, + TextureSet.SET_FLUID, + "Acetaldehyde").setName("Acetaldehyde") + .addCell() + .addGas() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(150) + .setMaterialList( + new MaterialStack(Materials.Carbon, 2), + new MaterialStack(Materials.Hydrogen, 4), + new MaterialStack(Materials.Oxygen, 1)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) + .constructMaterial(); // C2H4O + public static Materials Pentaerythritol = new MaterialBuilder( + 785, + TextureSet.SET_DULL, + "Pentaerythritol").setName("Pentaerythritol") + .addDustItems() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(533) + .setMaterialList( + new MaterialStack(Materials.Carbon, 5), + new MaterialStack(Materials.Hydrogen, 12), + new MaterialStack(Materials.Oxygen, 4)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1))) + .constructMaterial(); // C5H12O4 + public static Materials PolyurethaneResin = new MaterialBuilder( + 784, + TextureSet.SET_FLUID, + "Polyurethane Resin").setName("PolyurethaneResin") + .addCell() + .addFluid() + .setRGB(230, 230, 120) + .setColor(Dyes.dyeYellow) + .constructMaterial(); public static Materials NMethylIIPyrrolidone = new MaterialBuilder( 783, TextureSet.SET_FLUID, - "N-Methyl-2-pyrrolidone").setName("NMethylpyrolidone").addCell().addFluid().setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite).setMeltingPoint(249) - .setMaterialList( - new MaterialStack(Materials.Carbon, 5), - new MaterialStack(Materials.Hydrogen, 9), - new MaterialStack(Materials.Nitrogen, 1), - new MaterialStack(Materials.Oxygen, 1)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))) - .constructMaterial(); // C5H9NO + "N-Methyl-2-pyrrolidone").setName("NMethylpyrolidone") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(249) + .setMaterialList( + new MaterialStack(Materials.Carbon, 5), + new MaterialStack(Materials.Hydrogen, 9), + new MaterialStack(Materials.Nitrogen, 1), + new MaterialStack(Materials.Oxygen, 1)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))) + .constructMaterial(); // C5H9NO public static Materials TerephthaloylChloride = new MaterialBuilder( 782, TextureSet.SET_POWDER, - "Terephthaloyl Chloride").setName("TerephthaloylChloride").addDustItems().setRGB(0, 255, 12) - .setColor(Dyes.dyeGreen).setMeltingPoint(355) - .setMaterialList( - new MaterialStack(Materials.Carbon, 8), - new MaterialStack(Materials.Hydrogen, 4), - new MaterialStack(Materials.Chlorine, 2), - new MaterialStack(Materials.Oxygen, 2)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1))) - .constructMaterial(); // C8H4Cl2O2 + "Terephthaloyl Chloride").setName("TerephthaloylChloride") + .addDustItems() + .setRGB(0, 255, 12) + .setColor(Dyes.dyeGreen) + .setMeltingPoint(355) + .setMaterialList( + new MaterialStack(Materials.Carbon, 8), + new MaterialStack(Materials.Hydrogen, 4), + new MaterialStack(Materials.Chlorine, 2), + new MaterialStack(Materials.Oxygen, 2)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1))) + .constructMaterial(); // C8H4Cl2O2 public static Materials Acetylene = new MaterialBuilder(781, TextureSet.SET_FLUID, "Acetylene").setName("Acetylene") - .addCell().addGas().setRGB(255, 255, 255).setColor(Dyes.dyeWhite).setMeltingPoint(192) - .setMaterialList(new MaterialStack(Materials.Carbon, 2), new MaterialStack(Materials.Hydrogen, 2)) - .constructMaterial(); // C2H2 TODO Add to JUPITER Athmosphere and Enceladus and to moon of Saturn - public static Materials IVNitroaniline = new MaterialBuilder(780, TextureSet.SET_FLUID, "4-Nitroaniline") - .setName("4Nitroaniline").addCell().addFluid().setRGB(255, 135, 51).setColor(Dyes.dyeOrange) - .setMeltingPoint(420) - .setMaterialList( - new MaterialStack(Materials.Carbon, 6), - new MaterialStack(Materials.Hydrogen, 6), - new MaterialStack(Materials.Nitrogen, 2), - new MaterialStack(Materials.Oxygen, 2)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1))) - .constructMaterial(); // C6H6N2O2 + .addCell() + .addGas() + .setRGB( + 255, + 255, + 255) + .setColor( + Dyes.dyeWhite) + .setMeltingPoint(192) + .setMaterialList( + new MaterialStack( + Materials.Carbon, + 2), + new MaterialStack( + Materials.Hydrogen, + 2)) + .constructMaterial(); // C2H2 + // TODO + // Add + // to + // JUPITER + // Athmosphere + // and + // Enceladus + // and + // to + // moon + // of + // Saturn + public static Materials IVNitroaniline = new MaterialBuilder( + 780, + TextureSet.SET_FLUID, + "4-Nitroaniline").setName("4Nitroaniline") + .addCell() + .addFluid() + .setRGB(255, 135, 51) + .setColor(Dyes.dyeOrange) + .setMeltingPoint(420) + .setMaterialList( + new MaterialStack(Materials.Carbon, 6), + new MaterialStack(Materials.Hydrogen, 6), + new MaterialStack(Materials.Nitrogen, 2), + new MaterialStack(Materials.Oxygen, 2)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1))) + .constructMaterial(); // C6H6N2O2 public static Materials ParaPhenylenediamine = new MaterialBuilder( 779, TextureSet.SET_POWDER, - "para-Phenylenediamine").setName("pPhenylenediamine").addDustItems().setRGB(251, 236, 93) - .setColor(Dyes.dyeYellow).setMeltingPoint(293) - .setMaterialList( - new MaterialStack(Materials.Carbon, 6), - new MaterialStack(Materials.Hydrogen, 8), - new MaterialStack(Materials.Nitrogen, 2)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1))) - .constructMaterial(); // C6H6N2 - public static Materials Methylamine = new MaterialBuilder(778, TextureSet.SET_FLUID, "Methylamine") - .setName("Methylamine").addCell().addGas().setRGB(65, 68, 105).setColor(Dyes.dyeGray).setMeltingPoint(180) - .setExtraData(1) - .setMaterialList( - new MaterialStack(Materials.Carbon, 1), - new MaterialStack(Materials.Hydrogen, 5), - new MaterialStack(Materials.Nitrogen, 1)) - .constructMaterial(); // CH5N - public static Materials Trimethylamine = new MaterialBuilder(777, TextureSet.SET_FLUID, "Trimethylamine") - .setName("Trimethylamine").addCell().addGas().setRGB(105, 68, 105).setColor(Dyes.dyeGray) - .setMeltingPoint(156).setExtraData(1) - .setMaterialList( - new MaterialStack(Materials.Carbon, 3), - new MaterialStack(Materials.Hydrogen, 9), - new MaterialStack(Materials.Nitrogen, 1)) - .constructMaterial(); // C3H9N - public static Materials GammaButyrolactone = new MaterialBuilder(776, TextureSet.SET_FLUID, "gamma-Butyrolactone") - .setName("GammaButyrolactone").addCell().addFluid().setRGB(255, 255, 151).setColor(Dyes.dyeYellow) - .setMeltingPoint(229) - .setMaterialList( - new MaterialStack(Materials.Carbon, 4), - new MaterialStack(Materials.Hydrogen, 6), - new MaterialStack(Materials.Oxygen, 2)) - .constructMaterial(); // C4H6O2 - public static Materials CalciumCarbide = new MaterialBuilder(775, TextureSet.SET_DULL, "Calcium Carbide") - .setName("CacliumCarbide").addDustItems().setRGB(235, 235, 235).setColor(Dyes.dyeGray).setMeltingPoint(2430) - .setMaterialList(new MaterialStack(Materials.Calcium, 1), new MaterialStack(Materials.Carbon, 2)) - .constructMaterial(); // CaC2 + "para-Phenylenediamine").setName("pPhenylenediamine") + .addDustItems() + .setRGB(251, 236, 93) + .setColor(Dyes.dyeYellow) + .setMeltingPoint(293) + .setMaterialList( + new MaterialStack(Materials.Carbon, 6), + new MaterialStack(Materials.Hydrogen, 8), + new MaterialStack(Materials.Nitrogen, 2)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1))) + .constructMaterial(); // C6H6N2 + public static Materials Methylamine = new MaterialBuilder( + 778, + TextureSet.SET_FLUID, + "Methylamine").setName("Methylamine") + .addCell() + .addGas() + .setRGB(65, 68, 105) + .setColor(Dyes.dyeGray) + .setMeltingPoint(180) + .setExtraData(1) + .setMaterialList( + new MaterialStack(Materials.Carbon, 1), + new MaterialStack(Materials.Hydrogen, 5), + new MaterialStack(Materials.Nitrogen, 1)) + .constructMaterial(); // CH5N + public static Materials Trimethylamine = new MaterialBuilder( + 777, + TextureSet.SET_FLUID, + "Trimethylamine").setName("Trimethylamine") + .addCell() + .addGas() + .setRGB(105, 68, 105) + .setColor(Dyes.dyeGray) + .setMeltingPoint(156) + .setExtraData(1) + .setMaterialList( + new MaterialStack(Materials.Carbon, 3), + new MaterialStack(Materials.Hydrogen, 9), + new MaterialStack(Materials.Nitrogen, 1)) + .constructMaterial(); // C3H9N + public static Materials GammaButyrolactone = new MaterialBuilder( + 776, + TextureSet.SET_FLUID, + "gamma-Butyrolactone").setName("GammaButyrolactone") + .addCell() + .addFluid() + .setRGB(255, 255, 151) + .setColor(Dyes.dyeYellow) + .setMeltingPoint(229) + .setMaterialList( + new MaterialStack(Materials.Carbon, 4), + new MaterialStack(Materials.Hydrogen, 6), + new MaterialStack(Materials.Oxygen, 2)) + .constructMaterial(); // C4H6O2 + public static Materials CalciumCarbide = new MaterialBuilder( + 775, + TextureSet.SET_DULL, + "Calcium Carbide").setName("CacliumCarbide") + .addDustItems() + .setRGB(235, 235, 235) + .setColor(Dyes.dyeGray) + .setMeltingPoint(2430) + .setMaterialList( + new MaterialStack(Materials.Calcium, 1), + new MaterialStack(Materials.Carbon, 2)) + .constructMaterial(); // CaC2 public static Materials LiquidCrystalKevlar = new MaterialBuilder( 774, TextureSet.SET_FLUID, - "Liquid Crystal Kevlar").setName("LiquidCrystalKevlar").addCell().addFluid().setRGB(240, 240, 120) - .setColor(Dyes.dyeYellow).constructMaterial(); // [-CO-C6H4-CO-NH-C6H4-NH-]n - public static Materials IIButinIIVdiol = new MaterialBuilder(773, TextureSet.SET_POWDER, "2-Butin-1,4-diol") - .setName("2Butin14diol").addDustItems().setRGB(247, 247, 180).setColor(Dyes.dyeYellow).setMeltingPoint(331) - .setMaterialList( - new MaterialStack(Materials.Carbon, 4), - new MaterialStack(Materials.Hydrogen, 6), - new MaterialStack(Materials.Oxygen, 2)) - .constructMaterial(); // C4H6O2 - public static Materials NickelAluminide = new MaterialBuilder(772, TextureSet.SET_METALLIC, "Nickel Aluminide") - .setName("NickelAluminide").addDustItems().addMetalItems().setRGB(230, 230, 230).setColor(Dyes.dyeGray) - .setMeltingPoint(1668).setBlastFurnaceTemp(1668).setBlastFurnaceRequired(true) - .setMaterialList(new MaterialStack(Materials.Nickel, 1), new MaterialStack(Materials.Aluminium, 3)) - .constructMaterial().disableAutoGeneratedBlastFurnaceRecipes(); // NiAl3 - public static Materials RaneyNickelActivated = new MaterialBuilder(771, TextureSet.SET_POWDER, "Raney Nickel") - .setName("RaneyNickelActivated").addDustItems().setRGB(230, 230, 230).setColor(Dyes.dyeGray) - .setMeltingPoint(1955) - .setMaterialList(new MaterialStack(Materials.Nickel, 1), new MaterialStack(Materials.Aluminium, 1)) - .constructMaterial(); // NiAl - public static Materials BismuthIIIOxide = new MaterialBuilder(769, TextureSet.SET_POWDER, "Bismuth Oxide") - .setName("BismuthIIIOxide").addDustItems().setRGB(50, 50, 50).setColor(Dyes.dyeBlack).setMeltingPoint(1090) - .setMaterialList(new MaterialStack(Materials.Bismuth, 2), new MaterialStack(Materials.Oxygen, 3)) - .constructMaterial(); // Bi2O3 - public static Materials ThionylChloride = new MaterialBuilder(768, TextureSet.SET_FLUID, "Thionyl Chloride") - .setName("ThionylChloride").addCell().addFluid().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .constructMaterial(); // SOCl2 - public static Materials SulfurDichloride = new MaterialBuilder(767, TextureSet.SET_FLUID, "Sulfur Dichloride") - .setName("SulfurDichloride").addCell().addFluid().setRGB(200, 0, 0).setColor(Dyes.dyeRed) - .constructMaterial(); // SCl2 + "Liquid Crystal Kevlar").setName("LiquidCrystalKevlar") + .addCell() + .addFluid() + .setRGB(240, 240, 120) + .setColor(Dyes.dyeYellow) + .constructMaterial(); // [-CO-C6H4-CO-NH-C6H4-NH-]n + public static Materials IIButinIIVdiol = new MaterialBuilder( + 773, + TextureSet.SET_POWDER, + "2-Butin-1,4-diol").setName("2Butin14diol") + .addDustItems() + .setRGB(247, 247, 180) + .setColor(Dyes.dyeYellow) + .setMeltingPoint(331) + .setMaterialList( + new MaterialStack(Materials.Carbon, 4), + new MaterialStack(Materials.Hydrogen, 6), + new MaterialStack(Materials.Oxygen, 2)) + .constructMaterial(); // C4H6O2 + public static Materials NickelAluminide = new MaterialBuilder( + 772, + TextureSet.SET_METALLIC, + "Nickel Aluminide").setName("NickelAluminide") + .addDustItems() + .addMetalItems() + .setRGB(230, 230, 230) + .setColor(Dyes.dyeGray) + .setMeltingPoint(1668) + .setBlastFurnaceTemp(1668) + .setBlastFurnaceRequired(true) + .setMaterialList( + new MaterialStack(Materials.Nickel, 1), + new MaterialStack(Materials.Aluminium, 3)) + .constructMaterial() + .disableAutoGeneratedBlastFurnaceRecipes(); // NiAl3 + public static Materials RaneyNickelActivated = new MaterialBuilder( + 771, + TextureSet.SET_POWDER, + "Raney Nickel").setName("RaneyNickelActivated") + .addDustItems() + .setRGB(230, 230, 230) + .setColor(Dyes.dyeGray) + .setMeltingPoint(1955) + .setMaterialList( + new MaterialStack(Materials.Nickel, 1), + new MaterialStack(Materials.Aluminium, 1)) + .constructMaterial(); // NiAl + public static Materials BismuthIIIOxide = new MaterialBuilder( + 769, + TextureSet.SET_POWDER, + "Bismuth Oxide").setName("BismuthIIIOxide") + .addDustItems() + .setRGB(50, 50, 50) + .setColor(Dyes.dyeBlack) + .setMeltingPoint(1090) + .setMaterialList( + new MaterialStack(Materials.Bismuth, 2), + new MaterialStack(Materials.Oxygen, 3)) + .constructMaterial(); // Bi2O3 + public static Materials ThionylChloride = new MaterialBuilder( + 768, + TextureSet.SET_FLUID, + "Thionyl Chloride").setName("ThionylChloride") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .constructMaterial(); // SOCl2 + public static Materials SulfurDichloride = new MaterialBuilder( + 767, + TextureSet.SET_FLUID, + "Sulfur Dichloride").setName("SulfurDichloride") + .addCell() + .addFluid() + .setRGB(200, 0, 0) + .setColor(Dyes.dyeRed) + .constructMaterial(); // SCl2 public static Materials DimethylTerephthalate = new MaterialBuilder( 766, TextureSet.SET_FLUID, - "Dimethyl Terephthalate").setName("DimethylTerephthalate").addCell().addFluid().setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite).setMeltingPoint(415) - .setMaterialList( - new MaterialStack(Materials.Carbon, 10), - new MaterialStack(Materials.Hydrogen, 10), - new MaterialStack(Materials.Oxygen, 4)) - .constructMaterial(); // C10H10O4 + "Dimethyl Terephthalate").setName("DimethylTerephthalate") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(415) + .setMaterialList( + new MaterialStack(Materials.Carbon, 10), + new MaterialStack(Materials.Hydrogen, 10), + new MaterialStack(Materials.Oxygen, 4)) + .constructMaterial(); // C10H10O4 public static Materials Kevlar = new MaterialBuilder(765, TextureSet.SET_DULL, "Kevlar").setName("Kevlar") - .addDustItems().addMetalItems().addGearItems().setRGB(240, 240, 120).setColor(Dyes.dyeYellow) - .constructMaterial(); - public static Materials TerephthalicAcid = new MaterialBuilder(764, TextureSet.SET_FLUID, "Terephthalic Acid") - .setName("TerephthalicAcid").addCell().addFluid().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .setMeltingPoint(480) - .setMaterialList( - new MaterialStack(Materials.Carbon, 8L), - new MaterialStack(Materials.Hydrogen, 6), - new MaterialStack(Materials.Oxygen, 4)) - .constructMaterial(); // C9H6O6 - public static Materials IIIDimethylbenzene = new MaterialBuilder(763, TextureSet.SET_FLUID, "1,3-Dimethylbenzen") - .addCell().addFluid().setRGB(112, 146, 74).setColor(Dyes.dyeLime).setMeltingPoint(225) - .setMaterialList(new MaterialStack(Materials.Carbon, 8), new MaterialStack(Materials.Hydrogen, 10)) - .addElectrolyzerRecipe().constructMaterial(); // C8H10 - public static Materials IVDimethylbenzene = new MaterialBuilder(762, TextureSet.SET_FLUID, "1,4-Dimethylbenzen") - .addCell().addFluid().setRGB(122, 136, 84).setColor(Dyes.dyeLime).setMeltingPoint(286) - .setMaterialList(new MaterialStack(Materials.Carbon, 8), new MaterialStack(Materials.Hydrogen, 10)) - .addElectrolyzerRecipe().constructMaterial(); // C8H10 - public static Materials CobaltIINaphthenate = new MaterialBuilder(761, TextureSet.SET_DULL, "Cobalt II Naphthenate") - .setName("Cobalt(II)Naphthenate").addDustItems().setRGB(143, 95, 39).setColor(Dyes.dyeBrown) - .setMeltingPoint(413) - .setMaterialList( - new MaterialStack(Materials.Cobalt, 1), - new MaterialStack(Materials.Carbon, 22), - new MaterialStack(Materials.Hydrogen, 14), - new MaterialStack(Materials.Oxygen, 4)) - .constructMaterial(); // CoC22H14O4 - public static Materials NaphthenicAcid = new MaterialBuilder(760, TextureSet.SET_FLUID, "Naphthenic Acid") - .setName("NaphthenicAcid").addCell().addFluid().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .setFuelType(MaterialBuilder.SEMIFLUID).setFuelPower(80).constructMaterial(); - public static Materials CobaltIIHydroxide = new MaterialBuilder(759, TextureSet.SET_POWDER, "Cobalt II Hydroxide") - .setName("CobaltIIHydroxide").addDustItems().setRGB(229, 140, 239).setColor(Dyes.dyePurple) - .setMeltingPoint(441) - .setMaterialList( - new MaterialStack(Materials.Cobalt, 1), - new MaterialStack(Materials.Hydrogen, 2), - new MaterialStack(Materials.Oxygen, 2)) - .constructMaterial(); // CoH2O2 - public static Materials CobaltIIAcetate = new MaterialBuilder(758, TextureSet.SET_POWDER, "Cobalt II Acetate") - .setName("Cobalt(II)Acetate").addDustItems().setRGB(219, 162, 229).setColor(Dyes.dyePurple) - .setMeltingPoint(413) - .setMaterialList( - new MaterialStack(Materials.Carbon, 4L), - new MaterialStack(Materials.Hydrogen, 6), - new MaterialStack(Materials.Cobalt, 1), - new MaterialStack(Materials.Oxygen, 4)) - .constructMaterial(); // C4H6CoO4 - public static Materials CobaltIINitrate = new MaterialBuilder(757, TextureSet.SET_POWDER, "Cobalt II Nitrate") - .setName("Cobalt(II)Nitrate").addDustItems().setRGB(170, 0, 0).setColor(Dyes.dyeRed).setMeltingPoint(373) - .setMaterialList( - new MaterialStack(Materials.Cobalt, 1), - new MaterialStack(Materials.Nitrogen, 2), - new MaterialStack(Materials.Oxygen, 6)) - .constructMaterial(); // Co(NO3)2 + .addDustItems() + .addMetalItems() + .addGearItems() + .setRGB(240, 240, 120) + .setColor(Dyes.dyeYellow) + .constructMaterial(); + public static Materials TerephthalicAcid = new MaterialBuilder( + 764, + TextureSet.SET_FLUID, + "Terephthalic Acid").setName("TerephthalicAcid") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(480) + .setMaterialList( + new MaterialStack(Materials.Carbon, 8L), + new MaterialStack(Materials.Hydrogen, 6), + new MaterialStack(Materials.Oxygen, 4)) + .constructMaterial(); // C9H6O6 + public static Materials IIIDimethylbenzene = new MaterialBuilder( + 763, + TextureSet.SET_FLUID, + "1,3-Dimethylbenzen").addCell() + .addFluid() + .setRGB(112, 146, 74) + .setColor(Dyes.dyeLime) + .setMeltingPoint(225) + .setMaterialList( + new MaterialStack(Materials.Carbon, 8), + new MaterialStack(Materials.Hydrogen, 10)) + .addElectrolyzerRecipe() + .constructMaterial(); // C8H10 + public static Materials IVDimethylbenzene = new MaterialBuilder( + 762, + TextureSet.SET_FLUID, + "1,4-Dimethylbenzen").addCell() + .addFluid() + .setRGB(122, 136, 84) + .setColor(Dyes.dyeLime) + .setMeltingPoint(286) + .setMaterialList( + new MaterialStack(Materials.Carbon, 8), + new MaterialStack(Materials.Hydrogen, 10)) + .addElectrolyzerRecipe() + .constructMaterial(); // C8H10 + public static Materials CobaltIINaphthenate = new MaterialBuilder( + 761, + TextureSet.SET_DULL, + "Cobalt II Naphthenate").setName("Cobalt(II)Naphthenate") + .addDustItems() + .setRGB(143, 95, 39) + .setColor(Dyes.dyeBrown) + .setMeltingPoint(413) + .setMaterialList( + new MaterialStack(Materials.Cobalt, 1), + new MaterialStack(Materials.Carbon, 22), + new MaterialStack(Materials.Hydrogen, 14), + new MaterialStack(Materials.Oxygen, 4)) + .constructMaterial(); // CoC22H14O4 + public static Materials NaphthenicAcid = new MaterialBuilder( + 760, + TextureSet.SET_FLUID, + "Naphthenic Acid").setName("NaphthenicAcid") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setFuelType(MaterialBuilder.SEMIFLUID) + .setFuelPower(80) + .constructMaterial(); + public static Materials CobaltIIHydroxide = new MaterialBuilder( + 759, + TextureSet.SET_POWDER, + "Cobalt II Hydroxide").setName("CobaltIIHydroxide") + .addDustItems() + .setRGB(229, 140, 239) + .setColor(Dyes.dyePurple) + .setMeltingPoint(441) + .setMaterialList( + new MaterialStack(Materials.Cobalt, 1), + new MaterialStack(Materials.Hydrogen, 2), + new MaterialStack(Materials.Oxygen, 2)) + .constructMaterial(); // CoH2O2 + public static Materials CobaltIIAcetate = new MaterialBuilder( + 758, + TextureSet.SET_POWDER, + "Cobalt II Acetate").setName("Cobalt(II)Acetate") + .addDustItems() + .setRGB(219, 162, 229) + .setColor(Dyes.dyePurple) + .setMeltingPoint(413) + .setMaterialList( + new MaterialStack(Materials.Carbon, 4L), + new MaterialStack(Materials.Hydrogen, 6), + new MaterialStack(Materials.Cobalt, 1), + new MaterialStack(Materials.Oxygen, 4)) + .constructMaterial(); // C4H6CoO4 + public static Materials CobaltIINitrate = new MaterialBuilder( + 757, + TextureSet.SET_POWDER, + "Cobalt II Nitrate").setName("Cobalt(II)Nitrate") + .addDustItems() + .setRGB(170, 0, 0) + .setColor(Dyes.dyeRed) + .setMeltingPoint(373) + .setMaterialList( + new MaterialStack(Materials.Cobalt, 1), + new MaterialStack(Materials.Nitrogen, 2), + new MaterialStack(Materials.Oxygen, 6)) + .constructMaterial(); // Co(NO3)2 public static Materials OrganorhodiumCatalyst = new MaterialBuilder( 756, TextureSet.SET_POWDER, - "Organorhodium Catalyst").setName("OrganorhodiumCatalyst").addDustItems().setRGB(170, 0, 0) - .setColor(Dyes.dyeRed).setMeltingPoint(373) - .setMaterialList(new MaterialStack(Materials.Cobalt, 1), new MaterialStack(Materials.NitricAcid, 2)) - .constructMaterial(); // RhHCO(P(C6H5)3)3 - public static Materials SodiumBorohydride = new MaterialBuilder(755, TextureSet.SET_POWDER, "Sodium Borohydride") - .setName("SodiumBorohydride").addDustItems().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .setMeltingPoint(673) - .setMaterialList( - new MaterialStack(Materials.Sodium, 1), - new MaterialStack(Materials.Boron, 1), - new MaterialStack(Materials.Hydrogen, 4)) - .constructMaterial(); // NaBH4 - public static Materials RhodiumChloride = new MaterialBuilder(754, TextureSet.SET_POWDER, "Rhodium Chloride") - .setName("RhodiumChloride").addDustItems().setRGB(128, 0, 0).setColor(Dyes.dyeRed).setMeltingPoint(723) - .constructMaterial(); // RHCL3 - public static Materials Triphenylphosphene = new MaterialBuilder(753, TextureSet.SET_POWDER, "Triphenylphosphine") - .setName("Triphenylphosphene").addDustItems().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .setMeltingPoint(353) - .setMaterialList( - new MaterialStack(Materials.Carbon, 18L), - new MaterialStack(Materials.Hydrogen, 15L), - new MaterialStack(Materials.Phosphorus, 1L)) - .constructMaterial(); // C18H15P + "Organorhodium Catalyst").setName("OrganorhodiumCatalyst") + .addDustItems() + .setRGB(170, 0, 0) + .setColor(Dyes.dyeRed) + .setMeltingPoint(373) + .setMaterialList( + new MaterialStack(Materials.Cobalt, 1), + new MaterialStack(Materials.NitricAcid, 2)) + .constructMaterial(); // RhHCO(P(C6H5)3)3 + public static Materials SodiumBorohydride = new MaterialBuilder( + 755, + TextureSet.SET_POWDER, + "Sodium Borohydride").setName("SodiumBorohydride") + .addDustItems() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(673) + .setMaterialList( + new MaterialStack(Materials.Sodium, 1), + new MaterialStack(Materials.Boron, 1), + new MaterialStack(Materials.Hydrogen, 4)) + .constructMaterial(); // NaBH4 + public static Materials RhodiumChloride = new MaterialBuilder( + 754, + TextureSet.SET_POWDER, + "Rhodium Chloride").setName("RhodiumChloride") + .addDustItems() + .setRGB(128, 0, 0) + .setColor(Dyes.dyeRed) + .setMeltingPoint(723) + .constructMaterial(); // RHCL3 + public static Materials Triphenylphosphene = new MaterialBuilder( + 753, + TextureSet.SET_POWDER, + "Triphenylphosphine").setName("Triphenylphosphene") + .addDustItems() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(353) + .setMaterialList( + new MaterialStack(Materials.Carbon, 18L), + new MaterialStack(Materials.Hydrogen, 15L), + new MaterialStack(Materials.Phosphorus, 1L)) + .constructMaterial(); // C18H15P public static Materials PhosphorusTrichloride = new MaterialBuilder( 752, TextureSet.SET_FLUID, - "Phosphorus Trichloride").setName("PhosphorusTrichloride").addCell().addFluid().setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite).setMeltingPoint(179) - .setMaterialList( - new MaterialStack(Materials.Phosphorus, 1L), - new MaterialStack(Materials.Chlorine, 3L)) - .constructMaterial(); // PCL3 - public static Materials SodiumHydride = new MaterialBuilder(751, TextureSet.SET_POWDER, "Sodium Hydride") - .setName("SodiumHydride").addDustItems().setRGB(192, 192, 192).setColor(Dyes.dyeLightGray) - .setMeltingPoint(911) - .setMaterialList(new MaterialStack(Materials.Sodium, 1L), new MaterialStack(Materials.Hydrogen, 1L)) - .constructMaterial(); // NaH - public static Materials TrimethylBorate = new MaterialBuilder(750, TextureSet.SET_FLUID, "Trimethyl Borate") - .setName("TrimethylBorate").addCell().addFluid().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .setMeltingPoint(239) - .setMaterialList( - new MaterialStack(Materials.Carbon, 3L), - new MaterialStack(Materials.Hydrogen, 9L), - new MaterialStack(Materials.Boron, 1L), - new MaterialStack(Materials.Oxygen, 3L)) - .constructMaterial(); // C3H9BO3 - public static Materials SodiumMethoxide = new MaterialBuilder(749, TextureSet.SET_POWDER, "Sodium Methoxide") - .setName("SodiumMethoxide").addDustItems().setRGB(255, 255, 255).setColor(Dyes.dyeWhite) - .setMeltingPoint(400) - .setMaterialList( - new MaterialStack(Materials.Carbon, 1L), - new MaterialStack(Materials.Hydrogen, 3L), - new MaterialStack(Materials.Oxygen, 1L), - new MaterialStack(Materials.Sodium, 1L)) - .constructMaterial(); // CH3NaO + "Phosphorus Trichloride").setName("PhosphorusTrichloride") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(179) + .setMaterialList( + new MaterialStack(Materials.Phosphorus, 1L), + new MaterialStack(Materials.Chlorine, 3L)) + .constructMaterial(); // PCL3 + public static Materials SodiumHydride = new MaterialBuilder( + 751, + TextureSet.SET_POWDER, + "Sodium Hydride").setName("SodiumHydride") + .addDustItems() + .setRGB(192, 192, 192) + .setColor(Dyes.dyeLightGray) + .setMeltingPoint(911) + .setMaterialList( + new MaterialStack(Materials.Sodium, 1L), + new MaterialStack(Materials.Hydrogen, 1L)) + .constructMaterial(); // NaH + public static Materials TrimethylBorate = new MaterialBuilder( + 750, + TextureSet.SET_FLUID, + "Trimethyl Borate").setName("TrimethylBorate") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(239) + .setMaterialList( + new MaterialStack(Materials.Carbon, 3L), + new MaterialStack(Materials.Hydrogen, 9L), + new MaterialStack(Materials.Boron, 1L), + new MaterialStack(Materials.Oxygen, 3L)) + .constructMaterial(); // C3H9BO3 + public static Materials SodiumMethoxide = new MaterialBuilder( + 749, + TextureSet.SET_POWDER, + "Sodium Methoxide").setName("SodiumMethoxide") + .addDustItems() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(400) + .setMaterialList( + new MaterialStack(Materials.Carbon, 1L), + new MaterialStack(Materials.Hydrogen, 3L), + new MaterialStack(Materials.Oxygen, 1L), + new MaterialStack(Materials.Sodium, 1L)) + .constructMaterial(); // CH3NaO // H3RhCl6 diff --git a/src/main/java/gregtech/api/enums/MaterialsOreAlum.java b/src/main/java/gregtech/api/enums/MaterialsOreAlum.java index f90e39e493..12c03396fc 100644 --- a/src/main/java/gregtech/api/enums/MaterialsOreAlum.java +++ b/src/main/java/gregtech/api/enums/MaterialsOreAlum.java @@ -2,31 +2,89 @@ package gregtech.api.enums; public class MaterialsOreAlum { - public static Materials BauxiteSlurry = new MaterialBuilder(409, TextureSet.SET_FLUID, "Bauxite Slurry") - .setName("BauxiteSlurry").addCell().addFluid().setRGB(37, 67, 168).setMeltingPoint(295) - .setColor(Dyes.dyeBlue).constructMaterial(); + public static Materials BauxiteSlurry = new MaterialBuilder( + 409, + TextureSet.SET_FLUID, + "Bauxite Slurry").setName("BauxiteSlurry") + .addCell() + .addFluid() + .setRGB(37, 67, 168) + .setMeltingPoint(295) + .setColor(Dyes.dyeBlue) + .constructMaterial(); public static Materials HeatedBauxiteSlurry = new MaterialBuilder( 410, TextureSet.SET_FLUID, - "Heated Bauxite Slurry").setName("HeadedBauxiteSlurry").addCell().addFluid().setRGB(55, 92, 212) - .setLiquidTemperature(533).setMeltingPoint(295).setColor(Dyes.dyeBlue).constructMaterial(); - public static Materials SluiceJuice = new MaterialBuilder(411, TextureSet.SET_FLUID, "Sluice Juice") - .setName("SluiceJuice").addCell().addFluid().setRGB(92, 60, 36).setLiquidTemperature(295) - .setMeltingPoint(295).setColor(Dyes.dyeGray).constructMaterial(); - public static Materials SluiceSand = new MaterialBuilder(412, TextureSet.SET_FINE, "Sluice Sand") - .setName("SluiceSand").addDustItems().setRGB(165, 165, 120).setColor(Dyes.dyeGray).constructMaterial(); - public static Materials BauxiteSlag = new MaterialBuilder(413, TextureSet.SET_FINE, "Bauxite Slag") - .setName("BauxiteSlag").addDustItems().setRGB(110, 31, 31).setColor(Dyes.dyeRed).constructMaterial(); - public static Materials IlmeniteSlag = new MaterialBuilder(414, TextureSet.SET_FINE, "Ilmenite Slag") - .setName("IlmeniteSlag").addDustItems().setRGB(163, 38, 38).setColor(Dyes.dyeBrown).constructMaterial(); - public static Materials GreenSapphireJuice = new MaterialBuilder(415, TextureSet.SET_FLUID, "Green Sapphire Juice") - .setName("GreenSapphireJuice").addCell().addFluid().setRGB(100, 200, 130).setColor(Dyes.dyeGreen) - .constructMaterial(); - public static Materials SapphireJuice = new MaterialBuilder(416, TextureSet.SET_FLUID, "Sapphire Juice") - .setName("SapphireJuice").addCell().addFluid().setRGB(100, 100, 200).setColor(Dyes.dyeBlue) - .constructMaterial(); - public static Materials RubyJuice = new MaterialBuilder(417, TextureSet.SET_FLUID, "Ruby Juice") - .setName("RubyJuice").addCell().addFluid().setRGB(255, 100, 100).setColor(Dyes.dyeRed).constructMaterial(); + "Heated Bauxite Slurry").setName("HeadedBauxiteSlurry") + .addCell() + .addFluid() + .setRGB(55, 92, 212) + .setLiquidTemperature(533) + .setMeltingPoint(295) + .setColor(Dyes.dyeBlue) + .constructMaterial(); + public static Materials SluiceJuice = new MaterialBuilder( + 411, + TextureSet.SET_FLUID, + "Sluice Juice").setName("SluiceJuice") + .addCell() + .addFluid() + .setRGB(92, 60, 36) + .setLiquidTemperature(295) + .setMeltingPoint(295) + .setColor(Dyes.dyeGray) + .constructMaterial(); + public static Materials SluiceSand = new MaterialBuilder( + 412, + TextureSet.SET_FINE, + "Sluice Sand").setName("SluiceSand") + .addDustItems() + .setRGB(165, 165, 120) + .setColor(Dyes.dyeGray) + .constructMaterial(); + public static Materials BauxiteSlag = new MaterialBuilder( + 413, + TextureSet.SET_FINE, + "Bauxite Slag").setName("BauxiteSlag") + .addDustItems() + .setRGB(110, 31, 31) + .setColor(Dyes.dyeRed) + .constructMaterial(); + public static Materials IlmeniteSlag = new MaterialBuilder( + 414, + TextureSet.SET_FINE, + "Ilmenite Slag").setName("IlmeniteSlag") + .addDustItems() + .setRGB(163, 38, 38) + .setColor(Dyes.dyeBrown) + .constructMaterial(); + public static Materials GreenSapphireJuice = new MaterialBuilder( + 415, + TextureSet.SET_FLUID, + "Green Sapphire Juice").setName("GreenSapphireJuice") + .addCell() + .addFluid() + .setRGB(100, 200, 130) + .setColor(Dyes.dyeGreen) + .constructMaterial(); + public static Materials SapphireJuice = new MaterialBuilder( + 416, + TextureSet.SET_FLUID, + "Sapphire Juice").setName("SapphireJuice") + .addCell() + .addFluid() + .setRGB(100, 100, 200) + .setColor(Dyes.dyeBlue) + .constructMaterial(); + public static Materials RubyJuice = new MaterialBuilder( + 417, + TextureSet.SET_FLUID, + "Ruby Juice").setName("RubyJuice") + .addCell() + .addFluid() + .setRGB(255, 100, 100) + .setColor(Dyes.dyeRed) + .constructMaterial(); /** * called by Materials. Can be safely called multiple times. exists to allow Materials ensure this class is diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 2bb2aaf402..4139f90db1 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -709,9 +709,11 @@ public enum OrePrefixes { ingot.addFamiliarPrefix(nugget); nugget.addFamiliarPrefix(ingot); - for (OrePrefixes tPrefix1 : values()) - if (tPrefix1.name().startsWith("ore")) for (OrePrefixes tPrefix2 : values()) - if (tPrefix2.name().startsWith("ore")) tPrefix1.addFamiliarPrefix(tPrefix2); + for (OrePrefixes tPrefix1 : values()) if (tPrefix1.name() + .startsWith("ore")) + for (OrePrefixes tPrefix2 : values()) if (tPrefix2.name() + .startsWith("ore")) + tPrefix1.addFamiliarPrefix(tPrefix2); // These are only the important ones. gem.mNotGeneratedItems.add(Materials.Coal); @@ -1137,59 +1139,109 @@ public enum OrePrefixes { public static void initMaterialComponents() { boolean enablePerItemSettings = GregTech_API.sMaterialComponents.get("general", "enablePerItemSettings", false); - boolean enableUnusedIngotHot = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedIngotHot", false); - boolean enableUnusedPlates = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedPlates", false); - boolean enableUnusedDoubleIngots = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedDoubleIngots", false); - boolean enableUnusedTripleIngots = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedTripleIngots", false); - boolean enableUnusedQuadIngots = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedQuadIngots", false); - boolean enableUnusedQuinIngots = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedQuinIngots", false); - boolean enableUnusedDoublePlates = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedDoublePlates", false); - boolean enableUnusedTriplePlates = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedTriplePlates", false); - boolean enableUnusedQuadPlates = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedQuadPlates", false); - boolean enableUnusedQuinPlates = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedQuinPlates", false); - boolean enableUnusedDensePlates = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedDensePlates", false); - boolean enableUnusedGears = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedGears", false); - boolean enableUnusedSmallGears = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedSmallGears", false); - boolean enableUnusedRings = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedRings", false); - boolean enableUnusedSprings = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedSprings", false); - boolean enableUnusedSmallSprings = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedSmallSprings", false); - boolean enableUnusedRounds = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedRounds", false); - boolean enableUnusedRotors = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedRotors", false); - boolean enableUnusedFineWires = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedFineWires", false); + boolean enableUnusedIngotHot = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedIngotHot", + false); + boolean enableUnusedPlates = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedPlates", + false); + boolean enableUnusedDoubleIngots = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedDoubleIngots", + false); + boolean enableUnusedTripleIngots = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedTripleIngots", + false); + boolean enableUnusedQuadIngots = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedQuadIngots", + false); + boolean enableUnusedQuinIngots = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedQuinIngots", + false); + boolean enableUnusedDoublePlates = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedDoublePlates", + false); + boolean enableUnusedTriplePlates = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedTriplePlates", + false); + boolean enableUnusedQuadPlates = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedQuadPlates", + false); + boolean enableUnusedQuinPlates = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedQuinPlates", + false); + boolean enableUnusedDensePlates = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedDensePlates", + false); + boolean enableUnusedGears = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedGears", + false); + boolean enableUnusedSmallGears = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedSmallGears", + false); + boolean enableUnusedRings = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedRings", + false); + boolean enableUnusedSprings = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedSprings", + false); + boolean enableUnusedSmallSprings = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedSmallSprings", + false); + boolean enableUnusedRounds = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedRounds", + false); + boolean enableUnusedRotors = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedRotors", + false); + boolean enableUnusedFineWires = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedFineWires", + false); boolean enableUnusedFoil = GregTech_API.sMaterialComponents.get("globalcomponents", "enableUnusedFoil", false); - boolean enableUnusedArrows = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedArrowHeads", false); - boolean enableUnusedCrates = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedCrates", false); - boolean enableUnusedBolts = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedBolts", false); - boolean enableUnusedScrews = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedScrews", false); + boolean enableUnusedArrows = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedArrowHeads", + false); + boolean enableUnusedCrates = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedCrates", + false); + boolean enableUnusedBolts = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedBolts", + false); + boolean enableUnusedScrews = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedScrews", + false); boolean enableUnusedRods = GregTech_API.sMaterialComponents.get("globalcomponents", "enableUnusedRods", false); - boolean enableUnusedLongRods = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedLongRods", false); + boolean enableUnusedLongRods = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedLongRods", + false); boolean enableUnusedGems = GregTech_API.sMaterialComponents.get("globalcomponents", "enableUnusedGems", false); - boolean enableUnusedItemCasing = GregTech_API.sMaterialComponents - .get("globalcomponents", "enableUnusedItemCasing", false); + boolean enableUnusedItemCasing = GregTech_API.sMaterialComponents.get( + "globalcomponents", + "enableUnusedItemCasing", + false); // TODO possibly use OrePrefix mNotGeneratedItems/mGeneratedItems instead of a static List for every material // instance? @@ -1512,12 +1564,16 @@ public enum OrePrefixes { } if (enablePerItemSettings) { StringBuilder aConfigPathSB = new StringBuilder(); - aConfigPathSB.append("materialcomponents.").append(aMaterial.mConfigSection).append(".") - .append(aMaterial.mName); + aConfigPathSB.append("materialcomponents.") + .append(aMaterial.mConfigSection) + .append(".") + .append(aMaterial.mName); String aConfigPath = aConfigPathSB.toString(); for (OrePrefixes aPrefix : mPreventableComponents) { - boolean aEnableComponent = GregTech_API.sMaterialComponents - .get(aConfigPath, aPrefix.toString(), !aPrefix.mDisabledItems.contains(aMaterial)); + boolean aEnableComponent = GregTech_API.sMaterialComponents.get( + aConfigPath, + aPrefix.toString(), + !aPrefix.mDisabledItems.contains(aMaterial)); if (!aEnableComponent) { // Disable component if false and is not already in disabled list aPrefix.disableComponent(aMaterial); } else if (aEnableComponent) { // Enable component if true and is not already in enabled list diff --git a/src/main/java/gregtech/api/enums/SoundResource.java b/src/main/java/gregtech/api/enums/SoundResource.java index 63a8331496..a0c039e48e 100644 --- a/src/main/java/gregtech/api/enums/SoundResource.java +++ b/src/main/java/gregtech/api/enums/SoundResource.java @@ -304,9 +304,10 @@ public enum SoundResource { private static final Map<String, SoundResource> RESOURCE_STR_SOUND_MAP = new ConcurrentHashMap<>(); static { - EnumSet.allOf(SoundResource.class).forEach(sound -> { if (sound.id >= 0) ID_SOUND_MAP.put(sound.id, sound); }); EnumSet.allOf(SoundResource.class) - .forEach(sound -> RESOURCE_STR_SOUND_MAP.put(sound.resourceLocation.toString(), sound)); + .forEach(sound -> { if (sound.id >= 0) ID_SOUND_MAP.put(sound.id, sound); }); + EnumSet.allOf(SoundResource.class) + .forEach(sound -> RESOURCE_STR_SOUND_MAP.put(sound.resourceLocation.toString(), sound)); } /** diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index ba76816b7a..b2a3090a14 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -1499,8 +1499,10 @@ public class Textures { BLOCK_TRANSCENDENTMETAL, BLOCK_ORIHARUKON, BLOCK_WHITEDWARFMATTER, BLOCK_BLACKDWARFMATTER, BLOCK_UNIVERSIUM }; - public static final ITexture[] HIDDEN_TEXTURE = { - TextureFactory.builder().addIcon(HIDDEN_FACE).stdOrient().build() }; + public static final ITexture[] HIDDEN_TEXTURE = { TextureFactory.builder() + .addIcon(HIDDEN_FACE) + .stdOrient() + .build() }; public static final ITexture[] ERROR_RENDERING = { TextureFactory.of(RENDERING_ERROR) }; public static final ITexture[] OVERLAYS_ENERGY_IN = { TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 180, 180, 180, 0 }), diff --git a/src/main/java/gregtech/api/enums/ToolDictNames.java b/src/main/java/gregtech/api/enums/ToolDictNames.java index 9b1c3e594a..bc27fe6923 100644 --- a/src/main/java/gregtech/api/enums/ToolDictNames.java +++ b/src/main/java/gregtech/api/enums/ToolDictNames.java @@ -34,7 +34,8 @@ public enum ToolDictNames { public static boolean contains(String aName) { if (!aName.startsWith("craftingTool")) return false; for (ToolDictNames tool : ToolDictNames.values()) { - if (tool.toString().equals(aName)) { + if (tool.toString() + .equals(aName)) { return true; } } diff --git a/src/main/java/gregtech/api/fluid/FluidTankGT.java b/src/main/java/gregtech/api/fluid/FluidTankGT.java index f10e65d100..0d21d7dd49 100644 --- a/src/main/java/gregtech/api/fluid/FluidTankGT.java +++ b/src/main/java/gregtech/api/fluid/FluidTankGT.java @@ -418,7 +418,9 @@ public class FluidTankGT implements IFluidTank { } public String name() { - return mFluid == null ? null : mFluid.getFluid().getName(); + return mFluid == null ? null + : mFluid.getFluid() + .getName(); } public FluidStack get() { diff --git a/src/main/java/gregtech/api/fluid/GT_FluidFactory.java b/src/main/java/gregtech/api/fluid/GT_FluidFactory.java index b392167147..ae57f47430 100644 --- a/src/main/java/gregtech/api/fluid/GT_FluidFactory.java +++ b/src/main/java/gregtech/api/fluid/GT_FluidFactory.java @@ -54,8 +54,11 @@ public class GT_FluidFactory { */ public static Fluid of(final String fluidName, final String localizedName, final Materials material, final FluidState state, final int temperature) { - return builder(fluidName).withLocalizedName(localizedName).withStateAndTemperature(state, temperature) - .buildAndRegister().configureMaterials(material).asFluid(); + return builder(fluidName).withLocalizedName(localizedName) + .withStateAndTemperature(state, temperature) + .buildAndRegister() + .configureMaterials(material) + .asFluid(); } /** @@ -69,8 +72,10 @@ public class GT_FluidFactory { */ public static Fluid of(final String fluidName, final String localizedName, final FluidState state, final int temperature) { - return builder(fluidName).withLocalizedName(localizedName).withStateAndTemperature(state, temperature) - .buildAndRegister().asFluid(); + return builder(fluidName).withLocalizedName(localizedName) + .withStateAndTemperature(state, temperature) + .buildAndRegister() + .asFluid(); } /** diff --git a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java index 62dfa2d8ea..26c3c60ef1 100644 --- a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java +++ b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java @@ -62,8 +62,10 @@ public class GenerateNodeMapPower extends GenerateNodeMap { int dZ = aTileEntity.zCoord + ForgeDirection.getOrientation(aSide).offsetZ; boolean crossesChuncks = dX >> 4 != aTileEntity.xCoord >> 4 || dZ >> 4 != aTileEntity.zCoord >> 4; TileEntity tNextTo = null; - if (!crossesChuncks || !aTileEntity.getWorldObj().blockExists(dX, dY, dZ)) - tNextTo = aTileEntity.getWorldObj().getTileEntity(dX, dY, dZ); + if (!crossesChuncks || !aTileEntity.getWorldObj() + .blockExists(dX, dY, dZ)) + tNextTo = aTileEntity.getWorldObj() + .getTileEntity(dX, dY, dZ); if (((IEnergySink) aTileEntity).acceptsEnergyFrom(tNextTo, ForgeDirection.getOrientation(aSide))) { ConsumerNode tConsumerNode = new NodeEnergySink( diff --git a/src/main/java/gregtech/api/graphs/Node.java b/src/main/java/gregtech/api/graphs/Node.java index 21b9937191..38b3cd0e37 100644 --- a/src/main/java/gregtech/api/graphs/Node.java +++ b/src/main/java/gregtech/api/graphs/Node.java @@ -17,7 +17,8 @@ public class Node { this.mConsumers = aConsumers; mHighestNodeValue = aNodeValue; // you don't want to generate map multiple times in the same tick - mCreationTime = MinecraftServer.getServer().getTickCounter(); + mCreationTime = MinecraftServer.getServer() + .getTickCounter(); } public final TileEntity mTileEntity; diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java index eec63cf935..c7c4cbeba5 100644 --- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java +++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java @@ -86,11 +86,15 @@ public class NodeEnergyReceiver extends ConsumerNode { World tWorld = mTileEntity.getWorldObj(); GT_Utility.sendSoundToPlayers(tWorld, SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1, tX, tY, tZ); tWorld.setBlock(tX, tY, tZ, Blocks.air); - if (GregTech_API.sMachineExplosions) if (GT_Mod.gregtechproxy.mPollution) GT_Pollution - .addPollution(tWorld.getChunkFromBlockCoords(tX, tZ), GT_Mod.gregtechproxy.mPollutionOnExplosion); + if (GregTech_API.sMachineExplosions) if (GT_Mod.gregtechproxy.mPollution) GT_Pollution.addPollution( + tWorld.getChunkFromBlockCoords(tX, tZ), + GT_Mod.gregtechproxy.mPollutionOnExplosion); - new WorldSpawnedEventBuilder.ExplosionEffectEventBuilder().setStrength(tStrength).setSmoking(true) - .setPosition(tX + 0.5, tY + 0.5, tZ + 0.5).setWorld(tWorld).run(); + new WorldSpawnedEventBuilder.ExplosionEffectEventBuilder().setStrength(tStrength) + .setSmoking(true) + .setPosition(tX + 0.5, tY + 0.5, tZ + 0.5) + .setWorld(tWorld) + .run(); } } } diff --git a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java index 1601d3b28d..7d9a76524e 100644 --- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java +++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java @@ -27,7 +27,8 @@ public class PowerNodePath extends NodePath { } public void applyVoltage(long aVoltage, boolean aCountUp) { - int tNewTime = MinecraftServer.getServer().getTickCounter(); + int tNewTime = MinecraftServer.getServer() + .getTickCounter(); if (mTick != tNewTime) { reset(tNewTime - mTick); mTick = tNewTime; @@ -76,7 +77,9 @@ public class PowerNodePath extends NodePath { // if no amps pass through for more than 0.5 second reduce them to minimize wrong results // but still allow the player to see if activity is happening public long getAmps() { - int tTime = MinecraftServer.getServer().getTickCounter() - 10; + int tTime = MinecraftServer.getServer() + .getTickCounter() + - 10; if (mTick < tTime) { reset(tTime - mTick); mTick = tTime; diff --git a/src/main/java/gregtech/api/gui/GT_Container.java b/src/main/java/gregtech/api/gui/GT_Container.java index 2c4d7292d0..1c6b4ff60a 100644 --- a/src/main/java/gregtech/api/gui/GT_Container.java +++ b/src/main/java/gregtech/api/gui/GT_Container.java @@ -139,7 +139,10 @@ public class GT_Container extends Container { aPlayerInventory.setItemStack(null); } if (aMouseclick == 1) { - aPlayer.dropPlayerItemWithRandomChoice(aPlayerInventory.getItemStack().splitStack(1), true); + aPlayer.dropPlayerItemWithRandomChoice( + aPlayerInventory.getItemStack() + .splitStack(1), + true); if (aPlayerInventory.getItemStack().stackSize == 0) { aPlayerInventory.setItemStack(null); } @@ -151,7 +154,9 @@ public class GT_Container extends Container { tTempStack = this.transferStackInSlot(aPlayer, aSlotIndex); if (tTempStack != null) { rStack = GT_Utility.copyOrNull(tTempStack); - if (aSlot.getStack() != null && aSlot.getStack().getItem() == tTempStack.getItem()) { + if (aSlot.getStack() != null && aSlot.getStack() + .getItem() + == tTempStack.getItem()) { slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer); } } @@ -667,7 +672,9 @@ public class GT_Container extends Container { protected static ItemStack fillFluid(IFluidAccess aFluidAccess, EntityPlayer aPlayer, FluidStack aFluidHeld, boolean aProcessFullStack) { // we are not using aMachine.fill() here any more, so we need to check for fluid type here ourselves - if (aFluidAccess.get() != null && !aFluidAccess.get().isFluidEqual(aFluidHeld)) return null; + if (aFluidAccess.get() != null && !aFluidAccess.get() + .isFluidEqual(aFluidHeld)) + return null; ItemStack tStackHeld = aPlayer.inventory.getItemStack(); ItemStack tStackSizedOne = GT_Utility.copyAmount(1, tStackHeld); if (tStackSizedOne == null) return null; diff --git a/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java b/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java index 3ce2a53fce..4627362e66 100644 --- a/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java +++ b/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java @@ -265,8 +265,9 @@ public class GT_ContainerMetaTile_Machine extends GT_Container { List<ItemStack> tCircuits = ccs.getConfigurationCircuits(); int index = GT_Utility.findMatchingStackInList(tCircuits, cursorStack); if (index < 0) { - int curIndex = GT_Utility - .findMatchingStackInList(tCircuits, machine.getStackInSlot(ccs.getCircuitSlot())) + 1; + int curIndex = GT_Utility.findMatchingStackInList( + tCircuits, + machine.getStackInSlot(ccs.getCircuitSlot())) + 1; if (aMouseclick == 0) { curIndex += 1; } else { diff --git a/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java b/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java index 795148ee25..06ddf16d02 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java +++ b/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java @@ -21,17 +21,29 @@ import gregtech.api.util.ColorsMetadataSection; public class GT_GUIColorOverride { private static final Object NOT_FOUND = new Object(); - private static final LoadingCache<ResourceLocation, Object> cache = CacheBuilder.newBuilder().softValues() - .build(new CacheLoader<ResourceLocation, Object>() { - - @Override - public Object load(@Nonnull ResourceLocation key) throws Exception { - IResource ir = Minecraft.getMinecraft().getResourceManager().getResource(key); - if (ir.hasMetadata()) return ir.getMetadata("colors"); - // return a dummy object because LoadingCache doesn't like null - return NOT_FOUND; - } - }); + private static final LoadingCache<ResourceLocation, Object> cache = CacheBuilder.newBuilder() + .softValues() + .build( + new CacheLoader<ResourceLocation, Object>() { + + @Override + public Object load( + @Nonnull ResourceLocation key) + throws Exception { + IResource ir = Minecraft.getMinecraft() + .getResourceManager() + .getResource( + key); + if (ir.hasMetadata()) + return ir.getMetadata( + "colors"); + // return a dummy + // object because + // LoadingCache + // doesn't like null + return NOT_FOUND; + } + }); private static final GT_GUIColorOverride FALLBACK = new GT_GUIColorOverride(); private ColorsMetadataSection cmSection; diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java b/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java index 7e072f0fe6..e44b4f0cbc 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java @@ -181,8 +181,7 @@ public class GT_GUIContainerMetaTile_Machine extends GT_GUIContainer implements */ protected void setupTooltips() { if (mContainer.mTileEntity.getMetaTileEntity() instanceof IConfigurationCircuitSupport) { - IConfigurationCircuitSupport ccs = (IConfigurationCircuitSupport) mContainer.mTileEntity - .getMetaTileEntity(); + IConfigurationCircuitSupport ccs = (IConfigurationCircuitSupport) mContainer.mTileEntity.getMetaTileEntity(); if (ccs.allowSelectCircuit()) addToolTip( new GT_GuiSlotTooltip( mContainer.getSlot(ccs.getCircuitGUISlot()), @@ -234,8 +233,7 @@ public class GT_GUIContainerMetaTile_Machine extends GT_GUIContainer implements @Override protected void onMouseWheel(int mx, int my, int delta) { if (mContainer.mTileEntity.getMetaTileEntity() instanceof IConfigurationCircuitSupport) { - IConfigurationCircuitSupport ccs = (IConfigurationCircuitSupport) mContainer.mTileEntity - .getMetaTileEntity(); + IConfigurationCircuitSupport ccs = (IConfigurationCircuitSupport) mContainer.mTileEntity.getMetaTileEntity(); Slot slotCircuit = mContainer.getSlot(ccs.getCircuitGUISlot()); if (slotCircuit != null && func_146978_c(slotCircuit.xDisplayPosition, slotCircuit.yDisplayPosition, 16, 16, mx, my)) { diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java index 43943b49cb..899d8331bc 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java @@ -138,8 +138,8 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin }, mTooltipCache.getData( STALLED_STUTTERING_TOOLTIP, - StatCollector - .translateToLocal(POWER_SOURCE_KEY + (machine.isSteampowered() ? "steam" : "power"))))); + StatCollector.translateToLocal( + POWER_SOURCE_KEY + (machine.isSteampowered() ? "steam" : "power"))))); } /** diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java index 28075cabdb..99478667ec 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java @@ -22,8 +22,11 @@ public class GT_GUIContainer_BasicTank extends GT_GUIContainerMetaTile_Machine { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRendererObj - .drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, textColorTitle); + fontRendererObj.drawString( + StatCollector.translateToLocal("container.inventory"), + 8, + ySize - 96 + 2, + textColorTitle); fontRendererObj.drawString(mName, 8, 6, textColorTitle); if (mContainer != null) { fontRendererObj.drawString("Liquid Amount", 10, 20, textColor); diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java index f2ea91571a..d9c971482c 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java @@ -64,7 +64,8 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin if (index == 0) { current_line.append(str); } else { - current_line.append(" ").append(str); + current_line.append(" ") + .append(str); } index++; } @@ -93,33 +94,48 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin } if ((mContainer.mDisplayErrorCode & 8) != 0) { - fontRendererObj - .drawString(GT_Utility.trans("135", "Platings are dented."), 10, line_counter, textColor); + fontRendererObj.drawString( + GT_Utility.trans("135", "Platings are dented."), + 10, + line_counter, + textColor); line_counter += 8; } if ((mContainer.mDisplayErrorCode & 16) != 0) { - fontRendererObj - .drawString(GT_Utility.trans("136", "Circuitry burned out."), 10, line_counter, textColor); + fontRendererObj.drawString( + GT_Utility.trans("136", "Circuitry burned out."), + 10, + line_counter, + textColor); line_counter += 8; } if ((mContainer.mDisplayErrorCode & 32) != 0) { - fontRendererObj - .drawString(GT_Utility.trans("137", "That doesn't belong there."), 10, line_counter, textColor); + fontRendererObj.drawString( + GT_Utility.trans("137", "That doesn't belong there."), + 10, + line_counter, + textColor); line_counter += 8; } if ((mContainer.mDisplayErrorCode & 64) != 0) { - fontRendererObj - .drawString(GT_Utility.trans("138", "Incomplete Structure."), 10, line_counter, textColor); + fontRendererObj.drawString( + GT_Utility.trans("138", "Incomplete Structure."), + 10, + line_counter, + textColor); line_counter += 8; } if (mContainer.mDisplayErrorCode == 0) { if (mContainer.mActive == 0) { - fontRendererObj - .drawString(GT_Utility.trans("139", "Hit with Soft Mallet"), 10, line_counter, textColor); + fontRendererObj.drawString( + GT_Utility.trans("139", "Hit with Soft Mallet"), + 10, + line_counter, + textColor); line_counter += 8; fontRendererObj.drawString( GT_Utility.trans("140", "to (re-)start the Machine"), @@ -127,15 +143,22 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin line_counter, textColor); line_counter += 8; - fontRendererObj - .drawString(GT_Utility.trans("141", "if it doesn't start."), 10, line_counter, textColor); + fontRendererObj.drawString( + GT_Utility.trans("141", "if it doesn't start."), + 10, + line_counter, + textColor); } else { - fontRendererObj - .drawString(GT_Utility.trans("142", "Running perfectly."), 10, line_counter, textColor); + fontRendererObj.drawString( + GT_Utility.trans("142", "Running perfectly."), + 10, + line_counter, + textColor); } line_counter += 8; if (mContainer.mTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_DrillerBase) { - ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1); + ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity() + .getStackInSlot(1); if (tItem == null || !GT_Utility.areStacksEqual(tItem, GT_ModHandler.getIC2Item("miningPipe", 1L))) { fontRendererObj.drawString( @@ -145,7 +168,8 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin textColor); } } else if (mContainer.mTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine) { - ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1); + ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity() + .getStackInSlot(1); if (tItem == null || !(tItem.getItem() == GT_MetaGenerated_Tool_01.INSTANCE && tItem.getItemDamage() >= 170 && tItem.getItemDamage() <= 177)) { diff --git a/src/main/java/gregtech/api/gui/GT_GUIDialogSelectItem.java b/src/main/java/gregtech/api/gui/GT_GUIDialogSelectItem.java index f2352fb53d..fed1671484 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIDialogSelectItem.java +++ b/src/main/java/gregtech/api/gui/GT_GUIDialogSelectItem.java @@ -28,8 +28,11 @@ public class GT_GUIDialogSelectItem extends GT_GUIScreen { // all slots not including btnCurrent private final List<GT_GuiFakeItemButton> slots = new ArrayList<>(); // the currently selected slot content - private final GT_GuiFakeItemButton btnCurrent = new GT_GuiFakeItemButton(this, 8, 25, GT_GuiIcon.SLOT_DARKGRAY) - .setMimicSlot(true); + private final GT_GuiFakeItemButton btnCurrent = new GT_GuiFakeItemButton( + this, + 8, + 25, + GT_GuiIcon.SLOT_DARKGRAY).setMimicSlot(true); private final boolean noDeselect; private int selected; private int scroll = 0; @@ -77,8 +80,8 @@ public class GT_GUIDialogSelectItem extends GT_GUIScreen { for (int i = 0; i < rows; i++) { for (int j = 0; j < cols; j++) { slots.add( - new GT_GuiFakeItemButton(this, 8 + 18 * j, 44 + 18 * i, GT_GuiIcon.SLOT_GRAY) - .setMimicSlot(true)); + new GT_GuiFakeItemButton(this, 8 + 18 * j, 44 + 18 * i, GT_GuiIcon.SLOT_GRAY).setMimicSlot( + true)); } } @@ -123,25 +126,29 @@ public class GT_GUIDialogSelectItem extends GT_GUIScreen { public void mouseClicked(int x, int y, int button) { int mx = x - guiLeft, my = y - guiTop; if (button == 0) { - if (btnCurrent.getBounds().contains(mx, my)) { + if (btnCurrent.getBounds() + .contains(mx, my)) { ensureSelectedDisplayed(); return; } for (int i = 0, slotsSize = slots.size(); i < slotsSize; i++) { GT_GuiFakeItemButton slot = slots.get(i); - if (slot.getBounds().contains(mx, my)) { + if (slot.getBounds() + .contains(mx, my)) { setSelected(slotIndexToListIndex(i)); return; } } } else if (button == 1 && getSelected() >= 0) { - if (btnCurrent.getBounds().contains(mx, my)) { + if (btnCurrent.getBounds() + .contains(mx, my)) { setSelected(UNSELECTED); return; } GT_GuiFakeItemButton slot = getSlot(listIndexToSlotIndex(getSelected())); - if (slot != null && slot.getBounds().contains(mx, my)) { + if (slot != null && slot.getBounds() + .contains(mx, my)) { setSelected(UNSELECTED); } } @@ -156,8 +163,9 @@ public class GT_GUIDialogSelectItem extends GT_GUIScreen { private void fillSlots() { for (int i = 0, j = scroll * cols; i < slots.size(); i++, j++) { - slots.get(i).setItem(getCandidate(j)) - .setBgIcon(j == getSelected() ? GT_GuiIcon.SLOT_DARKGRAY : GT_GuiIcon.SLOT_GRAY); + slots.get(i) + .setItem(getCandidate(j)) + .setBgIcon(j == getSelected() ? GT_GuiIcon.SLOT_DARKGRAY : GT_GuiIcon.SLOT_GRAY); } } diff --git a/src/main/java/gregtech/api/gui/GT_Slot_Armor.java b/src/main/java/gregtech/api/gui/GT_Slot_Armor.java index be9b0e5e00..9b4b81a31d 100644 --- a/src/main/java/gregtech/api/gui/GT_Slot_Armor.java +++ b/src/main/java/gregtech/api/gui/GT_Slot_Armor.java @@ -23,6 +23,8 @@ public class GT_Slot_Armor extends Slot { @Override public boolean isItemValid(ItemStack aStack) { - return aStack != null && aStack.getItem() != null && aStack.getItem().isValidArmor(aStack, mArmorType, mPlayer); + return aStack != null && aStack.getItem() != null + && aStack.getItem() + .isValidArmor(aStack, mArmorType, mPlayer); } } diff --git a/src/main/java/gregtech/api/gui/modularui/FallbackableSteamTexture.java b/src/main/java/gregtech/api/gui/modularui/FallbackableSteamTexture.java index f242aff0ed..43b7210758 100644 --- a/src/main/java/gregtech/api/gui/modularui/FallbackableSteamTexture.java +++ b/src/main/java/gregtech/api/gui/modularui/FallbackableSteamTexture.java @@ -55,7 +55,9 @@ public class FallbackableSteamTexture { useFallback = true; } else { try { - Minecraft.getMinecraft().getResourceManager().getResource(candidate.get(steamVariant).location); + Minecraft.getMinecraft() + .getResourceManager() + .getResource(candidate.get(steamVariant).location); useFallback = false; } catch (IOException e) { useFallback = true; diff --git a/src/main/java/gregtech/api/gui/modularui/GT_UIInfos.java b/src/main/java/gregtech/api/gui/modularui/GT_UIInfos.java index 32ed6442c1..e068cd967e 100644 --- a/src/main/java/gregtech/api/gui/modularui/GT_UIInfos.java +++ b/src/main/java/gregtech/api/gui/modularui/GT_UIInfos.java @@ -36,28 +36,46 @@ public class GT_UIInfos { * Do NOT run {@link UIBuilder#build} on-the-fly, otherwise MP client won't register UIs. Instead, store to static * field, just like {@link #GTTileEntityDefaultUI}. Such mistake can be easily overlooked by testing only SP. */ - public static final Function<ContainerConstructor, UIInfo<?, ?>> GTTileEntityUIFactory = containerConstructor -> UIBuilder - .of().container((player, world, x, y, z) -> { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof ITileWithModularUI) { - return createTileEntityContainer( - player, - ((ITileWithModularUI) te)::createWindow, - te::markDirty, - containerConstructor); - } - return null; - }).gui(((player, world, x, y, z) -> { - if (!world.isRemote) return null; - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof ITileWithModularUI) { - return createTileEntityGuiContainer( - player, - ((ITileWithModularUI) te)::createWindow, - containerConstructor); - } - return null; - })).build(); + public static final Function<ContainerConstructor, UIInfo<?, ?>> GTTileEntityUIFactory = containerConstructor -> UIBuilder.of() + .container( + (player, world, + x, + y, + z) -> { + TileEntity te = world.getTileEntity( + x, + y, + z); + if (te instanceof ITileWithModularUI) { + return createTileEntityContainer( + player, + ((ITileWithModularUI) te)::createWindow, + te::markDirty, + containerConstructor); + } + return null; + }) + .gui( + ((player, + world, + x, + y, + z) -> { + if (!world.isRemote) + return null; + TileEntity te = world.getTileEntity( + x, + y, + z); + if (te instanceof ITileWithModularUI) { + return createTileEntityGuiContainer( + player, + ((ITileWithModularUI) te)::createWindow, + containerConstructor); + } + return null; + })) + .build(); private static final UIInfo<?, ?> GTTileEntityDefaultUI = GTTileEntityUIFactory.apply(ModularUIContainer::new); @@ -66,31 +84,36 @@ public class GT_UIInfos { static { for (byte i = 0; i < ForgeDirection.VALID_DIRECTIONS.length; i++) { final byte side = i; - coverUI.put(side, UIBuilder.of().container((player, world, x, y, z) -> { - final TileEntity te = world.getTileEntity(x, y, z); - if (!(te instanceof ICoverable)) return null; - final ICoverable gtTileEntity = (ICoverable) te; - GT_CoverBehaviorBase<?> cover = gtTileEntity.getCoverBehaviorAtSideNew(side); - return createCoverContainer( - player, - cover::createWindow, - te::markDirty, - gtTileEntity.getCoverIDAtSide(side), - side, - gtTileEntity); - }).gui((player, world, x, y, z) -> { - if (!world.isRemote) return null; - final TileEntity te = world.getTileEntity(x, y, z); - if (!(te instanceof ICoverable)) return null; - final ICoverable gtTileEntity = (ICoverable) te; - final GT_CoverBehaviorBase<?> cover = gtTileEntity.getCoverBehaviorAtSideNew(side); - return createCoverGuiContainer( - player, - cover::createWindow, - gtTileEntity.getCoverIDAtSide(side), - side, - gtTileEntity); - }).build()); + coverUI.put( + side, + UIBuilder.of() + .container((player, world, x, y, z) -> { + final TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof ICoverable)) return null; + final ICoverable gtTileEntity = (ICoverable) te; + GT_CoverBehaviorBase<?> cover = gtTileEntity.getCoverBehaviorAtSideNew(side); + return createCoverContainer( + player, + cover::createWindow, + te::markDirty, + gtTileEntity.getCoverIDAtSide(side), + side, + gtTileEntity); + }) + .gui((player, world, x, y, z) -> { + if (!world.isRemote) return null; + final TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof ICoverable)) return null; + final ICoverable gtTileEntity = (ICoverable) te; + final GT_CoverBehaviorBase<?> cover = gtTileEntity.getCoverBehaviorAtSideNew(side); + return createCoverGuiContainer( + player, + cover::createWindow, + gtTileEntity.getCoverIDAtSide(side), + side, + gtTileEntity); + }) + .build()); } } @@ -121,12 +144,13 @@ public class GT_UIInfos { tileEntity), (EntityPlayerMP) player); - coverUI.get(side).open( - player, - tileEntity.getWorld(), - tileEntity.getXCoord(), - tileEntity.getYCoord(), - tileEntity.getZCoord()); + coverUI.get(side) + .open( + player, + tileEntity.getWorld(), + tileEntity.getXCoord(), + tileEntity.getYCoord(), + tileEntity.getZCoord()); } /** diff --git a/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java b/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java index a1d1be02ac..590b14af29 100644 --- a/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java +++ b/src/main/java/gregtech/api/gui/modularui/GT_UITextures.java @@ -13,23 +13,48 @@ public class GT_UITextures { public static final UITexture TRANSPARENT = UITexture.fullImage(MODID, "gui/picture/transparent"); - public static final AdaptableUITexture BACKGROUND_SINGLEBLOCK_DEFAULT = AdaptableUITexture - .of(MODID, "gui/background/singleblock_default", 176, 166, 4); - public static final SteamTexture BACKGROUND_STEAM = SteamTexture - .adaptableTexture(MODID, "gui/background/%s", 176, 166, 4); - public static final UITexture BACKGROUND_FUSION_COMPUTER = UITexture - .fullImage(MODID, "gui/background/fusion_computer"); - public static final AdaptableUITexture BACKGROUND_TEXT_FIELD = AdaptableUITexture - .of(MODID, "gui/background/text_field", 142, 28, 1); - public static final AdaptableUITexture BACKGROUND_TEXT_FIELD_LIGHT_GRAY = AdaptableUITexture - .of(MODID, "gui/background/text_field_light_gray", 61, 12, 1); + public static final AdaptableUITexture BACKGROUND_SINGLEBLOCK_DEFAULT = AdaptableUITexture.of( + MODID, + "gui/background/singleblock_default", + 176, + 166, + 4); + public static final SteamTexture BACKGROUND_STEAM = SteamTexture.adaptableTexture( + MODID, + "gui/background/%s", + 176, + 166, + 4); + public static final UITexture BACKGROUND_FUSION_COMPUTER = UITexture.fullImage( + MODID, + "gui/background/fusion_computer"); + public static final AdaptableUITexture BACKGROUND_TEXT_FIELD = AdaptableUITexture.of( + MODID, + "gui/background/text_field", + 142, + 28, + 1); + public static final AdaptableUITexture BACKGROUND_TEXT_FIELD_LIGHT_GRAY = AdaptableUITexture.of( + MODID, + "gui/background/text_field_light_gray", + 61, + 12, + 1); public static final SteamTexture SLOT_ITEM_STEAM = SteamTexture.fullImage(MODID, "gui/slot/item_%s"); public static final SteamTexture SLOT_FLUID_STEAM = SteamTexture.fullImage(MODID, "gui/slot/fluid_%s"); - public static final AdaptableUITexture SLOT_DARK_GRAY = AdaptableUITexture - .of(MODID, "gui/slot/dark_gray", 18, 18, 1); - public static final AdaptableUITexture SLOT_MAINTENANCE = AdaptableUITexture - .of(MODID, "gui/slot/maintenance", 20, 20, 1); + public static final AdaptableUITexture SLOT_DARK_GRAY = AdaptableUITexture.of( + MODID, + "gui/slot/dark_gray", + 18, + 18, + 1); + public static final AdaptableUITexture SLOT_MAINTENANCE = AdaptableUITexture.of( + MODID, + "gui/slot/maintenance", + 20, + 20, + 1); public static final AdaptableUITexture SLOT_UPLIFTED = AdaptableUITexture.of(MODID, "gui/slot/uplifted", 18, 18, 1); public static final UITexture OVERLAY_SLOT_ARROW_ME = UITexture.fullImage(MODID, "gui/overlay_slot/arrow_me"); @@ -41,53 +66,67 @@ public class GT_UITextures { public static final UITexture OVERLAY_SLOT_BOX = UITexture.fullImage(MODID, "gui/overlay_slot/box"); public static final UITexture OVERLAY_SLOT_BOXED = UITexture.fullImage(MODID, "gui/overlay_slot/boxed"); public static final UITexture OVERLAY_SLOT_CANISTER = UITexture.fullImage(MODID, "gui/overlay_slot/canister"); - public static final SteamTexture OVERLAY_SLOT_CANISTER_STEAM = SteamTexture - .fullImage(MODID, "gui/overlay_slot/canister_%s"); + public static final SteamTexture OVERLAY_SLOT_CANISTER_STEAM = SteamTexture.fullImage( + MODID, + "gui/overlay_slot/canister_%s"); public static final UITexture OVERLAY_SLOT_CANNER = UITexture.fullImage(MODID, "gui/overlay_slot/canner"); public static final UITexture OVERLAY_SLOT_CAULDRON = UITexture.fullImage(MODID, "gui/overlay_slot/cauldron"); public static final UITexture OVERLAY_SLOT_CENTRIFUGE = UITexture.fullImage(MODID, "gui/overlay_slot/centrifuge"); - public static final UITexture OVERLAY_SLOT_CENTRIFUGE_FLUID = UITexture - .fullImage(MODID, "gui/overlay_slot/centrifuge_fluid"); - public static final SteamTexture OVERLAY_SLOT_CENTRIFUGE_STEAM = SteamTexture - .fullImage(MODID, "gui/overlay_slot/centrifuge_%s"); + public static final UITexture OVERLAY_SLOT_CENTRIFUGE_FLUID = UITexture.fullImage( + MODID, + "gui/overlay_slot/centrifuge_fluid"); + public static final SteamTexture OVERLAY_SLOT_CENTRIFUGE_STEAM = SteamTexture.fullImage( + MODID, + "gui/overlay_slot/centrifuge_%s"); public static final UITexture OVERLAY_SLOT_CHARGER = UITexture.fullImage(MODID, "gui/overlay_slot/charger"); - public static final UITexture OVERLAY_SLOT_CHARGER_FLUID = UITexture - .fullImage(MODID, "gui/overlay_slot/charger_fluid"); + public static final UITexture OVERLAY_SLOT_CHARGER_FLUID = UITexture.fullImage( + MODID, + "gui/overlay_slot/charger_fluid"); public static final UITexture OVERLAY_SLOT_CIRCUIT = UITexture.fullImage(MODID, "gui/overlay_slot/circuit"); - public static final SteamTexture OVERLAY_SLOT_COAL_STEAM = SteamTexture - .fullImage(MODID, "gui/overlay_slot/coal_%s"); + public static final SteamTexture OVERLAY_SLOT_COAL_STEAM = SteamTexture.fullImage( + MODID, + "gui/overlay_slot/coal_%s"); public static final UITexture OVERLAY_SLOT_COMPRESSOR = UITexture.fullImage(MODID, "gui/overlay_slot/compressor"); - public static final SteamTexture OVERLAY_SLOT_COMPRESSOR_STEAM = SteamTexture - .fullImage(MODID, "gui/overlay_slot/compressor_%s"); + public static final SteamTexture OVERLAY_SLOT_COMPRESSOR_STEAM = SteamTexture.fullImage( + MODID, + "gui/overlay_slot/compressor_%s"); public static final UITexture OVERLAY_SLOT_CRUSHED_ORE = UITexture.fullImage(MODID, "gui/overlay_slot/crushed_ore"); - public static final SteamTexture OVERLAY_SLOT_CRUSHED_ORE_STEAM = SteamTexture - .fullImage(MODID, "gui/overlay_slot/crushed_ore_%s"); - public static final UITexture OVERLAY_SLOT_CUTTER_SLICED = UITexture - .fullImage(MODID, "gui/overlay_slot/cutter_sliced"); + public static final SteamTexture OVERLAY_SLOT_CRUSHED_ORE_STEAM = SteamTexture.fullImage( + MODID, + "gui/overlay_slot/crushed_ore_%s"); + public static final UITexture OVERLAY_SLOT_CUTTER_SLICED = UITexture.fullImage( + MODID, + "gui/overlay_slot/cutter_sliced"); public static final UITexture OVERLAY_SLOT_DATA_ORB = UITexture.fullImage(MODID, "gui/overlay_slot/data_orb"); public static final UITexture OVERLAY_SLOT_DATA_STICK = UITexture.fullImage(MODID, "gui/overlay_slot/data_stick"); public static final UITexture OVERLAY_SLOT_DUST = UITexture.fullImage(MODID, "gui/overlay_slot/dust"); - public static final SteamTexture OVERLAY_SLOT_DUST_STEAM = SteamTexture - .fullImage(MODID, "gui/overlay_slot/dust_%s"); - public static final SteamTexture OVERLAY_SLOT_BLOCK_STEAM = SteamTexture - .fullImage(MODID, "gui/overlay_slot/block_%s"); + public static final SteamTexture OVERLAY_SLOT_DUST_STEAM = SteamTexture.fullImage( + MODID, + "gui/overlay_slot/dust_%s"); + public static final SteamTexture OVERLAY_SLOT_BLOCK_STEAM = SteamTexture.fullImage( + MODID, + "gui/overlay_slot/block_%s"); public static final UITexture OVERLAY_SLOT_EXPLOSIVE = UITexture.fullImage(MODID, "gui/overlay_slot/explosive"); - public static final UITexture OVERLAY_SLOT_EXTRUDER_SHAPE = UITexture - .fullImage(MODID, "gui/overlay_slot/extruder_shape"); + public static final UITexture OVERLAY_SLOT_EXTRUDER_SHAPE = UITexture.fullImage( + MODID, + "gui/overlay_slot/extruder_shape"); public static final UITexture OVERLAY_SLOT_FURNACE = UITexture.fullImage(MODID, "gui/overlay_slot/furnace"); - public static final SteamTexture OVERLAY_SLOT_FURNACE_STEAM = SteamTexture - .fullImage(MODID, "gui/overlay_slot/furnace_%s"); + public static final SteamTexture OVERLAY_SLOT_FURNACE_STEAM = SteamTexture.fullImage( + MODID, + "gui/overlay_slot/furnace_%s"); public static final UITexture OVERLAY_SLOT_GEM = UITexture.fullImage(MODID, "gui/overlay_slot/gem"); public static final UITexture OVERLAY_SLOT_HAMMER = UITexture.fullImage(MODID, "gui/overlay_slot/hammer"); - public static final SteamTexture OVERLAY_SLOT_HAMMER_STEAM = SteamTexture - .fullImage(MODID, "gui/overlay_slot/hammer_%s"); + public static final SteamTexture OVERLAY_SLOT_HAMMER_STEAM = SteamTexture.fullImage( + MODID, + "gui/overlay_slot/hammer_%s"); public static final UITexture OVERLAY_SLOT_HEATER_1 = UITexture.fullImage(MODID, "gui/overlay_slot/heater_1"); public static final UITexture OVERLAY_SLOT_HEATER_2 = UITexture.fullImage(MODID, "gui/overlay_slot/heater_2"); public static final UITexture OVERLAY_SLOT_IMPLOSION = UITexture.fullImage(MODID, "gui/overlay_slot/implosion"); public static final UITexture OVERLAY_SLOT_IN = UITexture.fullImage(MODID, "gui/overlay_slot/in"); public static final SteamTexture OVERLAY_SLOT_IN_STEAM = SteamTexture.fullImage(MODID, "gui/overlay_slot/in_%s"); - public static final SteamTexture OVERLAY_SLOT_INGOT_STEAM = SteamTexture - .fullImage(MODID, "gui/overlay_slot/ingot_%s"); + public static final SteamTexture OVERLAY_SLOT_INGOT_STEAM = SteamTexture.fullImage( + MODID, + "gui/overlay_slot/ingot_%s"); public static final UITexture OVERLAY_SLOT_INT_CIRCUIT = UITexture.fullImage(MODID, "gui/overlay_slot/int_circuit"); public static final UITexture OVERLAY_SLOT_LENS = UITexture.fullImage(MODID, "gui/overlay_slot/lens"); public static final UITexture OVERLAY_SLOT_MICROSCOPE = UITexture.fullImage(MODID, "gui/overlay_slot/microscope"); @@ -98,8 +137,9 @@ public class GT_UITextures { public static final UITexture OVERLAY_SLOT_OUT = UITexture.fullImage(MODID, "gui/overlay_slot/out"); public static final SteamTexture OVERLAY_SLOT_OUT_STEAM = SteamTexture.fullImage(MODID, "gui/overlay_slot/out_%s"); public static final UITexture OVERLAY_SLOT_PAGE_BLANK = UITexture.fullImage(MODID, "gui/overlay_slot/page_blank"); - public static final UITexture OVERLAY_SLOT_PAGE_PRINTED = UITexture - .fullImage(MODID, "gui/overlay_slot/page_printed"); + public static final UITexture OVERLAY_SLOT_PAGE_PRINTED = UITexture.fullImage( + MODID, + "gui/overlay_slot/page_printed"); public static final UITexture OVERLAY_SLOT_PRESS_1 = UITexture.fullImage(MODID, "gui/overlay_slot/press_1"); public static final UITexture OVERLAY_SLOT_PRESS_2 = UITexture.fullImage(MODID, "gui/overlay_slot/press_2"); public static final UITexture OVERLAY_SLOT_PRESS_3 = UITexture.fullImage(MODID, "gui/overlay_slot/press_3"); @@ -107,8 +147,9 @@ public class GT_UITextures { public static final UITexture OVERLAY_SLOT_ROD_1 = UITexture.fullImage(MODID, "gui/overlay_slot/rod_1"); public static final UITexture OVERLAY_SLOT_ROD_2 = UITexture.fullImage(MODID, "gui/overlay_slot/rod_2"); public static final UITexture OVERLAY_SLOT_SLICE_SHAPE = UITexture.fullImage(MODID, "gui/overlay_slot/slice_shape"); - public static final UITexture OVERLAY_SLOT_SLICER_SLICED = UITexture - .fullImage(MODID, "gui/overlay_slot/slicer_sliced"); + public static final UITexture OVERLAY_SLOT_SLICER_SLICED = UITexture.fullImage( + MODID, + "gui/overlay_slot/slicer_sliced"); public static final UITexture OVERLAY_SLOT_SQUARE = UITexture.fullImage(MODID, "gui/overlay_slot/square"); public static final UITexture OVERLAY_SLOT_UUA = UITexture.fullImage(MODID, "gui/overlay_slot/uua"); public static final UITexture OVERLAY_SLOT_UUM = UITexture.fullImage(MODID, "gui/overlay_slot/uum"); @@ -117,53 +158,70 @@ public class GT_UITextures { public static final UITexture OVERLAY_SLOT_WIREMILL = UITexture.fullImage(MODID, "gui/overlay_slot/wiremill"); public static final UITexture OVERLAY_SLOT_WRENCH = UITexture.fullImage(MODID, "gui/overlay_slot/wrench"); public static final UITexture[] OVERLAY_SLOTS_NUMBER = IntStream.range(0, 12) - .mapToObj(i -> UITexture.fullImage(MODID, "gui/overlay_slot/number_" + i)).collect(Collectors.toList()) - .toArray(new UITexture[0]); + .mapToObj( + i -> UITexture.fullImage( + MODID, + "gui/overlay_slot/number_" + i)) + .collect(Collectors.toList()) + .toArray(new UITexture[0]); public static final UITexture PROGRESSBAR_ARROW = UITexture.fullImage(MODID, "gui/progressbar/arrow"); - public static final SteamTexture PROGRESSBAR_ARROW_STEAM = SteamTexture - .fullImage(MODID, "gui/progressbar/arrow_%s"); - public static final SteamTexture PROGRESSBAR_ARROW_2_STEAM = SteamTexture - .fullImage(MODID, "gui/progressbar/arrow_2_%s"); - public static final UITexture PROGRESSBAR_ARROW_MULTIPLE = UITexture - .fullImage(MODID, "gui/progressbar/arrow_multiple"); + public static final SteamTexture PROGRESSBAR_ARROW_STEAM = SteamTexture.fullImage( + MODID, + "gui/progressbar/arrow_%s"); + public static final SteamTexture PROGRESSBAR_ARROW_2_STEAM = SteamTexture.fullImage( + MODID, + "gui/progressbar/arrow_2_%s"); + public static final UITexture PROGRESSBAR_ARROW_MULTIPLE = UITexture.fullImage( + MODID, + "gui/progressbar/arrow_multiple"); public static final UITexture PROGRESSBAR_ASSEMBLE = UITexture.fullImage(MODID, "gui/progressbar/assemble"); - public static final UITexture PROGRESSBAR_ASSEMBLY_LINE_1 = UITexture - .fullImage(MODID, "gui/progressbar/assemblyline_1"); - public static final UITexture PROGRESSBAR_ASSEMBLY_LINE_2 = UITexture - .fullImage(MODID, "gui/progressbar/assemblyline_2"); - public static final UITexture PROGRESSBAR_ASSEMBLY_LINE_3 = UITexture - .fullImage(MODID, "gui/progressbar/assemblyline_3"); + public static final UITexture PROGRESSBAR_ASSEMBLY_LINE_1 = UITexture.fullImage( + MODID, + "gui/progressbar/assemblyline_1"); + public static final UITexture PROGRESSBAR_ASSEMBLY_LINE_2 = UITexture.fullImage( + MODID, + "gui/progressbar/assemblyline_2"); + public static final UITexture PROGRESSBAR_ASSEMBLY_LINE_3 = UITexture.fullImage( + MODID, + "gui/progressbar/assemblyline_3"); public static final UITexture PROGRESSBAR_BATH = UITexture.fullImage(MODID, "gui/progressbar/bath"); public static final UITexture PROGRESSBAR_BENDING = UITexture.fullImage(MODID, "gui/progressbar/bending"); - public static final SteamTexture PROGRESSBAR_BOILER_EMPTY_STEAM = SteamTexture - .fullImage(MODID, "gui/progressbar/boiler_empty_%s"); + public static final SteamTexture PROGRESSBAR_BOILER_EMPTY_STEAM = SteamTexture.fullImage( + MODID, + "gui/progressbar/boiler_empty_%s"); public static final UITexture PROGRESSBAR_BOILER_HEAT = UITexture.fullImage(MODID, "gui/progressbar/boiler_heat"); public static final UITexture PROGRESSBAR_BOILER_STEAM = UITexture.fullImage(MODID, "gui/progressbar/boiler_steam"); public static final UITexture PROGRESSBAR_BOILER_WATER = UITexture.fullImage(MODID, "gui/progressbar/boiler_water"); public static final UITexture PROGRESSBAR_CANNER = UITexture.fullImage(MODID, "gui/progressbar/canner"); - public static final UITexture PROGRESSBAR_CIRCUIT_ASSEMBLER = UITexture - .fullImage(MODID, "gui/progressbar/circuit_assembler"); + public static final UITexture PROGRESSBAR_CIRCUIT_ASSEMBLER = UITexture.fullImage( + MODID, + "gui/progressbar/circuit_assembler"); public static final UITexture PROGRESSBAR_COMPRESS = UITexture.fullImage(MODID, "gui/progressbar/compress"); - public static final SteamTexture PROGRESSBAR_COMPRESS_STEAM = SteamTexture - .fullImage(MODID, "gui/progressbar/compress_%s"); + public static final SteamTexture PROGRESSBAR_COMPRESS_STEAM = SteamTexture.fullImage( + MODID, + "gui/progressbar/compress_%s"); public static final UITexture PROGRESSBAR_CUT = UITexture.fullImage(MODID, "gui/progressbar/cut"); public static final UITexture PROGRESSBAR_EXTRACT = UITexture.fullImage(MODID, "gui/progressbar/extract"); - public static final SteamTexture PROGRESSBAR_EXTRACT_STEAM = SteamTexture - .fullImage(MODID, "gui/progressbar/extract_%s"); + public static final SteamTexture PROGRESSBAR_EXTRACT_STEAM = SteamTexture.fullImage( + MODID, + "gui/progressbar/extract_%s"); public static final UITexture PROGRESSBAR_EXTRUDE = UITexture.fullImage(MODID, "gui/progressbar/extrude"); public static final SteamTexture PROGRESSBAR_FUEL_STEAM = SteamTexture.fullImage(MODID, "gui/progressbar/fuel_%s"); public static final UITexture PROGRESSBAR_HAMMER = UITexture.fullImage(MODID, "gui/progressbar/hammer"); public static final UITexture PROGRESSBAR_HAMMER_BASE = UITexture.fullImage(MODID, "gui/progressbar/hammer_base"); - public static final SteamTexture PROGRESSBAR_HAMMER_STEAM = SteamTexture - .fullImage(MODID, "gui/progressbar/hammer_%s"); - public static final SteamTexture PROGRESSBAR_HAMMER_BASE_STEAM = SteamTexture - .fullImage(MODID, "gui/progressbar/hammer_base_%s"); + public static final SteamTexture PROGRESSBAR_HAMMER_STEAM = SteamTexture.fullImage( + MODID, + "gui/progressbar/hammer_%s"); + public static final SteamTexture PROGRESSBAR_HAMMER_BASE_STEAM = SteamTexture.fullImage( + MODID, + "gui/progressbar/hammer_base_%s"); public static final UITexture PROGRESSBAR_LATHE = UITexture.fullImage(MODID, "gui/progressbar/lathe"); public static final UITexture PROGRESSBAR_LATHE_BASE = UITexture.fullImage(MODID, "gui/progressbar/lathe_base"); public static final UITexture PROGRESSBAR_MACERATE = UITexture.fullImage(MODID, "gui/progressbar/macerate"); - public static final SteamTexture PROGRESSBAR_MACERATE_STEAM = SteamTexture - .fullImage(MODID, "gui/progressbar/macerate_%s"); + public static final SteamTexture PROGRESSBAR_MACERATE_STEAM = SteamTexture.fullImage( + MODID, + "gui/progressbar/macerate_%s"); public static final UITexture PROGRESSBAR_MAGNET = UITexture.fullImage(MODID, "gui/progressbar/magnet"); public static final UITexture PROGRESSBAR_MIXER = UITexture.fullImage(MODID, "gui/progressbar/mixer"); public static final UITexture PROGRESSBAR_RECYCLE = UITexture.fullImage(MODID, "gui/progressbar/recycle"); @@ -176,80 +234,138 @@ public class GT_UITextures { public static final UITexture TAB_COVER_HIGHLIGHT = UITexture.fullImage(MODID, "gui/tab/cover_highlight"); public static final UITexture TAB_COVER_DISABLED = UITexture.fullImage(MODID, "gui/tab/cover_disabled"); public static final SteamTexture TAB_COVER_STEAM_NORMAL = SteamTexture.fullImage(MODID, "gui/tab/cover_%s_normal"); - public static final SteamTexture TAB_COVER_STEAM_HIGHLIGHT = SteamTexture - .fullImage(MODID, "gui/tab/cover_%s_highlight"); - public static final SteamTexture TAB_COVER_STEAM_DISABLED = SteamTexture - .fullImage(MODID, "gui/tab/cover_%s_disabled"); + public static final SteamTexture TAB_COVER_STEAM_HIGHLIGHT = SteamTexture.fullImage( + MODID, + "gui/tab/cover_%s_highlight"); + public static final SteamTexture TAB_COVER_STEAM_DISABLED = SteamTexture.fullImage( + MODID, + "gui/tab/cover_%s_disabled"); public static final AdaptableUITexture TAB_TITLE = AdaptableUITexture.of(MODID, "gui/tab/title", 28, 28, 4); - public static final AdaptableUITexture TAB_TITLE_DARK = AdaptableUITexture - .of(MODID, "gui/tab/title_dark", 28, 28, 4); - public static final SteamTexture TAB_TITLE_STEAM = SteamTexture - .adaptableTexture(MODID, "gui/tab/title_%s", 28, 28, 4); - public static final SteamTexture TAB_TITLE_DARK_STEAM = SteamTexture - .adaptableTexture(MODID, "gui/tab/title_dark_%s", 28, 28, 4); - public static final AdaptableUITexture TAB_TITLE_ANGULAR = AdaptableUITexture - .of(MODID, "gui/tab/title_angular", 28, 28, 4); - public static final SteamTexture TAB_TITLE_ANGULAR_STEAM = SteamTexture - .adaptableTexture(MODID, "gui/tab/title_angular_%s", 28, 28, 4); + public static final AdaptableUITexture TAB_TITLE_DARK = AdaptableUITexture.of( + MODID, + "gui/tab/title_dark", + 28, + 28, + 4); + public static final SteamTexture TAB_TITLE_STEAM = SteamTexture.adaptableTexture( + MODID, + "gui/tab/title_%s", + 28, + 28, + 4); + public static final SteamTexture TAB_TITLE_DARK_STEAM = SteamTexture.adaptableTexture( + MODID, + "gui/tab/title_dark_%s", + 28, + 28, + 4); + public static final AdaptableUITexture TAB_TITLE_ANGULAR = AdaptableUITexture.of( + MODID, + "gui/tab/title_angular", + 28, + 28, + 4); + public static final SteamTexture TAB_TITLE_ANGULAR_STEAM = SteamTexture.adaptableTexture( + MODID, + "gui/tab/title_angular_%s", + 28, + 28, + 4); public static final UITexture BUTTON_STANDARD = AdaptableUITexture.of(MODID, "gui/button/standard", 18, 18, 1); - public static final UITexture BUTTON_STANDARD_DISABLED = AdaptableUITexture - .of(MODID, "gui/button/standard_disabled", 18, 18, 1); - public static final UITexture BUTTON_STANDARD_TOGGLE = AdaptableUITexture - .of(MODID, "gui/button/standard_toggle", 18, 18, 1); - public static final UITexture BUTTON_STANDARD_TOGGLE_DISABLED = AdaptableUITexture - .of(MODID, "gui/button/standard_toggle_disabled", 18, 18, 1); + public static final UITexture BUTTON_STANDARD_DISABLED = AdaptableUITexture.of( + MODID, + "gui/button/standard_disabled", + 18, + 18, + 1); + public static final UITexture BUTTON_STANDARD_TOGGLE = AdaptableUITexture.of( + MODID, + "gui/button/standard_toggle", + 18, + 18, + 1); + public static final UITexture BUTTON_STANDARD_TOGGLE_DISABLED = AdaptableUITexture.of( + MODID, + "gui/button/standard_toggle_disabled", + 18, + 18, + 1); public static final UITexture BUTTON_COVER_NORMAL = UITexture.fullImage(MODID, "gui/button/cover_normal"); - public static final UITexture BUTTON_COVER_NORMAL_HOVERED = UITexture - .fullImage(MODID, "gui/button/cover_normal_hovered"); - public static final UITexture BUTTON_COVER_NORMAL_DISABLED = UITexture - .fullImage(MODID, "gui/button/cover_normal_disabled"); + public static final UITexture BUTTON_COVER_NORMAL_HOVERED = UITexture.fullImage( + MODID, + "gui/button/cover_normal_hovered"); + public static final UITexture BUTTON_COVER_NORMAL_DISABLED = UITexture.fullImage( + MODID, + "gui/button/cover_normal_disabled"); public static final UITexture OVERLAY_BUTTON_DISABLE = UITexture.fullImage(MODID, "gui/overlay_button/disable"); - public static final UITexture OVERLAY_BUTTON_REDSTONE_OFF = UITexture - .fullImage(MODID, "gui/overlay_button/redstone_off"); - public static final UITexture OVERLAY_BUTTON_REDSTONE_ON = UITexture - .fullImage(MODID, "gui/overlay_button/redstone_on"); - public static final UITexture OVERLAY_BUTTON_POWER_SWITCH_ON = UITexture - .fullImage(MODID, "gui/overlay_button/power_switch_on"); - public static final UITexture OVERLAY_BUTTON_POWER_SWITCH_OFF = UITexture - .fullImage(MODID, "gui/overlay_button/power_switch_off"); - public static final UITexture OVERLAY_BUTTON_VOID_EXCESS_ON = UITexture - .fullImage(MODID, "gui/overlay_button/void_excess_on"); - public static final UITexture OVERLAY_BUTTON_VOID_EXCESS_ON_DISABLED = UITexture - .fullImage(MODID, "gui/overlay_button/void_excess_on_disabled"); - public static final UITexture OVERLAY_BUTTON_VOID_EXCESS_OFF = UITexture - .fullImage(MODID, "gui/overlay_button/void_excess_off"); - public static final UITexture OVERLAY_BUTTON_VOID_EXCESS_OFF_DISABLED = UITexture - .fullImage(MODID, "gui/overlay_button/void_excess_off_disabled"); - public static final UITexture OVERLAY_BUTTON_INPUT_SEPARATION_ON = UITexture - .fullImage(MODID, "gui/overlay_button/input_separation_on"); - public static final UITexture OVERLAY_BUTTON_INPUT_SEPARATION_ON_DISABLED = UITexture - .fullImage(MODID, "gui/overlay_button/input_separation_on_disabled"); - public static final UITexture OVERLAY_BUTTON_INPUT_SEPARATION_OFF = UITexture - .fullImage(MODID, "gui/overlay_button/input_separation_off"); - public static final UITexture OVERLAY_BUTTON_INPUT_SEPARATION_OFF_DISABLED = UITexture - .fullImage(MODID, "gui/overlay_button/input_separation_off_disabled"); - public static final UITexture OVERLAY_BUTTON_RECIPE_LOCKED = UITexture - .fullImage(MODID, "gui/overlay_button/recipe_locked"); - public static final UITexture OVERLAY_BUTTON_RECIPE_LOCKED_DISABLED = UITexture - .fullImage(MODID, "gui/overlay_button/recipe_locked_disabled"); - public static final UITexture OVERLAY_BUTTON_RECIPE_UNLOCKED = UITexture - .fullImage(MODID, "gui/overlay_button/recipe_unlocked"); - public static final UITexture OVERLAY_BUTTON_RECIPE_UNLOCKED_DISABLED = UITexture - .fullImage(MODID, "gui/overlay_button/recipe_unlocked_disabled"); - public static final UITexture OVERLAY_BUTTON_BATCH_MODE_ON = UITexture - .fullImage(MODID, "gui/overlay_button/batch_mode_on"); - public static final UITexture OVERLAY_BUTTON_BATCH_MODE_ON_DISABLED = UITexture - .fullImage(MODID, "gui/overlay_button/batch_mode_on_disabled"); - public static final UITexture OVERLAY_BUTTON_BATCH_MODE_OFF = UITexture - .fullImage(MODID, "gui/overlay_button/batch_mode_off"); - public static final UITexture OVERLAY_BUTTON_BATCH_MODE_OFF_DISABLED = UITexture - .fullImage(MODID, "gui/overlay_button/batch_mode_off_disabled"); - public static final UITexture OVERLAY_BUTTON_DOWN_TIERING_ON = UITexture - .fullImage(MODID, "gui/overlay_button/down_tiering_on"); - public static final UITexture OVERLAY_BUTTON_DOWN_TIERING_OFF = UITexture - .fullImage(MODID, "gui/overlay_button/down_tiering_off"); + public static final UITexture OVERLAY_BUTTON_REDSTONE_OFF = UITexture.fullImage( + MODID, + "gui/overlay_button/redstone_off"); + public static final UITexture OVERLAY_BUTTON_REDSTONE_ON = UITexture.fullImage( + MODID, + "gui/overlay_button/redstone_on"); + public static final UITexture OVERLAY_BUTTON_POWER_SWITCH_ON = UITexture.fullImage( + MODID, + "gui/overlay_button/power_switch_on"); + public static final UITexture OVERLAY_BUTTON_POWER_SWITCH_OFF = UITexture.fullImage( + MODID, + "gui/overlay_button/power_switch_off"); + public static final UITexture OVERLAY_BUTTON_VOID_EXCESS_ON = UITexture.fullImage( + MODID, + "gui/overlay_button/void_excess_on"); + public static final UITexture OVERLAY_BUTTON_VOID_EXCESS_ON_DISABLED = UITexture.fullImage( + MODID, + "gui/overlay_button/void_excess_on_disabled"); + public static final UITexture OVERLAY_BUTTON_VOID_EXCESS_OFF = UITexture.fullImage( + MODID, + "gui/overlay_button/void_excess_off"); + public static final UITexture OVERLAY_BUTTON_VOID_EXCESS_OFF_DISABLED = UITexture.fullImage( + MODID, + "gui/overlay_button/void_excess_off_disabled"); + public static final UITexture OVERLAY_BUTTON_INPUT_SEPARATION_ON = UITexture.fullImage( + MODID, + "gui/overlay_button/input_separation_on"); + public static final UITexture OVERLAY_BUTTON_INPUT_SEPARATION_ON_DISABLED = UITexture.fullImage( + MODID, + "gui/overlay_button/input_separation_on_disabled"); + public static final UITexture OVERLAY_BUTTON_INPUT_SEPARATION_OFF = UITexture.fullImage( + MODID, + "gui/overlay_button/input_separation_off"); + public static final UITexture OVERLAY_BUTTON_INPUT_SEPARATION_OFF_DISABLED = UITexture.fullImage( + MODID, + "gui/overlay_button/input_separation_off_disabled"); + public static final UITexture OVERLAY_BUTTON_RECIPE_LOCKED = UITexture.fullImage( + MODID, + "gui/overlay_button/recipe_locked"); + public static final UITexture OVERLAY_BUTTON_RECIPE_LOCKED_DISABLED = UITexture.fullImage( + MODID, + "gui/overlay_button/recipe_locked_disabled"); + public static final UITexture OVERLAY_BUTTON_RECIPE_UNLOCKED = UITexture.fullImage( + MODID, + "gui/overlay_button/recipe_unlocked"); + public static final UITexture OVERLAY_BUTTON_RECIPE_UNLOCKED_DISABLED = UITexture.fullImage( + MODID, + "gui/overlay_button/recipe_unlocked_disabled"); + public static final UITexture OVERLAY_BUTTON_BATCH_MODE_ON = UITexture.fullImage( + MODID, + "gui/overlay_button/batch_mode_on"); + public static final UITexture OVERLAY_BUTTON_BATCH_MODE_ON_DISABLED = UITexture.fullImage( + MODID, + "gui/overlay_button/batch_mode_on_disabled"); + public static final UITexture OVERLAY_BUTTON_BATCH_MODE_OFF = UITexture.fullImage( + MODID, + "gui/overlay_button/batch_mode_off"); + public static final UITexture OVERLAY_BUTTON_BATCH_MODE_OFF_DISABLED = UITexture.fullImage( + MODID, + "gui/overlay_button/batch_mode_off_disabled"); + public static final UITexture OVERLAY_BUTTON_DOWN_TIERING_ON = UITexture.fullImage( + MODID, + "gui/overlay_button/down_tiering_on"); + public static final UITexture OVERLAY_BUTTON_DOWN_TIERING_OFF = UITexture.fullImage( + MODID, + "gui/overlay_button/down_tiering_off"); public static final UITexture OVERLAY_BUTTON_CHECKMARK = UITexture.fullImage(MODID, "gui/overlay_button/checkmark"); public static final UITexture OVERLAY_BUTTON_CROSS = UITexture.fullImage(MODID, "gui/overlay_button/cross"); public static final UITexture OVERLAY_BUTTON_WHITELIST = UITexture.fullImage(MODID, "gui/overlay_button/whitelist"); @@ -257,81 +373,110 @@ public class GT_UITextures { public static final UITexture OVERLAY_BUTTON_PROGRESS = UITexture.fullImage(MODID, "gui/overlay_button/progress"); public static final UITexture OVERLAY_BUTTON_EXPORT = UITexture.fullImage(MODID, "gui/overlay_button/export"); public static final UITexture OVERLAY_BUTTON_IMPORT = UITexture.fullImage(MODID, "gui/overlay_button/import"); - public static final UITexture OVERLAY_BUTTON_AUTOOUTPUT_ITEM = UITexture - .fullImage(MODID, "gui/overlay_button/autooutput_item"); - public static final UITexture OVERLAY_BUTTON_AUTOOUTPUT_FLUID = UITexture - .fullImage(MODID, "gui/overlay_button/autooutput_fluid"); - public static final UITexture OVERLAY_BUTTON_ALLOW_INPUT = UITexture - .fullImage(MODID, "gui/overlay_button/allow_input"); - public static final UITexture OVERLAY_BUTTON_AUTOPULL_ME = UITexture - .fullImage(MODID, "gui/overlay_button/auto_pull_me"); - public static final UITexture OVERLAY_BUTTON_AUTOPULL_ME_DISABLED = UITexture - .fullImage(MODID, "gui/overlay_button/auto_pull_me_disabled"); - public static final UITexture OVERLAY_BUTTON_BLOCK_INPUT = UITexture - .fullImage(MODID, "gui/overlay_button/block_input"); - public static final UITexture OVERLAY_BUTTON_ARROW_GREEN_UP = UITexture - .fullImage(MODID, "gui/overlay_button/arrow_green_up"); - public static final UITexture OVERLAY_BUTTON_ARROW_GREEN_DOWN = UITexture - .fullImage(MODID, "gui/overlay_button/arrow_green_down"); + public static final UITexture OVERLAY_BUTTON_AUTOOUTPUT_ITEM = UITexture.fullImage( + MODID, + "gui/overlay_button/autooutput_item"); + public static final UITexture OVERLAY_BUTTON_AUTOOUTPUT_FLUID = UITexture.fullImage( + MODID, + "gui/overlay_button/autooutput_fluid"); + public static final UITexture OVERLAY_BUTTON_ALLOW_INPUT = UITexture.fullImage( + MODID, + "gui/overlay_button/allow_input"); + public static final UITexture OVERLAY_BUTTON_AUTOPULL_ME = UITexture.fullImage( + MODID, + "gui/overlay_button/auto_pull_me"); + public static final UITexture OVERLAY_BUTTON_AUTOPULL_ME_DISABLED = UITexture.fullImage( + MODID, + "gui/overlay_button/auto_pull_me_disabled"); + public static final UITexture OVERLAY_BUTTON_BLOCK_INPUT = UITexture.fullImage( + MODID, + "gui/overlay_button/block_input"); + public static final UITexture OVERLAY_BUTTON_ARROW_GREEN_UP = UITexture.fullImage( + MODID, + "gui/overlay_button/arrow_green_up"); + public static final UITexture OVERLAY_BUTTON_ARROW_GREEN_DOWN = UITexture.fullImage( + MODID, + "gui/overlay_button/arrow_green_down"); public static final UITexture OVERLAY_BUTTON_CYCLIC = UITexture.fullImage(MODID, "gui/overlay_button/cyclic"); - public static final UITexture OVERLAY_BUTTON_EMIT_ENERGY = UITexture - .fullImage(MODID, "gui/overlay_button/emit_energy"); - public static final UITexture OVERLAY_BUTTON_EMIT_REDSTONE = UITexture - .fullImage(MODID, "gui/overlay_button/emit_redstone"); - public static final UITexture OVERLAY_BUTTON_INVERT_REDSTONE = UITexture - .fullImage(MODID, "gui/overlay_button/invert_redstone"); - public static final UITexture OVERLAY_BUTTON_STOCKING_MODE = UITexture - .fullImage(MODID, "gui/overlay_button/stocking_mode"); - public static final UITexture OVERLAY_BUTTON_INVERT_FILTER = UITexture - .fullImage(MODID, "gui/overlay_button/invert_filter"); + public static final UITexture OVERLAY_BUTTON_EMIT_ENERGY = UITexture.fullImage( + MODID, + "gui/overlay_button/emit_energy"); + public static final UITexture OVERLAY_BUTTON_EMIT_REDSTONE = UITexture.fullImage( + MODID, + "gui/overlay_button/emit_redstone"); + public static final UITexture OVERLAY_BUTTON_INVERT_REDSTONE = UITexture.fullImage( + MODID, + "gui/overlay_button/invert_redstone"); + public static final UITexture OVERLAY_BUTTON_STOCKING_MODE = UITexture.fullImage( + MODID, + "gui/overlay_button/stocking_mode"); + public static final UITexture OVERLAY_BUTTON_INVERT_FILTER = UITexture.fullImage( + MODID, + "gui/overlay_button/invert_filter"); public static final UITexture OVERLAY_BUTTON_NBT = UITexture.fullImage(MODID, "gui/overlay_button/nbt"); public static final UITexture OVERLAY_BUTTON_PRINT = UITexture.fullImage(MODID, "gui/overlay_button/print"); public static final UITexture OVERLAY_BUTTON_TRANSPOSE = UITexture.fullImage(MODID, "gui/overlay_button/transpose"); - public static final UITexture OVERLAY_BUTTON_BOUNDING_BOX = UITexture - .fullImage(MODID, "gui/overlay_button/bounding_box"); - public static final UITexture OVERLAY_BUTTON_MINUS_SMALL = UITexture - .fullImage(MODID, "gui/overlay_button/minus_small"); - public static final UITexture OVERLAY_BUTTON_MINUS_LARGE = UITexture - .fullImage(MODID, "gui/overlay_button/minus_large"); - public static final UITexture OVERLAY_BUTTON_PLUS_SMALL = UITexture - .fullImage(MODID, "gui/overlay_button/plus_small"); - public static final UITexture OVERLAY_BUTTON_PLUS_LARGE = UITexture - .fullImage(MODID, "gui/overlay_button/plus_large"); + public static final UITexture OVERLAY_BUTTON_BOUNDING_BOX = UITexture.fullImage( + MODID, + "gui/overlay_button/bounding_box"); + public static final UITexture OVERLAY_BUTTON_MINUS_SMALL = UITexture.fullImage( + MODID, + "gui/overlay_button/minus_small"); + public static final UITexture OVERLAY_BUTTON_MINUS_LARGE = UITexture.fullImage( + MODID, + "gui/overlay_button/minus_large"); + public static final UITexture OVERLAY_BUTTON_PLUS_SMALL = UITexture.fullImage( + MODID, + "gui/overlay_button/plus_small"); + public static final UITexture OVERLAY_BUTTON_PLUS_LARGE = UITexture.fullImage( + MODID, + "gui/overlay_button/plus_large"); public static final UITexture OVERLAY_BUTTON_GATE_AND = UITexture.fullImage(MODID, "gui/overlay_button/gate_and"); public static final UITexture OVERLAY_BUTTON_GATE_NAND = UITexture.fullImage(MODID, "gui/overlay_button/gate_nand"); public static final UITexture OVERLAY_BUTTON_GATE_OR = UITexture.fullImage(MODID, "gui/overlay_button/gate_or"); public static final UITexture OVERLAY_BUTTON_GATE_NOR = UITexture.fullImage(MODID, "gui/overlay_button/gate_nor"); public static final UITexture OVERLAY_BUTTON_ANALOG = UITexture.fullImage(MODID, "gui/overlay_button/analog"); public static final UITexture OVERLAY_BUTTON_LOCK = UITexture.fullImage(MODID, "gui/overlay_button/lock"); - public static final UITexture OVERLAY_BUTTON_INPUT_FROM_OUTPUT_SIDE = UITexture - .fullImage(MODID, "gui/overlay_button/input_from_output_side"); - public static final UITexture OVERLAY_BUTTON_VOID_EXCESS = UITexture - .fullImage(MODID, "gui/overlay_button/void_excess"); + public static final UITexture OVERLAY_BUTTON_INPUT_FROM_OUTPUT_SIDE = UITexture.fullImage( + MODID, + "gui/overlay_button/input_from_output_side"); + public static final UITexture OVERLAY_BUTTON_VOID_EXCESS = UITexture.fullImage( + MODID, + "gui/overlay_button/void_excess"); public static final UITexture OVERLAY_BUTTON_VOID_ALL = UITexture.fullImage(MODID, "gui/overlay_button/void_all"); public static final UITexture OVERLAY_BUTTON_NEI = UITexture.fullImage(MODID, "gui/overlay_button/nei"); /** * Can adjust size as needed. */ - public static final AdaptableUITexture PICTURE_SCREEN_BLACK = AdaptableUITexture - .of(MODID, "gui/picture/screen_black", 16, 16, 2); + public static final AdaptableUITexture PICTURE_SCREEN_BLACK = AdaptableUITexture.of( + MODID, + "gui/picture/screen_black", + 16, + 16, + 2); - public static final UITexture PICTURE_RADIATION_WARNING = UITexture - .fullImage(MODID, "gui/picture/radiation_warning"); - public static final UITexture PICTURE_GT_LOGO_17x17_TRANSPARENT = UITexture - .fullImage(MODID, "gui/picture/gt_logo_17x17_transparent"); - public static final UITexture PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY = UITexture - .fullImage(MODID, "gui/picture/gt_logo_17x17_transparent_gray"); - public static final SteamTexture PICTURE_GT_LOGO_17x17_TRANSPARENT_STEAM = SteamTexture - .fullImage(MODID, "gui/picture/gt_logo_17x17_transparent_%s"); + public static final UITexture PICTURE_RADIATION_WARNING = UITexture.fullImage( + MODID, + "gui/picture/radiation_warning"); + public static final UITexture PICTURE_GT_LOGO_17x17_TRANSPARENT = UITexture.fullImage( + MODID, + "gui/picture/gt_logo_17x17_transparent"); + public static final UITexture PICTURE_GT_LOGO_17x17_TRANSPARENT_GRAY = UITexture.fullImage( + MODID, + "gui/picture/gt_logo_17x17_transparent_gray"); + public static final SteamTexture PICTURE_GT_LOGO_17x17_TRANSPARENT_STEAM = SteamTexture.fullImage( + MODID, + "gui/picture/gt_logo_17x17_transparent_%s"); public static final UITexture PICTURE_GT_LOGO_18x18 = UITexture.fullImage(MODID, "gui/picture/gt_logo_18x18"); public static final UITexture PICTURE_GT_LOGO_19x19 = UITexture.fullImage(MODID, "gui/picture/gt_logo_19x19"); public static final UITexture PICTURE_INFORMATION = UITexture.fullImage(MODID, "gui/picture/information"); - public static final UITexture PICTURE_STALLED_ELECTRICITY = UITexture - .fullImage(MODID, "gui/picture/stalled_electricity"); + public static final UITexture PICTURE_STALLED_ELECTRICITY = UITexture.fullImage( + MODID, + "gui/picture/stalled_electricity"); public static final UITexture PICTURE_STALLED_STEAM = UITexture.fullImage(MODID, "gui/picture/stalled_steam"); - public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_22_RED = (width, fromRight) -> UITexture - .partly( + public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_22_RED = (width, + fromRight) -> UITexture.partly( MODID, "gui/picture/arrow_22_red", 87, @@ -340,8 +485,8 @@ public class GT_UITextures { 0, fromRight ? 87 : width, 22); - public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_22_BLUE = (width, fromRight) -> UITexture - .partly( + public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_22_BLUE = (width, + fromRight) -> UITexture.partly( MODID, "gui/picture/arrow_22_blue", 87, @@ -350,8 +495,8 @@ public class GT_UITextures { 0, fromRight ? 87 : width, 22); - public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_22_WHITE = (width, fromRight) -> UITexture - .partly( + public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_22_WHITE = (width, + fromRight) -> UITexture.partly( MODID, "gui/picture/arrow_22_white", 87, @@ -360,8 +505,8 @@ public class GT_UITextures { 0, fromRight ? 87 : width, 22); - public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_24_RED = (width, fromRight) -> UITexture - .partly( + public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_24_RED = (width, + fromRight) -> UITexture.partly( MODID, "gui/picture/arrow_24_red", 69, @@ -370,8 +515,8 @@ public class GT_UITextures { 0, fromRight ? 69 : width, 24); - public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_24_BLUE = (width, fromRight) -> UITexture - .partly( + public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_24_BLUE = (width, + fromRight) -> UITexture.partly( MODID, "gui/picture/arrow_24_blue", 69, @@ -380,8 +525,8 @@ public class GT_UITextures { 0, fromRight ? 69 : width, 24); - public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_24_WHITE = (width, fromRight) -> UITexture - .partly( + public static final BiFunction<Integer, Boolean, UITexture> PICTURE_ARROW_24_WHITE = (width, + fromRight) -> UITexture.partly( MODID, "gui/picture/arrow_24_white", 69, @@ -395,8 +540,9 @@ public class GT_UITextures { public static final UITexture PICTURE_SLOTS_HOLO_3BY3 = UITexture.fullImage(MODID, "gui/picture/slots_holo_3by3"); public static final UITexture PICTURE_ARROW_DOUBLE = UITexture.fullImage(MODID, "gui/picture/arrow_double"); public static final UITexture PICTURE_SUPER_BUFFER = UITexture.fullImage(MODID, "gui/picture/super_buffer"); - public static final UITexture PICTURE_SQUARE_LIGHT_GRAY = UITexture - .fullImage(MODID, "gui/picture/square_light_gray"); + public static final UITexture PICTURE_SQUARE_LIGHT_GRAY = UITexture.fullImage( + MODID, + "gui/picture/square_light_gray"); public static final UITexture PICTURE_GAUGE = UITexture.fullImage(MODID, "gui/picture/gauge"); public static final UITexture PICTURE_ITEM_IN = UITexture.fullImage(MODID, "gui/picture/item_in"); public static final UITexture PICTURE_ITEM_OUT = UITexture.fullImage(MODID, "gui/picture/item_out"); diff --git a/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java b/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java index 8b6e9f85ec..2799738344 100644 --- a/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java +++ b/src/main/java/gregtech/api/gui/modularui/GUITextureSet.java @@ -28,29 +28,46 @@ public class GUITextureSet { private AdaptableUITexture titleTabAngular; private UITexture gregtechLogo; - public static final GUITextureSet DEFAULT = new GUITextureSet() - .setMainBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT).setItemSlot(ModularUITextures.ITEM_SLOT) - .setFluidSlot(ModularUITextures.FLUID_SLOT) - .setCoverTab( - GT_UITextures.TAB_COVER_NORMAL, - GT_UITextures.TAB_COVER_HIGHLIGHT, - GT_UITextures.TAB_COVER_DISABLED) - .setTitleTab(GT_UITextures.TAB_TITLE, GT_UITextures.TAB_TITLE_DARK, GT_UITextures.TAB_TITLE_ANGULAR) - .setGregTechLogo(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT); - - public static final Function<SteamVariant, GUITextureSet> STEAM = steamVariant -> new GUITextureSet() - .setMainBackground(GT_UITextures.BACKGROUND_STEAM.get(steamVariant)) - .setItemSlot(GT_UITextures.SLOT_ITEM_STEAM.get(steamVariant)) - .setFluidSlot(GT_UITextures.SLOT_FLUID_STEAM.get(steamVariant)) - .setCoverTab( - GT_UITextures.TAB_COVER_STEAM_NORMAL.get(steamVariant), - GT_UITextures.TAB_COVER_STEAM_HIGHLIGHT.get(steamVariant), - GT_UITextures.TAB_COVER_STEAM_DISABLED.get(steamVariant)) - .setTitleTab( - GT_UITextures.TAB_TITLE_STEAM.getAdaptable(steamVariant), - GT_UITextures.TAB_TITLE_DARK_STEAM.getAdaptable(steamVariant), - GT_UITextures.TAB_TITLE_ANGULAR_STEAM.getAdaptable(steamVariant)) - .setGregTechLogo(GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_STEAM.get(steamVariant)); + public static final GUITextureSet DEFAULT = new GUITextureSet().setMainBackground( + GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT) + .setItemSlot(ModularUITextures.ITEM_SLOT) + .setFluidSlot(ModularUITextures.FLUID_SLOT) + .setCoverTab( + GT_UITextures.TAB_COVER_NORMAL, + GT_UITextures.TAB_COVER_HIGHLIGHT, + GT_UITextures.TAB_COVER_DISABLED) + .setTitleTab( + GT_UITextures.TAB_TITLE, + GT_UITextures.TAB_TITLE_DARK, + GT_UITextures.TAB_TITLE_ANGULAR) + .setGregTechLogo( + GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT); + + public static final Function<SteamVariant, GUITextureSet> STEAM = steamVariant -> new GUITextureSet().setMainBackground( + GT_UITextures.BACKGROUND_STEAM.get(steamVariant)) + .setItemSlot( + GT_UITextures.SLOT_ITEM_STEAM.get( + steamVariant)) + .setFluidSlot( + GT_UITextures.SLOT_FLUID_STEAM.get( + steamVariant)) + .setCoverTab( + GT_UITextures.TAB_COVER_STEAM_NORMAL.get( + steamVariant), + GT_UITextures.TAB_COVER_STEAM_HIGHLIGHT.get( + steamVariant), + GT_UITextures.TAB_COVER_STEAM_DISABLED.get( + steamVariant)) + .setTitleTab( + GT_UITextures.TAB_TITLE_STEAM.getAdaptable( + steamVariant), + GT_UITextures.TAB_TITLE_DARK_STEAM.getAdaptable( + steamVariant), + GT_UITextures.TAB_TITLE_ANGULAR_STEAM.getAdaptable( + steamVariant)) + .setGregTechLogo( + GT_UITextures.PICTURE_GT_LOGO_17x17_TRANSPARENT_STEAM.get( + steamVariant)); public GUITextureSet() {} diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiCoverTabLine.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiCoverTabLine.java index 639b402856..5cbee74335 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiCoverTabLine.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiCoverTabLine.java @@ -106,7 +106,8 @@ public class GT_GuiCoverTabLine extends GT_GuiTabLine { * @param cover */ private void addCoverToTabs(byte side, ItemStack cover) { - final boolean enabled = this.tile.getCoverBehaviorAtSideNew(side).hasCoverGUI(); + final boolean enabled = this.tile.getCoverBehaviorAtSideNew(side) + .hasCoverGUI(); this.setTab(side, cover, null, getTooltipForCoverTab(side, cover, enabled)); this.setTabEnabled(side, enabled); } @@ -159,7 +160,8 @@ public class GT_GuiCoverTabLine extends GT_GuiTabLine { return false; } for (int i = 0; i < tabLine.mTabs.length; i++) { - if (tabLine.mTabs[i] != null && tabLine.mTabs[i].getBounds().intersects(neiSlotArea)) { + if (tabLine.mTabs[i] != null && tabLine.mTabs[i].getBounds() + .intersects(neiSlotArea)) { return true; } } diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java index bfeb84d762..6d9b1c5db3 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java @@ -116,12 +116,14 @@ public class GT_GuiFakeItemButton implements IGuiScreen.IGuiElement { GL11.glPushAttrib(GL11.GL_ENABLE_BIT); GL11.glEnable(GL12.GL_RESCALE_NORMAL); } - gui.getItemRenderer().renderItemAndEffectIntoGUI( - gui.getFontRenderer(), - Minecraft.getMinecraft().getTextureManager(), - item, - xPosition, - yPosition); + gui.getItemRenderer() + .renderItemAndEffectIntoGUI( + gui.getFontRenderer(), + Minecraft.getMinecraft() + .getTextureManager(), + item, + xPosition, + yPosition); if (item.getItem() instanceof ItemBlock) GL11.glPopAttrib(); } diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiTab.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiTab.java index 661ed81fce..a434be47d3 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiTab.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiTab.java @@ -130,12 +130,14 @@ public class GT_GuiTab { GL11.glEnable(GL12.GL_RESCALE_NORMAL); } int margin = (bounds.height - SLOT_SIZE); - gui.getItemRenderer().renderItemAndEffectIntoGUI( - gui.getFontRenderer(), - Minecraft.getMinecraft().getTextureManager(), - item, - bounds.x + (this.flipHorizontally ? 0 : margin), - bounds.y + margin); + gui.getItemRenderer() + .renderItemAndEffectIntoGUI( + gui.getFontRenderer(), + Minecraft.getMinecraft() + .getTextureManager(), + item, + bounds.x + (this.flipHorizontally ? 0 : margin), + bounds.y + margin); if (item.getItem() instanceof ItemBlock) GL11.glPopAttrib(); diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java index cb94a81dfa..9caf51cd4b 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java @@ -220,7 +220,8 @@ public class GT_GuiTabLine { */ public void onMouseClicked(int mouseX, int mouseY, int mouseButton) { for (int tabId = 0; tabId < mTabs.length; tabId++) { - if (mTabs[tabId] != null && mTabs[tabId].getBounds().contains(mouseX, mouseY)) { + if (mTabs[tabId] != null && mTabs[tabId].getBounds() + .contains(mouseX, mouseY)) { tabClicked(tabId, mouseButton); return; } diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltipManager.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltipManager.java index a74f5adda5..81566de014 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltipManager.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltipManager.java @@ -49,7 +49,9 @@ public class GT_GuiTooltipManager { for (GT_GuiTooltip tip : tips) { // Give the tooltip the opportunity to decide whether they should be enabled tip.onTick(); - if (tip.enabled && (!tip.isDelayed() || mouseStopped > DELAY) && tip.getBounds().contains(mouseX, mouseY)) { + if (tip.enabled && (!tip.isDelayed() || mouseStopped > DELAY) + && tip.getBounds() + .contains(mouseX, mouseY)) { tip.updateText(); drawTooltip(tip, mouseX, mouseY, render); break; @@ -64,7 +66,8 @@ public class GT_GuiTooltipManager { if (mouseX > render.getGuiLeft() + render.getXSize() / 2) { int maxWidth = 0; for (String s : text) { - int w = render.getFontRenderer().getStringWidth(s); + int w = render.getFontRenderer() + .getStringWidth(s); if (w > maxWidth) { maxWidth = w; } diff --git a/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java b/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java index 8bb0ed87aa..970b536a2c 100644 --- a/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java +++ b/src/main/java/gregtech/api/interfaces/IGlobalWirelessEnergy.java @@ -25,7 +25,10 @@ public interface IGlobalWirelessEnergy { // tick of a machine being placed only. default void strongCheckOrAddUser(EntityPlayer user) { - strongCheckOrAddUser(user.getUniqueID().toString(), user.getDisplayName()); + strongCheckOrAddUser( + user.getUniqueID() + .toString(), + user.getDisplayName()); } default void strongCheckOrAddUser(UUID user_uuid, String user_name) { @@ -42,7 +45,8 @@ public interface IGlobalWirelessEnergy { // If the username linked to the users fixed uuid is not equal to their current name then remove it. // This indicates that their username has changed. - if (!(GlobalEnergyName.getOrDefault(user_uuid, "").equals(user_name))) { + if (!(GlobalEnergyName.getOrDefault(user_uuid, "") + .equals(user_name))) { String old_name = GlobalEnergyName.get(user_uuid); GlobalEnergyName.remove(old_name); } @@ -141,7 +145,8 @@ public interface IGlobalWirelessEnergy { default String processInitialSettings(final IGregTechTileEntity machine) { // UUID and username of the owner. - final String UUID = machine.getOwnerUuid().toString(); + final String UUID = machine.getOwnerUuid() + .toString(); final String name = machine.getOwnerName(); strongCheckOrAddUser(UUID, name); diff --git a/src/main/java/gregtech/api/interfaces/IHatchElement.java b/src/main/java/gregtech/api/interfaces/IHatchElement.java index 254d9562c2..5b825880ae 100644 --- a/src/main/java/gregtech/api/interfaces/IHatchElement.java +++ b/src/main/java/gregtech/api/interfaces/IHatchElement.java @@ -59,21 +59,35 @@ public interface IHatchElement<T> { default <T2 extends T> IStructureElement<T2> newAny(int aCasingIndex, int aDot) { if (aCasingIndex < 0 || aDot < 0) throw new IllegalArgumentException(); - return GT_StructureUtility.<T2>buildHatchAdder().anyOf(this).casingIndex(aCasingIndex).dot(aDot) - .continueIfSuccess().build(); + return GT_StructureUtility.<T2>buildHatchAdder() + .anyOf(this) + .casingIndex(aCasingIndex) + .dot(aDot) + .continueIfSuccess() + .build(); } default <T2 extends T> IStructureElement<T2> newAny(int aCasingIndex, int aDot, ForgeDirection... allowedFacings) { if (aCasingIndex < 0 || aDot < 0) throw new IllegalArgumentException(); - return GT_StructureUtility.<T2>buildHatchAdder().anyOf(this).casingIndex(aCasingIndex).dot(aDot) - .continueIfSuccess().allowOnly(allowedFacings).build(); + return GT_StructureUtility.<T2>buildHatchAdder() + .anyOf(this) + .casingIndex(aCasingIndex) + .dot(aDot) + .continueIfSuccess() + .allowOnly(allowedFacings) + .build(); } default <T2 extends T> IStructureElement<T2> newAny(int aCasingIndex, int aDot, BiPredicate<? super T2, ? super IGregTechTileEntity> aShouldSkip) { if (aCasingIndex < 0 || aDot < 0 || aShouldSkip == null) throw new IllegalArgumentException(); - return GT_StructureUtility.<T2>buildHatchAdder().anyOf(this).casingIndex(aCasingIndex).dot(aDot) - .shouldSkip(aShouldSkip).continueIfSuccess().build(); + return GT_StructureUtility.<T2>buildHatchAdder() + .anyOf(this) + .casingIndex(aCasingIndex) + .dot(aDot) + .shouldSkip(aShouldSkip) + .continueIfSuccess() + .build(); } default <T2 extends T> IHatchElement<T2> or(IHatchElement<? super T2> fallback) { @@ -95,13 +109,18 @@ class HatchElementEither<T> implements IHatchElement<T> { @Override public List<? extends Class<? extends IMetaTileEntity>> mteClasses() { if (mMteClasses == null) mMteClasses = ImmutableList.<Class<? extends IMetaTileEntity>>builder() - .addAll(first.mteClasses()).addAll(second.mteClasses()).build(); + .addAll(first.mteClasses()) + .addAll(second.mteClasses()) + .build(); return mMteClasses; } @Override public IGT_HatchAdder<? super T> adder() { - return ((t, te, i) -> first.adder().apply(t, te, i) || second.adder().apply(t, te, i)); + return ((t, te, i) -> first.adder() + .apply(t, te, i) + || second.adder() + .apply(t, te, i)); } @Override diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java index b60088a41b..bc80eea1ad 100644 --- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java +++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java @@ -66,9 +66,10 @@ public interface IMetaTileEntityItemPipe extends IMetaTileEntity { continue; oppositeSide = GT_Utility.getOppositeSide(side); if (aSuckItems) { - if (aBaseMetaTileEntity.getCoverInfoAtSide(side).letsItemsIn(-2)) { - final IGregTechTileEntity tItemPipe = aBaseMetaTileEntity - .getIGregTechTileEntityAtSide(side); + if (aBaseMetaTileEntity.getCoverInfoAtSide(side) + .letsItemsIn(-2)) { + final IGregTechTileEntity tItemPipe = aBaseMetaTileEntity.getIGregTechTileEntityAtSide( + side); if (aBaseMetaTileEntity.getColorization() >= 0) { final byte tColor = tItemPipe.getColorization(); if (tColor >= 0 && tColor != aBaseMetaTileEntity.getColorization()) { @@ -78,7 +79,8 @@ public interface IMetaTileEntityItemPipe extends IMetaTileEntity { if (tItemPipe instanceof BaseMetaPipeEntity) { final IMetaTileEntity tMetaTileEntity = tItemPipe.getMetaTileEntity(); if (tMetaTileEntity instanceof IMetaTileEntityItemPipe - && tItemPipe.getCoverInfoAtSide(oppositeSide).letsItemsOut(-2)) { + && tItemPipe.getCoverInfoAtSide(oppositeSide) + .letsItemsOut(-2)) { scanPipes( (IMetaTileEntityItemPipe) tMetaTileEntity, aMap, @@ -89,9 +91,10 @@ public interface IMetaTileEntityItemPipe extends IMetaTileEntity { } } } else { - if (aBaseMetaTileEntity.getCoverInfoAtSide(side).letsItemsOut(-2)) { - final IGregTechTileEntity tItemPipe = aBaseMetaTileEntity - .getIGregTechTileEntityAtSide(side); + if (aBaseMetaTileEntity.getCoverInfoAtSide(side) + .letsItemsOut(-2)) { + final IGregTechTileEntity tItemPipe = aBaseMetaTileEntity.getIGregTechTileEntityAtSide( + side); if (tItemPipe != null) { if (aBaseMetaTileEntity.getColorization() >= 0) { final byte tColor = tItemPipe.getColorization(); @@ -102,7 +105,8 @@ public interface IMetaTileEntityItemPipe extends IMetaTileEntity { if (tItemPipe instanceof BaseMetaPipeEntity) { final IMetaTileEntity tMetaTileEntity = tItemPipe.getMetaTileEntity(); if (tMetaTileEntity instanceof IMetaTileEntityItemPipe - && tItemPipe.getCoverInfoAtSide(oppositeSide).letsItemsIn(-2)) { + && tItemPipe.getCoverInfoAtSide(oppositeSide) + .letsItemsIn(-2)) { scanPipes( (IMetaTileEntityItemPipe) tMetaTileEntity, aMap, diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java index 3a17df4717..d79367d252 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java @@ -21,7 +21,7 @@ public interface IColoredTileEntity { * @return Actual color shown on GUI */ default int getGUIColorization() { - return GT_Util - .getRGBInt((getColorization() != -1 ? Dyes.get(getColorization()) : Dyes.MACHINE_METAL).getRGBA()); + return GT_Util.getRGBInt( + (getColorization() != -1 ? Dyes.get(getColorization()) : Dyes.MACHINE_METAL).getRGBA()); } } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java index 92d2482014..37a7d2fc5c 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java @@ -86,19 +86,25 @@ public interface IEnergyConnected extends IColoredTileEntity { final byte tColor = ((IEnergyConnected) tTileEntity).getColorization(); if (tColor >= 0 && tColor != aEmitter.getColorization()) continue; } - rUsedAmperes += ((IEnergyConnected) tTileEntity) - .injectEnergyUnits(j, aVoltage, aAmperage - rUsedAmperes); + rUsedAmperes += ((IEnergyConnected) tTileEntity).injectEnergyUnits( + j, + aVoltage, + aAmperage - rUsedAmperes); } else if (tTileEntity instanceof IEnergySink) { - if (((IEnergySink) tTileEntity) - .acceptsEnergyFrom((TileEntity) aEmitter, ForgeDirection.getOrientation(j))) { + if (((IEnergySink) tTileEntity).acceptsEnergyFrom( + (TileEntity) aEmitter, + ForgeDirection.getOrientation(j))) { while (aAmperage > rUsedAmperes && ((IEnergySink) tTileEntity).getDemandedEnergy() > 0 - && ((IEnergySink) tTileEntity) - .injectEnergy(ForgeDirection.getOrientation(j), aVoltage, aVoltage) < aVoltage) + && ((IEnergySink) tTileEntity).injectEnergy( + ForgeDirection.getOrientation(j), + aVoltage, + aVoltage) < aVoltage) rUsedAmperes++; } } else if (GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver) { - final ForgeDirection tDirection = ForgeDirection.getOrientation(i).getOpposite(); + final ForgeDirection tDirection = ForgeDirection.getOrientation(i) + .getOpposite(); final int rfOut = GT_Utility.safeInt(aVoltage * GregTech_API.mEUtoRF / 100); if (((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, true) == rfOut) { ((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, false); diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java index 8eb481f150..119a1af207 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java @@ -87,25 +87,32 @@ public interface IExperimentalEnergyTileEntity extends IColoredTileEntity, IHasW byte tColor = ((IExperimentalEnergyTileEntity) tTileEntity).getColorization(); if (tColor >= 0 && tColor != aEmitter.getColorization()) continue; } - rUsedSecondary += ((IExperimentalEnergyTileEntity) tTileEntity) - .injectEnergy(aEnergyType, j, aPrimary, aSecondary - rUsedSecondary); + rUsedSecondary += ((IExperimentalEnergyTileEntity) tTileEntity).injectEnergy( + aEnergyType, + j, + aPrimary, + aSecondary - rUsedSecondary); } else if (IC_ENERGY && aEnergyType == SubTag.ENERGY_ELECTRICITY && tTileEntity instanceof IEnergySink) { - if (((IEnergySink) tTileEntity) - .acceptsEnergyFrom((TileEntity) aEmitter, ForgeDirection.getOrientation(j))) { + if (((IEnergySink) tTileEntity).acceptsEnergyFrom( + (TileEntity) aEmitter, + ForgeDirection.getOrientation(j))) { while (aSecondary > rUsedSecondary && ((IEnergySink) tTileEntity).getDemandedEnergy() > 0 - && ((IEnergySink) tTileEntity) - .injectEnergy(ForgeDirection.getOrientation(j), aPrimary, aPrimary) - < aPrimary) + && ((IEnergySink) tTileEntity).injectEnergy( + ForgeDirection.getOrientation(j), + aPrimary, + aPrimary) < aPrimary) rUsedSecondary++; } } else if (RF_ENERGY && aEnergyType == SubTag.ENERGY_REDSTONE_FLUX && tTileEntity instanceof IEnergyReceiver && ((IEnergyReceiver) tTileEntity).canConnectEnergy(ForgeDirection.getOrientation(j))) { - rUsedSecondary += ((IEnergyReceiver) tTileEntity) - .receiveEnergy(ForgeDirection.getOrientation(j), (int) aSecondary, false); + rUsedSecondary += ((IEnergyReceiver) tTileEntity).receiveEnergy( + ForgeDirection.getOrientation(j), + (int) aSecondary, + false); } } return rUsedSecondary; diff --git a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java b/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java index 1226520eff..3830ec6e52 100644 --- a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java +++ b/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java @@ -118,7 +118,9 @@ public class GT_Block_LongDistancePipe extends GT_Generic_Block { public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 3; i++) { ItemStack aStack = new ItemStack(aItem, 1, i); - if (!aStack.getDisplayName().contains(".name")) aList.add(aStack); + if (!aStack.getDisplayName() + .contains(".name")) + aList.add(aStack); } } } diff --git a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java b/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java index c31ba0cc82..d9c164f3ab 100644 --- a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java +++ b/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java @@ -116,8 +116,10 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { } if (!aPlayer.worldObj.isRemote && (mSpecials & 4) != 0) { - if (GT_ModHandler.canUseElectricItem(aStack, 50000) && aPlayer.getFoodStats().needFood()) { - aPlayer.getFoodStats().addStats(1, 0.0F); + if (GT_ModHandler.canUseElectricItem(aStack, 50000) && aPlayer.getFoodStats() + .needFood()) { + aPlayer.getFoodStats() + .addStats(1, 0.0F); GT_ModHandler.useElectricItem(aStack, 50000, aPlayer); } } @@ -296,8 +298,13 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { if (armor != null && armor.getItem() == this && (mSpecials & 2) != 0) { int distanceFactor = (int) event.distance - 3; int energyCost = (this.mDamageEnergyCost * distanceFactor) / 4; - if (energyCost <= GT_ModHandler - .dischargeElectricItem(armor, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true)) { + if (energyCost <= GT_ModHandler.dischargeElectricItem( + armor, + Integer.MAX_VALUE, + Integer.MAX_VALUE, + true, + true, + true)) { GT_ModHandler.dischargeElectricItem(armor, energyCost, Integer.MAX_VALUE, true, false, true); event.setCanceled(true); break; @@ -313,10 +320,15 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { return new ISpecialArmor.ArmorProperties( (source == DamageSource.fall && (mSpecials & 2) != 0) ? 10 : 0, getBaseAbsorptionRatio() * mArmorAbsorbtionPercentage, - mDamageEnergyCost > 0 ? 25 - * GT_ModHandler - .dischargeElectricItem(armor, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true) - / mDamageEnergyCost : 0); + mDamageEnergyCost > 0 + ? 25 * GT_ModHandler.dischargeElectricItem( + armor, + Integer.MAX_VALUE, + Integer.MAX_VALUE, + true, + true, + true) / mDamageEnergyCost + : 0); } @Override @@ -327,8 +339,13 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { @Override public void damageArmor(EntityLivingBase entity, ItemStack itemStack, DamageSource source, int damage, int slotIndex) { - GT_ModHandler - .dischargeElectricItem(itemStack, damage * mDamageEnergyCost, Integer.MAX_VALUE, true, false, true); + GT_ModHandler.dischargeElectricItem( + itemStack, + damage * mDamageEnergyCost, + Integer.MAX_VALUE, + true, + false, + true); } private double getBaseAbsorptionRatio() { diff --git a/src/main/java/gregtech/api/items/GT_Generic_Item.java b/src/main/java/gregtech/api/items/GT_Generic_Item.java index 2f1e642e34..b8a348144c 100644 --- a/src/main/java/gregtech/api/items/GT_Generic_Item.java +++ b/src/main/java/gregtech/api/items/GT_Generic_Item.java @@ -49,8 +49,10 @@ public class GT_Generic_Item extends Item implements IProjectileItem { super(); mName = "gt." + aUnlocalized; GT_LanguageManager.addStringLocalization(mName + ".name", aEnglish); - if (GT_Utility.isStringValid(aEnglishTooltip)) GT_LanguageManager - .addStringLocalization(mTooltip = mName + ".tooltip_main", aEnglishTooltip, aWriteToolTipIntoLangFile); + if (GT_Utility.isStringValid(aEnglishTooltip)) GT_LanguageManager.addStringLocalization( + mTooltip = mName + ".tooltip_main", + aEnglishTooltip, + aWriteToolTipIntoLangFile); else mTooltip = null; setCreativeTab(GregTech_API.TAB_GREGTECH); GameRegistry.registerItem(this, mName, MOD_ID); diff --git a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java index 42c356fd88..532b500d8f 100644 --- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java @@ -61,8 +61,9 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item */ public final GT_MetaBase_Item addItemBehavior(int aMetaValue, IItemBehaviour<GT_MetaBase_Item> aBehavior) { if (aMetaValue < 0 || aMetaValue >= 32766 || aBehavior == null) return this; - ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors - .computeIfAbsent((short) aMetaValue, k -> new ArrayList<>(1)); + ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.computeIfAbsent( + (short) aMetaValue, + k -> new ArrayList<>(1)); tList.add(aBehavior); return this; } @@ -200,7 +201,8 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item @Override public final void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { String tKey = getUnlocalizedName(aStack) + ".tooltip"; - String[] tStrings = GT_LanguageManager.getTranslation(tKey).split("/n "); + String[] tStrings = GT_LanguageManager.getTranslation(tKey) + .split("/n "); for (String tString : tStrings) if (GT_Utility.isStringValid(tString) && !tKey.equals(tString)) aList.add(tString); @@ -208,10 +210,12 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item if (tStats != null) { if (tStats[3] > 0) { aList.add( - EnumChatFormatting.AQUA + String.format( - transItem("009", "Contains %s EU Tier: %s"), - formatNumbers(tStats[3]), - "" + (tStats[2] >= 0 ? tStats[2] : 0)) + EnumChatFormatting.GRAY); + EnumChatFormatting.AQUA + + String.format( + transItem("009", "Contains %s EU Tier: %s"), + formatNumbers(tStats[3]), + "" + (tStats[2] >= 0 ? tStats[2] : 0)) + + EnumChatFormatting.GRAY); } else { long tCharge = getRealCharge(aStack); if (tStats[3] == -2 && tCharge <= 0) { @@ -240,10 +244,12 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item EnumChatFormatting.BLUE + ((tFluid == null ? transItem("012", "No Fluids Contained") : GT_Utility.getFluidName(tFluid, true))) + EnumChatFormatting.GRAY); aList.add( - EnumChatFormatting.BLUE + String.format( - transItem("013", "%sL / %sL"), - "" + (tFluid == null ? 0 : formatNumbers(tFluid.amount)), - "" + formatNumbers(tStats[0])) + EnumChatFormatting.GRAY); + EnumChatFormatting.BLUE + + String.format( + transItem("013", "%sL / %sL"), + "" + (tFluid == null ? 0 : formatNumbers(tFluid.amount)), + "" + formatNumbers(tStats[0])) + + EnumChatFormatting.GRAY); } ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack)); @@ -312,8 +318,9 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item if (!aSimulate) aStack.stackSize--; return tStats[3]; } - long tChargeBefore = getRealCharge(aStack), tNewCharge = Math - .max(0, tChargeBefore - (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge))); + long tChargeBefore = getRealCharge(aStack), tNewCharge = Math.max( + 0, + tChargeBefore - (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge))); if (!aSimulate) setCharge(aStack, tNewCharge); return tChargeBefore - tNewCharge; } @@ -464,12 +471,19 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item } Long[] tStats = getFluidContainerStats(aStack); - if (tStats == null || tStats[0] <= 0 || aFluid == null || aFluid.getFluid().getID() <= 0 || aFluid.amount <= 0) + if (tStats == null || tStats[0] <= 0 + || aFluid == null + || aFluid.getFluid() + .getID() + <= 0 + || aFluid.amount <= 0) return 0; FluidStack tFluid = getFluidContent(aStack); - if (tFluid == null || tFluid.getFluid().getID() <= 0) { + if (tFluid == null || tFluid.getFluid() + .getID() + <= 0) { if (aFluid.amount <= tStats[0]) { if (doFill) { setFluidContent(aStack, aFluid); diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java index b6ea08213b..5f906d670d 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java @@ -230,8 +230,9 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements mElectricStats.put( (short) aMetaValue, new Long[] { aMaxCharge, Math.max(0, aTransferLimit), Math.max(-1, aTier), aSpecialData }); - if (aMetaValue >= mOffset && aUseAnimations) mIconList[aMetaValue - mOffset] = Arrays - .copyOf(mIconList[aMetaValue - mOffset], Math.max(9, mIconList[aMetaValue - mOffset].length)); + if (aMetaValue >= mOffset && aUseAnimations) mIconList[aMetaValue - mOffset] = Arrays.copyOf( + mIconList[aMetaValue - mOffset], + Math.max(9, mIconList[aMetaValue - mOffset].length)); } return this; } @@ -322,18 +323,18 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements IFoodStat tStat = mFoodStats.get((short) getDamage(aStack)); if (tStat != null) { if (AppleCore.isModLoaded()) { - aPlayer.getFoodStats().func_151686_a( - (ItemFood) GT_Utility.callConstructor( - "squeek.applecore.api.food.ItemFoodProxy.ItemFoodProxy", - 0, - null, - true, - this), - aStack); + aPlayer.getFoodStats() + .func_151686_a( + (ItemFood) GT_Utility.callConstructor( + "squeek.applecore.api.food.ItemFoodProxy.ItemFoodProxy", + 0, + null, + true, + this), + aStack); } else { - aPlayer.getFoodStats().addStats( - tStat.getFoodLevel(this, aStack, aPlayer), - tStat.getSaturation(this, aStack, aPlayer)); + aPlayer.getFoodStats() + .addStats(tStat.getFoodLevel(this, aStack, aPlayer), tStat.getSaturation(this, aStack, aPlayer)); } tStat.onEaten(this, aStack, aPlayer); } @@ -377,8 +378,8 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements mIconList[i][k] = aIconRegister.registerIcon( RES_PATH_ITEM + (GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i + "/" + k)); } - mIconList[i][0] = aIconRegister - .registerIcon(RES_PATH_ITEM + (GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i)); + mIconList[i][0] = aIconRegister.registerIcon( + RES_PATH_ITEM + (GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i)); } } diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java index f33d7a4f2e..6615c6177b 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java @@ -115,7 +115,8 @@ public abstract class GT_MetaGenerated_Item_X01 extends GT_MetaGenerated_Item { * @return the name of the Item to be registered at the OreDict. */ public String getOreDictString(OrePrefixes aPrefix, Materials aMaterial) { - return aPrefix.get(aMaterial).toString(); + return aPrefix.get(aMaterial) + .toString(); } public IIconContainer getIconContainer(int aMetaData, Materials aMaterial) { diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java index a0f1ea6ef1..592914a2ff 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java @@ -170,8 +170,9 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item if (aID >= 0 && aID < 32766 && aID % 2 == 0) { GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + aID + ".name", aEnglish); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + aID + ".tooltip", aToolTip); - GT_LanguageManager - .addStringLocalization(getUnlocalizedName() + "." + (aID + 1) + ".name", aEnglish + " (Empty)"); + GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + "." + (aID + 1) + ".name", + aEnglish + " (Empty)"); GT_LanguageManager.addStringLocalization( getUnlocalizedName() + "." + (aID + 1) + ".tooltip", "You need to recharge it"); @@ -304,17 +305,16 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item GT_Utility.doSoundAtClient(tStats.getEntityHitSound(), 1, 1.0F); if (super.onLeftClickEntity(aStack, aPlayer, aEntity)) return true; if (aEntity.canAttackWithItem() && !aEntity.hitByEntity(aPlayer)) { - float tMagicDamage = tStats - .getMagicDamageAgainstEntity( - aEntity instanceof EntityLivingBase - ? EnchantmentHelper - .getEnchantmentModifierLiving(aPlayer, (EntityLivingBase) aEntity) - : 0.0F, - aEntity, - aStack, - aPlayer), + float tMagicDamage = tStats.getMagicDamageAgainstEntity( + aEntity instanceof EntityLivingBase + ? EnchantmentHelper.getEnchantmentModifierLiving(aPlayer, (EntityLivingBase) aEntity) + : 0.0F, + aEntity, + aStack, + aPlayer), tDamage = tStats.getNormalDamageAgainstEntity( - (float) aPlayer.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue() + (float) aPlayer.getEntityAttribute(SharedMonsterAttributes.attackDamage) + .getAttributeValue() + getToolCombatDamage(aStack), aEntity, aStack, @@ -352,8 +352,9 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item EnchantmentHelper.func_151385_b(aPlayer, aEntity); if (aEntity instanceof EntityLivingBase) aPlayer.addStat(StatList.damageDealtStat, Math.round(tDamage * 10.0F)); - aEntity.hurtResistantTime = Math - .max(1, tStats.getHurtResistanceTime(aEntity.hurtResistantTime, aEntity)); + aEntity.hurtResistantTime = Math.max( + 1, + tStats.getHurtResistanceTime(aEntity.hurtResistantTime, aEntity)); aPlayer.addExhaustion(0.3F); doDamage(aStack, tStats.getToolDamagePerEntityAttack()); } @@ -423,7 +424,8 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item float aBaseEff = (5f + getToolCombatDamage(aStack)) * 1000f; float aOptFlow = (Math.max( Float.MIN_NORMAL, - ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack).getSpeedMultiplier() + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack) + .getSpeedMultiplier() * ((GT_MetaGenerated_Tool) aStack.getItem()).getPrimaryMaterial(aStack).mToolSpeed * 50F)); aList.add( @@ -434,10 +436,12 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item " " + formatNumbers(tMaxDamage)) + EnumChatFormatting.GRAY); aList.add( tOffset + 1, - EnumChatFormatting.GRAY + String.format( - transItem("002", "%s lvl %s"), - tMaterial.mLocalizedName + EnumChatFormatting.YELLOW, - "" + getHarvestLevel(aStack, "")) + EnumChatFormatting.GRAY); + EnumChatFormatting.GRAY + + String.format( + transItem("002", "%s lvl %s"), + tMaterial.mLocalizedName + EnumChatFormatting.YELLOW, + "" + getHarvestLevel(aStack, "")) + + EnumChatFormatting.GRAY); aList.add( tOffset + 2, EnumChatFormatting.WHITE @@ -570,10 +574,12 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item " " + formatNumbers(tMaxDamage)) + EnumChatFormatting.GRAY); aList.add( tOffset + 1, - EnumChatFormatting.WHITE + String.format( - transItem("002", "%s lvl %s"), - tMaterial.mLocalizedName + EnumChatFormatting.YELLOW, - "" + getHarvestLevel(aStack, "")) + EnumChatFormatting.GRAY); + EnumChatFormatting.WHITE + + String.format( + transItem("002", "%s lvl %s"), + tMaterial.mLocalizedName + EnumChatFormatting.YELLOW, + "" + getHarvestLevel(aStack, "")) + + EnumChatFormatting.GRAY); aList.add( tOffset + 2, EnumChatFormatting.WHITE @@ -597,7 +603,8 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item aNBT = aNBT.getCompoundTag("GT.ToolStats"); if (aNBT != null && aNBT.hasKey("Heat")) { int tHeat = aNBT.getInteger("Heat"); - long tWorldTime = aPlayer.getEntityWorld().getWorldTime(); + long tWorldTime = aPlayer.getEntityWorld() + .getWorldTime(); if (aNBT.hasKey("HeatTime")) { long tHeatTime = aNBT.getLong("HeatTime"); if (tWorldTime > (tHeatTime + 10)) { @@ -663,7 +670,9 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item return true; } if (use(aStack, (int) aAmount, null)) { - if (java.util.concurrent.ThreadLocalRandom.current().nextInt(0, 25) == 0) { + if (java.util.concurrent.ThreadLocalRandom.current() + .nextInt(0, 25) + == 0) { long tNewDamage = getToolDamage(aStack) + aAmount; setToolDamage(aStack, tNewDamage); if (tNewDamage >= getToolMaxDamage(aStack)) { diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java index 3abfad3347..da7a6bc984 100644 --- a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java +++ b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java @@ -50,8 +50,15 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement private static int checkPulseable(IReactor reactor, int x, int y, ItemStack me, int mex, int mey, boolean heatrun) { ItemStack other = reactor.getItemAt(x, y); if ((other != null) && ((other.getItem() instanceof IReactorComponent)) - && (((IReactorComponent) other.getItem()) - .acceptUraniumPulse(reactor, other, me, x, y, mex, mey, heatrun))) { + && (((IReactorComponent) other.getItem()).acceptUraniumPulse( + reactor, + other, + me, + x, + y, + mex, + mey, + heatrun))) { return 1; } return 0; diff --git a/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java index ca77340b34..aa64476105 100644 --- a/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java +++ b/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java @@ -58,8 +58,11 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item { TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); try { - if (GT_Utility.getClassName(aTileEntity).startsWith("TileEntityCable")) { - if (GT_Utility.getPublicField(aTileEntity, "foamed").getByte(aTileEntity) == 0) { + if (GT_Utility.getClassName(aTileEntity) + .startsWith("TileEntityCable")) { + if (GT_Utility.getPublicField(aTileEntity, "foamed") + .getByte(aTileEntity) + == 0) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); GT_Utility.callPublicMethod(aTileEntity, "changeFoam", (byte) 1); @@ -121,8 +124,14 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item { for (byte i = 0; i < 4; i++) { if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ) && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_PAINTER, + 1.0F, + -1, + aX, + aY, + aZ); aWorld.setBlock( aX, aY, diff --git a/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java index b5902f2d52..ae6dcdc5f8 100644 --- a/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java +++ b/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java @@ -43,8 +43,11 @@ public class GT_Spray_Hardener_Item extends GT_Tool_Item { TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); try { - if (GT_Utility.getClassName(aTileEntity).startsWith("TileEntityCable")) { - if (GT_Utility.getPublicField(aTileEntity, "foamed").getByte(aTileEntity) == 1) { + if (GT_Utility.getClassName(aTileEntity) + .startsWith("TileEntityCable")) { + if (GT_Utility.getPublicField(aTileEntity, "foamed") + .getByte(aTileEntity) + == 1) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); GT_Utility.callPublicMethod(aTileEntity, "changeFoam", (byte) 2); diff --git a/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java index a70ebb4bfb..7d863c3e89 100644 --- a/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java +++ b/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java @@ -32,11 +32,13 @@ public class GT_Spray_Pepper_Item extends GT_Tool_Item { getUnlocalizedName() + ".tooltip_1", "especially Pedobears, Care Bears,")); aList.add( - GT_LanguageManager - .addStringLocalization(getUnlocalizedName() + ".tooltip_2", "Confession Bears, Bear Grylls")); + GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + ".tooltip_2", + "Confession Bears, Bear Grylls")); aList.add( - GT_LanguageManager - .addStringLocalization(getUnlocalizedName() + ".tooltip_3", "And ofcourse Man-Bear-Pig")); + GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + ".tooltip_3", + "And ofcourse Man-Bear-Pig")); } /* * @Override public void onHitEntity(Entity aEntity) { if (aEntity instanceof EntityLiving) { diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index 335639c9e3..e1a83f5cc6 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -943,7 +943,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity if (coverInfo.getCoverID() == 0) { if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCovers.keySet())) { if (GregTech_API.getCoverBehaviorNew(tCurrentItem) - .isCoverPlaceable(coverSide, tCurrentItem, this) + .isCoverPlaceable(coverSide, tCurrentItem, this) && mMetaTileEntity.allowCoverOnSide(coverSide, new GT_ItemStack(tCurrentItem))) { setCoverItemAtSide(coverSide, tCurrentItem); mMetaTileEntity.markDirty(); @@ -1224,7 +1224,9 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity if (mTickTimer > 5 && canAccessData() && canMoveFluidOnSide( aSide, - mMetaTileEntity.getFluid() == null ? null : mMetaTileEntity.getFluid().getFluid(), + mMetaTileEntity.getFluid() == null ? null + : mMetaTileEntity.getFluid() + .getFluid(), false)) return mMetaTileEntity.drain(aSide, maxDrain, doDrain); return null; diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 6b7368ae02..00e31ed9a0 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -82,8 +82,10 @@ import ic2.api.Direction; public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTechTileEntity, IActionHost, IGridProxyable, IAlignmentProvider, IConstructableProvider, IDebugableTileEntity, IGregtechWailaProvider { - private static final Field ENTITY_ITEM_HEALTH_FIELD = ReflectionHelper - .findField(EntityItem.class, "health", "field_70291_e"); + private static final Field ENTITY_ITEM_HEALTH_FIELD = ReflectionHelper.findField( + EntityItem.class, + "health", + "field_70291_e"); private final boolean[] mActiveEUInputs = new boolean[] { false, false, false, false, false, false }; private final boolean[] mActiveEUOutputs = new boolean[] { false, false, false, false, false, false }; private final int[] mTimeStatistics = new int[GregTech_API.TICKS_FOR_LAG_AVERAGING]; @@ -384,8 +386,9 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec } if (mMetaTileEntity.isEnetOutput() && oOutput > 0) { - final long tOutputVoltage = Math - .max(oOutput, oOutput + (1L << Math.max(0, GT_Utility.getTier(oOutput) - 1))); + final long tOutputVoltage = Math.max( + oOutput, + oOutput + (1L << Math.max(0, GT_Utility.getTier(oOutput) - 1))); final long tUsableAmperage = Math.min( getOutputAmperage(), (getStoredEU() - mMetaTileEntity.getMinimumStoredEU()) / tOutputVoltage); @@ -415,7 +418,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec if (getRandomNumber(10) == 0) { try { GT_Mod.achievements.issueAchievement( - this.getWorldObj().getPlayerEntityByName(mOwnerName), + this.getWorldObj() + .getPlayerEntityByName(mOwnerName), "badweather"); } catch (Exception ignored) {} GT_Log.exp.println( @@ -449,7 +453,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec && getRandomNumber(3) == 0) { try { GT_Mod.achievements.issueAchievement( - this.getWorldObj().getPlayerEntityByName(mOwnerName), + this.getWorldObj() + .getPlayerEntityByName(mOwnerName), "badweather"); } catch (Exception ignored) {} GT_Log.exp.println( @@ -482,11 +487,11 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec if (mMetaTileEntity.mInventory[i] != null && getStoredEU() < getEUCapacity()) { dischargeItem(mMetaTileEntity.mInventory[i]); if (ic2.api.info.Info.itemEnergy.getEnergyValue(mMetaTileEntity.mInventory[i]) > 0) { - if ((getStoredEU() + ic2.api.info.Info.itemEnergy - .getEnergyValue(mMetaTileEntity.mInventory[i])) < getEUCapacity()) { + if ((getStoredEU() + ic2.api.info.Info.itemEnergy.getEnergyValue( + mMetaTileEntity.mInventory[i])) < getEUCapacity()) { increaseStoredEnergyUnits( - (long) ic2.api.info.Info.itemEnergy - .getEnergyValue(mMetaTileEntity.mInventory[i]), + (long) ic2.api.info.Info.itemEnergy.getEnergyValue( + mMetaTileEntity.mInventory[i]), false); mMetaTileEntity.mInventory[i].stackSize--; mInventoryChanged = true; @@ -1112,7 +1117,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec public void generatePowerNodes() { if (isServerSide() && (isEnetInput() || isEnetOutput())) { - final int time = MinecraftServer.getServer().getTickCounter(); + final int time = MinecraftServer.getServer() + .getTickCounter(); for (byte i : ALL_VALID_SIDES) { if (outputsEnergyTo(i, false) || inputEnergyFrom(i, false)) { final IGregTechTileEntity TE = getIGregTechTileEntityAtSide(i); @@ -1202,8 +1208,14 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec @Override public ITexture[] getTexture(Block aBlock, byte aSide) { final ITexture coverTexture = getCoverTexture(aSide); - final ITexture[] textureUncovered = hasValidMetaTileEntity() ? mMetaTileEntity - .getTexture(this, aSide, mFacing, (byte) (mColor - 1), mActive, getOutputRedstoneSignal(aSide) > 0) + final ITexture[] textureUncovered = hasValidMetaTileEntity() + ? mMetaTileEntity.getTexture( + this, + aSide, + mFacing, + (byte) (mColor - 1), + mActive, + getOutputRedstoneSignal(aSide) > 0) : Textures.BlockIcons.ERROR_RENDERING; final ITexture[] textureCovered; if (coverTexture != null) { @@ -1293,7 +1305,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec if ((mOwnerName.length() == 0) && isServerSide()) { setOwnerName(aPlayer.getDisplayName()); setOwnerUuid(aPlayer.getUniqueID()); - } else return !privateAccess() || aPlayer.getDisplayName().equals("Player") + } else return !privateAccess() || aPlayer.getDisplayName() + .equals("Player") || mOwnerName.equals("Player") || mOwnerName.equals(aPlayer.getDisplayName()); return true; @@ -1315,8 +1328,10 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec doExplosion( oOutput * (getUniversalEnergyStored() >= getUniversalEnergyCapacity() ? 4 : getUniversalEnergyStored() >= getUniversalEnergyCapacity() / 2 ? 2 : 1)); - GT_Mod.achievements - .issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "electricproblems"); + GT_Mod.achievements.issueAchievement( + this.getWorldObj() + .getPlayerEntityByName(mOwnerName), + "electricproblems"); } } @@ -1364,7 +1379,10 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec this.zCoord + XSTR_INSTANCE.nextFloat() * 0.8F + 0.1F, new ItemStack(tItem.getItem(), tItem.stackSize, tItem.getItemDamage())); if (tItem.hasTagCompound()) { - tItemEntity.getEntityItem().setTagCompound((NBTTagCompound) tItem.getTagCompound().copy()); + tItemEntity.getEntityItem() + .setTagCompound( + (NBTTagCompound) tItem.getTagCompound() + .copy()); } tItemEntity.motionX = (XSTR_INSTANCE.nextGaussian() * 0.0500000007450581D); tItemEntity.motionY = (XSTR_INSTANCE.nextGaussian() * 0.0500000007450581D + 0.2000000029802322D); @@ -1423,7 +1441,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec } if (isServerSide()) { - if (!privateAccess() || aPlayer.getDisplayName().equalsIgnoreCase(getOwnerName())) { + if (!privateAccess() || aPlayer.getDisplayName() + .equalsIgnoreCase(getOwnerName())) { final ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem(); if (tCurrentItem != null) { if (getColorization() >= 0 @@ -1434,8 +1453,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec } if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList)) { if (aPlayer.isSneaking() && mMetaTileEntity instanceof GT_MetaTileEntity_BasicMachine - && ((GT_MetaTileEntity_BasicMachine) mMetaTileEntity) - .setMainFacing(GT_Utility.determineWrenchingSide(aSide, aX, aY, aZ))) { + && ((GT_MetaTileEntity_BasicMachine) mMetaTileEntity).setMainFacing( + GT_Utility.determineWrenchingSide(aSide, aX, aY, aZ))) { GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer); GT_Utility.sendSoundToPlayers( worldObj, @@ -1497,16 +1516,14 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) { mInputDisabled = !mInputDisabled; if (mInputDisabled) mOutputDisabled = !mOutputDisabled; - GT_Utility - .sendChatToPlayer( - aPlayer, - GT_Utility.trans("086", "Auto-Input: ") - + (mInputDisabled ? GT_Utility.trans("087", "Disabled") - : GT_Utility.trans("088", "Enabled") - + GT_Utility.trans("089", " Auto-Output: ") - + (mOutputDisabled - ? GT_Utility.trans("087", "Disabled") - : GT_Utility.trans("088", "Enabled")))); + GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("086", "Auto-Input: ") + + (mInputDisabled ? GT_Utility.trans("087", "Disabled") + : GT_Utility.trans("088", "Enabled") + + GT_Utility.trans("089", " Auto-Output: ") + + (mOutputDisabled ? GT_Utility.trans("087", "Disabled") + : GT_Utility.trans("088", "Enabled")))); GT_Utility.sendSoundToPlayers( worldObj, SoundResource.RANDOM_ANVIL_USE, @@ -1602,7 +1619,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec if (getCoverIDAtSide(coverSide) == 0) { if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCovers.keySet())) { if (GregTech_API.getCoverBehaviorNew(tCurrentItem) - .isCoverPlaceable(coverSide, tCurrentItem, this) + .isCoverPlaceable(coverSide, tCurrentItem, this) && mMetaTileEntity.allowCoverOnSide(coverSide, new GT_ItemStack(tCurrentItem))) { setCoverItemAtSide(coverSide, tCurrentItem); if (!aPlayer.capabilities.isCreativeMode) tCurrentItem.stackSize--; @@ -1994,8 +2011,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mInputDisabled) && (aSide == ForgeDirection.UNKNOWN || (mMetaTileEntity.isLiquidInput((byte) aSide.ordinal()) - && getCoverInfoAtSide((byte) aSide.ordinal()) - .letsFluidIn(aFluid == null ? null : aFluid.getFluid())))) + && getCoverInfoAtSide((byte) aSide.ordinal()).letsFluidIn( + aFluid == null ? null : aFluid.getFluid())))) return mMetaTileEntity.fill(aSide, aFluid, doFill); return 0; } @@ -2006,7 +2023,9 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec && (mRunningThroughTick || !mOutputDisabled) && (aSide == ForgeDirection.UNKNOWN || (mMetaTileEntity.isLiquidOutput((byte) aSide.ordinal()) && getCoverInfoAtSide((byte) aSide.ordinal()).letsFluidOut( - mMetaTileEntity.getFluid() == null ? null : mMetaTileEntity.getFluid().getFluid())))) + mMetaTileEntity.getFluid() == null ? null + : mMetaTileEntity.getFluid() + .getFluid())))) return mMetaTileEntity.drain(aSide, maxDrain, doDrain); return null; } @@ -2016,8 +2035,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mOutputDisabled) && (aSide == ForgeDirection.UNKNOWN || (mMetaTileEntity.isLiquidOutput((byte) aSide.ordinal()) - && getCoverInfoAtSide((byte) aSide.ordinal()) - .letsFluidOut(aFluid == null ? null : aFluid.getFluid())))) + && getCoverInfoAtSide((byte) aSide.ordinal()).letsFluidOut( + aFluid == null ? null : aFluid.getFluid())))) return mMetaTileEntity.drain(aSide, aFluid, doDrain); return null; } diff --git a/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java index 31d388cf71..238dc6ba30 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java @@ -201,7 +201,8 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje @Override public int getRandomNumber(int aRange) { - return ThreadLocalRandom.current().nextInt(aRange); + return ThreadLocalRandom.current() + .nextInt(aRange); } @Override @@ -530,8 +531,9 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje // update if it was / is strong powered. if (((((mStrongRedstone | oStrongRedstone) >>> dir.ordinal()) & 1) != 0) && getBlock(x1, y1, z1).isNormalCube()) { - final int skipUpdateSide = dir.getOpposite().ordinal(); // Don't update this block. Still updates - // diagonal blocks twice if conditions + final int skipUpdateSide = dir.getOpposite() + .ordinal(); // Don't update this block. Still updates + // diagonal blocks twice if conditions // meet. for (final ForgeDirection dir2 : ForgeDirection.VALID_DIRECTIONS) { @@ -707,8 +709,9 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje if (NetworkUtils.isClient()) { final FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; // noinspection unchecked - final List<String> titleLines = fontRenderer - .listFormattedStringToWidth(title, getGUIWidth() - (TAB_PADDING + TITLE_PADDING) * 2); + final List<String> titleLines = fontRenderer.listFormattedStringToWidth( + title, + getGUIWidth() - (TAB_PADDING + TITLE_PADDING) * 2); titleWidth = titleLines.size() > 1 ? getGUIWidth() - (TAB_PADDING + TITLE_PADDING) * 2 : fontRenderer.getStringWidth(title); // noinspection PointlessArithmeticExpression @@ -717,27 +720,35 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje final DrawableWidget tab = new DrawableWidget(); final TextWidget text = new TextWidget(title).setDefaultColor(getTitleColor()) - .setTextAlignment(Alignment.CenterLeft).setMaxWidth(titleWidth); + .setTextAlignment(Alignment.CenterLeft) + .setMaxWidth(titleWidth); if (GT_Mod.gregtechproxy.mTitleTabStyle == 1) { - tab.setDrawable(getGUITextureSet().getTitleTabAngular()).setPos(0, -(titleHeight + TAB_PADDING) + 1) - .setSize(getGUIWidth(), titleHeight + TAB_PADDING * 2); + tab.setDrawable(getGUITextureSet().getTitleTabAngular()) + .setPos(0, -(titleHeight + TAB_PADDING) + 1) + .setSize(getGUIWidth(), titleHeight + TAB_PADDING * 2); text.setPos(TAB_PADDING + TITLE_PADDING, -titleHeight + TAB_PADDING); } else { - tab.setDrawable(getGUITextureSet().getTitleTabDark()).setPos(0, -(titleHeight + TAB_PADDING * 2) + 1) - .setSize(titleWidth + (TAB_PADDING + TITLE_PADDING) * 2, titleHeight + TAB_PADDING * 2 - 1); + tab.setDrawable(getGUITextureSet().getTitleTabDark()) + .setPos(0, -(titleHeight + TAB_PADDING * 2) + 1) + .setSize(titleWidth + (TAB_PADDING + TITLE_PADDING) * 2, titleHeight + TAB_PADDING * 2 - 1); text.setPos(TAB_PADDING + TITLE_PADDING, -titleHeight); } - builder.widget(tab).widget(text); + builder.widget(tab) + .widget(text); } protected void addTitleItemIconStyle(ModularWindow.Builder builder, String title) { builder.widget( - new MultiChildWidget() - .addChild( - new DrawableWidget().setDrawable(getGUITextureSet().getTitleTabNormal()).setPos(0, 0) - .setSize(24, 24)) - .addChild(new ItemDrawable(getStackForm(1)).asWidget().setPos(4, 4)).addTooltip(title) - .setTooltipShowUpDelay(TOOLTIP_DELAY).setPos(0, -24 + 3)); + new MultiChildWidget().addChild( + new DrawableWidget().setDrawable(getGUITextureSet().getTitleTabNormal()) + .setPos(0, 0) + .setSize(24, 24)) + .addChild( + new ItemDrawable(getStackForm(1)).asWidget() + .setPos(4, 4)) + .addTooltip(title) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setPos(0, -24 + 3)); } @Override @@ -752,7 +763,9 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17).setPos(152, 63)); + new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()) + .setSize(17, 17) + .setPos(152, 63)); } protected int getGUIWidth() { @@ -776,8 +789,12 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje background = new IDrawable[] { getGUITextureSet().getItemSlot() }; } builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 1).startFromSlot(0).endAtSlot(0).background(background) - .build().setPos(79, 34)); + SlotGroup.ofItemHandler(inventoryHandler, 1) + .startFromSlot(0) + .endAtSlot(0) + .background(background) + .build() + .setPos(79, 34)); } @Override @@ -789,8 +806,12 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje background = new IDrawable[] { getGUITextureSet().getItemSlot() }; } builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 2).startFromSlot(0).endAtSlot(3).background(background) - .build().setPos(70, 25)); + SlotGroup.ofItemHandler(inventoryHandler, 2) + .startFromSlot(0) + .endAtSlot(3) + .background(background) + .build() + .setPos(70, 25)); } @Override @@ -802,8 +823,12 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje background = new IDrawable[] { getGUITextureSet().getItemSlot() }; } builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(0).endAtSlot(8).background(background) - .build().setPos(61, 16)); + SlotGroup.ofItemHandler(inventoryHandler, 3) + .startFromSlot(0) + .endAtSlot(8) + .background(background) + .build() + .setPos(61, 16)); } @Override @@ -815,8 +840,12 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje background = new IDrawable[] { getGUITextureSet().getItemSlot() }; } builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 4).startFromSlot(0).endAtSlot(15).background(background) - .build().setPos(52, 7)); + SlotGroup.ofItemHandler(inventoryHandler, 4) + .startFromSlot(0) + .endAtSlot(15) + .background(background) + .build() + .setPos(52, 7)); } public void addCoverTabs(ModularWindow.Builder builder, UIBuildContext buildContext) { @@ -857,8 +886,9 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje final List<ItemStack> tCircuits = ccs.getConfigurationCircuits(); final int index = GT_Utility.findMatchingStackInList(tCircuits, cursorStack); if (index < 0) { - int curIndex = GT_Utility - .findMatchingStackInList(tCircuits, inv.getStackInSlot(ccs.getCircuitSlot())) + 1; + int curIndex = GT_Utility.findMatchingStackInList( + tCircuits, + inv.getStackInSlot(ccs.getCircuitSlot())) + 1; if (clickData.mouseButton == 0) { curIndex += 1; } else { @@ -894,10 +924,13 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje line -> line.contains(StatCollector.translateToLocal("gt.integrated_circuit.tooltip.0")) || line.contains(StatCollector.translateToLocal("gt.integrated_circuit.tooltip.1"))); return list; - }).disableShiftInsert().setHandlePhantomActionClient(true) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_INT_CIRCUIT) - .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.select_circuit.tooltip")) - .setTooltipShowUpDelay(TOOLTIP_DELAY).setPos(ccs.getCircuitSlotX() - 1, ccs.getCircuitSlotY() - 1)); + }) + .disableShiftInsert() + .setHandlePhantomActionClient(true) + .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_INT_CIRCUIT) + .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.select_circuit.tooltip")) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setPos(ccs.getCircuitSlotX() - 1, ccs.getCircuitSlotY() - 1)); } protected void openSelectCircuitDialog(ModularUIContext uiContext, AtomicBoolean dialogOpened) { @@ -915,9 +948,17 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje this::onCircuitSelected, circuits, GT_Utility.findMatchingStackInList(circuits, inv.getStackInSlot(ccs.getCircuitSlot()))) - .setAnotherWindow(true, dialogOpened).setGuiTint(getGUIColorization()) - .setCurrentGetter(() -> inv.getStackInSlot(ccs.getCircuitSlot())) - .createWindow(new UIBuildContext(player))); + .setAnotherWindow( + true, + dialogOpened) + .setGuiTint( + getGUIColorization()) + .setCurrentGetter( + () -> inv.getStackInSlot( + ccs.getCircuitSlot())) + .createWindow( + new UIBuildContext( + player))); } protected void onCircuitSelected(ItemStack selected) { diff --git a/src/main/java/gregtech/api/metatileentity/CommonMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/CommonMetaTileEntity.java index a49071cdcf..853dd3699a 100644 --- a/src/main/java/gregtech/api/metatileentity/CommonMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/CommonMetaTileEntity.java @@ -34,7 +34,8 @@ public abstract class CommonMetaTileEntity extends CoverableTileEntity implement GT_Log.err.println("MetaID " + aID + " not loadable => locking TileEntity!"); } else { if (hasValidMetaTileEntity()) getMetaTileEntity().setBaseMetaTileEntity(null); - GregTech_API.METATILEENTITIES[aID].newMetaEntity(this).setBaseMetaTileEntity(this); + GregTech_API.METATILEENTITIES[aID].newMetaEntity(this) + .setBaseMetaTileEntity(this); mTickTimer = 0; mID = aID; return true; diff --git a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java index 1228e3f668..f2929e7e1e 100644 --- a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java @@ -64,7 +64,9 @@ import gregtech.common.covers.GT_Cover_Fluidfilter; public abstract class CoverableTileEntity extends BaseTileEntity implements ICoverable, IGregtechWailaProvider { public static final String[] COVER_DATA_NBT_KEYS = Arrays.stream(ForgeDirection.VALID_DIRECTIONS) - .mapToInt(Enum::ordinal).mapToObj(i -> "mCoverData" + i).toArray(String[]::new); + .mapToInt(Enum::ordinal) + .mapToObj(i -> "mCoverData" + i) + .toArray(String[]::new); // New Cover Information protected final CoverInfo[] coverInfos = new CoverInfo[] { null, null, null, null, null, null }; @@ -102,7 +104,10 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov // Backwards compat, in case of a revert... for now tList.appendTag(coverInfo.writeToNBT(new NBTTagCompound())); - aNBT.setTag(COVER_DATA_NBT_KEYS[i], coverInfo.getCoverData().saveDataToNBT()); + aNBT.setTag( + COVER_DATA_NBT_KEYS[i], + coverInfo.getCoverData() + .saveDataToNBT()); } if (tList.tagCount() > 0) { aNBT.setTag(GT_Values.NBT.COVERS, tList); @@ -159,8 +164,11 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov if (coverBehavior instanceof GT_Cover_Fluidfilter) { final String filterKey = String.format("fluidFilter%d", i); if (aNBT.hasKey(filterKey)) { - coverData = coverInfo.getCoverBehavior().createDataObject( - (tOldData[i] & 7) | (FluidRegistry.getFluidID(aNBT.getString(filterKey)) << 3)); + coverData = coverInfo.getCoverBehavior() + .createDataObject( + (tOldData[i] & 7) + | (FluidRegistry.getFluidID(aNBT.getString(filterKey)) + << 3)); } } else { coverData = coverBehavior.createDataObject(tOldData[i]); @@ -290,7 +298,10 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov @Override public void setCoverDataAtSide(byte aSide, ISerializableObject aData) { final CoverInfo coverInfo = getCoverInfoAtSide(aSide); - if (coverInfo.isValid() && coverInfo.getCoverBehavior().cast(aData) != null) coverInfo.setCoverData(aData); + if (coverInfo.isValid() && coverInfo.getCoverBehavior() + .cast(aData) + != null) + coverInfo.setCoverData(aData); } @Override @@ -303,7 +314,8 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov @Override public void setCoverItemAtSide(byte aSide, ItemStack aCover) { - GregTech_API.getCoverBehaviorNew(aCover).placeCover(aSide, aCover, this); + GregTech_API.getCoverBehaviorNew(aCover) + .placeCover(aSide, aCover, this); } @Override @@ -426,14 +438,18 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov @Override public void setInternalOutputRedstoneSignal(byte aSide, byte aStrength) { - if (!getCoverBehaviorAtSideNew(aSide) - .manipulatesSidedRedstoneOutput(aSide, getCoverIDAtSide(aSide), getComplexCoverDataAtSide(aSide), this)) + if (!getCoverBehaviorAtSideNew(aSide).manipulatesSidedRedstoneOutput( + aSide, + getCoverIDAtSide(aSide), + getComplexCoverDataAtSide(aSide), + this)) setOutputRedstoneSignal(aSide, aStrength); } @Override public boolean getRedstone() { - return IntStream.range(1, 6).anyMatch(i -> getRedstone((byte) i)); + return IntStream.range(1, 6) + .anyMatch(i -> getRedstone((byte) i)); } @Override @@ -443,7 +459,10 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov @Override public byte getStrongestRedstone() { - return (byte) IntStream.range(1, 6).map(i -> getInternalInputRedstoneSignal((byte) i)).max().orElse(0); + return (byte) IntStream.range(1, 6) + .map(i -> getInternalInputRedstoneSignal((byte) i)) + .max() + .orElse(0); } @Override @@ -469,16 +488,20 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov @Override public byte getInputRedstoneSignal(byte aSide) { - return (byte) (worldObj - .getIndirectPowerLevelTo(getOffsetX(aSide, 1), getOffsetY(aSide, 1), getOffsetZ(aSide, 1), aSide) & 15); + return (byte) (worldObj.getIndirectPowerLevelTo( + getOffsetX(aSide, 1), + getOffsetY(aSide, 1), + getOffsetZ(aSide, 1), + aSide) & 15); } @Override public byte getOutputRedstoneSignal(byte aSide) { - return getCoverBehaviorAtSideNew(aSide) - .manipulatesSidedRedstoneOutput(aSide, getCoverIDAtSide(aSide), getComplexCoverDataAtSide(aSide), this) - ? mSidedRedstone[aSide] - : getGeneralRS(aSide); + return getCoverBehaviorAtSideNew(aSide).manipulatesSidedRedstoneOutput( + aSide, + getCoverIDAtSide(aSide), + getComplexCoverDataAtSide(aSide), + this) ? mSidedRedstone[aSide] : getGeneralRS(aSide); } protected void updateOutputRedstoneSignal(byte aSide) { @@ -531,7 +554,8 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov public void getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { final NBTTagCompound tag = accessor.getNBTData(); - final byte currentFacing = (byte) accessor.getSide().ordinal(); + final byte currentFacing = (byte) accessor.getSide() + .ordinal(); final NBTTagList tList = tag.getTagList(GT_Values.NBT.COVERS, 10); for (byte i = 0; i < tList.tagCount(); i++) { @@ -547,8 +571,10 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov currentFacing == coverInfo.getSide() ? StatCollector.translateToLocal("GT5U.waila.cover.current_facing") : StatCollector.translateToLocal( - "GT5U.interface.coverTabs." + ForgeDirection - .getOrientation(coverInfo.getSide()).toString().toLowerCase()), + "GT5U.interface.coverTabs." + + ForgeDirection.getOrientation(coverInfo.getSide()) + .toString() + .toLowerCase()), coverStack.getDisplayName())); final String behaviorDesc = coverInfo.getBehaviorDescription(); if (!Objects.equals(behaviorDesc, E)) currenttip.add(behaviorDesc); @@ -602,8 +628,8 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov final GT_CoverBehaviorBase<?> behavior = GregTech_API.getCoverBehaviorNew(coverId); if (behavior == null || behavior == GregTech_API.sNoBehavior) continue; if (!aNBT.hasKey(CoverableTileEntity.COVER_DATA_NBT_KEYS[tSide])) continue; - final ISerializableObject dataObject = behavior - .createDataObject(aNBT.getTag(CoverableTileEntity.COVER_DATA_NBT_KEYS[tSide])); + final ISerializableObject dataObject = behavior.createDataObject( + aNBT.getTag(CoverableTileEntity.COVER_DATA_NBT_KEYS[tSide])); final ItemStack coverStack = behavior.getDisplayStack(coverId, dataObject); if (coverStack != null) { aList.add( @@ -634,11 +660,15 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov final int xPos = flipHorizontally ? (getGUIWidth() - COVER_TAB_LEFT - COVER_TAB_WIDTH) : COVER_TAB_LEFT; if (GT_Mod.gregtechproxy.mCoverTabsVisible) { columnWidget.setPos(xPos, COVER_TAB_TOP) - .setEnabled(widget -> ((Column) widget).getChildren().stream().anyMatch(Widget::isEnabled)); + .setEnabled( + widget -> ((Column) widget).getChildren() + .stream() + .anyMatch(Widget::isEnabled)); } else { columnWidget.setEnabled(false); } - columnWidget.setAlignment(MainAxisAlignment.SPACE_BETWEEN).setSpace(COVER_TAB_SPACING); + columnWidget.setAlignment(MainAxisAlignment.SPACE_BETWEEN) + .setSpace(COVER_TAB_SPACING); for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { final byte side = (byte) direction.ordinal(); @@ -668,12 +698,23 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov return backgrounds.toArray(new IDrawable[] {}); } }.setOnClick((clickData, widget) -> onTabClicked(clickData, widget, side)) - .dynamicTooltip(() -> getCoverTabTooltip(side)).setSize(COVER_TAB_WIDTH, COVER_TAB_HEIGHT)) - .addChild( - new ItemDrawable(() -> { return getCoverItemAtSide(side); }).asWidget().setPos( - (COVER_TAB_WIDTH - ICON_SIZE) / 2 + (flipHorizontally ? -1 : 1), - (COVER_TAB_HEIGHT - ICON_SIZE) / 2)) - .setEnabled(widget -> getCoverItemAtSide(side) != null)); + .dynamicTooltip(() -> getCoverTabTooltip(side)) + .setSize(COVER_TAB_WIDTH, COVER_TAB_HEIGHT)) + .addChild( + new ItemDrawable( + () -> { return getCoverItemAtSide(side); }) + .asWidget() + .setPos( + (COVER_TAB_WIDTH + - ICON_SIZE) + / 2 + + (flipHorizontally + ? -1 + : 1), + (COVER_TAB_HEIGHT + - ICON_SIZE) + / 2)) + .setEnabled(widget -> getCoverItemAtSide(side) != null)); } } @@ -708,14 +749,20 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov if (isClientSide()) return; final CoverInfo coverInfo = getCoverInfoAtSide(side); if (coverInfo.useModularUI()) { - widget.getContext().openSyncedWindow(side + COVER_WINDOW_ID_START); + widget.getContext() + .openSyncedWindow(side + COVER_WINDOW_ID_START); } else { final GT_Packet_TileEntityCoverGUI packet = new GT_Packet_TileEntityCoverGUI( coverInfo, getWorld().provider.dimensionId, - widget.getContext().getPlayer().getEntityId(), + widget.getContext() + .getPlayer() + .getEntityId(), 0); - GT_Values.NW.sendToPlayer(packet, (EntityPlayerMP) widget.getContext().getPlayer()); + GT_Values.NW.sendToPlayer( + packet, + (EntityPlayerMP) widget.getContext() + .getPlayer()); } } } diff --git a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java index 3aa0cbfb32..cf1cb5dc1b 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java @@ -98,7 +98,8 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable { } else { throw new IllegalArgumentException("MetaMachine-Slot Nr. " + aID + " is already occupied!"); } - mName = aBasicName.replaceAll(" ", "_").toLowerCase(Locale.ENGLISH); + mName = aBasicName.replaceAll(" ", "_") + .toLowerCase(Locale.ENGLISH); setBaseMetaTileEntity(new BaseMetaPipeEntity()); getBaseMetaTileEntity().setMetaTileID((short) aID); GT_LanguageManager.addStringLocalization("gt.blockmachines." + mName + ".name", aRegionalName); @@ -113,7 +114,8 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable { if (!GT.isClientSide()) return; ItemStack tStack = new ItemStack(GregTech_API.sBlockMachines, 1, aID); - tStack.getItem().addInformation(tStack, null, new ArrayList<String>(), true); + tStack.getItem() + .addInformation(tStack, null, new ArrayList<String>(), true); } /** @@ -146,7 +148,8 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable { @Override public void setBaseMetaTileEntity(IGregTechTileEntity aBaseMetaTileEntity) { if (mBaseMetaTileEntity != null && aBaseMetaTileEntity == null) { - mBaseMetaTileEntity.getMetaTileEntity().inValidate(); + mBaseMetaTileEntity.getMetaTileEntity() + .inValidate(); mBaseMetaTileEntity.setMetaTileEntity(null); } mBaseMetaTileEntity = aBaseMetaTileEntity; @@ -786,8 +789,11 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable { World tWorld = getBaseMetaTileEntity().getWorld(); tWorld.setBlock(tX, tY, tZ, Blocks.air); if (GregTech_API.sMachineExplosions) { - new WorldSpawnedEventBuilder.ExplosionEffectEventBuilder().setStrength(tStrength).setSmoking(true) - .setPosition(tX + 0.5, tY + 0.5, tZ + 0.5).setWorld(tWorld).run(); + new WorldSpawnedEventBuilder.ExplosionEffectEventBuilder().setStrength(tStrength) + .setSmoking(true) + .setPosition(tX + 0.5, tY + 0.5, tZ + 0.5) + .setWorld(tWorld) + .run(); } } @@ -875,7 +881,8 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable { final IMetaTileEntity tPipe = tTileEntity instanceof IGregTechTileEntity ? ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() : null; - if (getClass().isInstance(tPipe) || (tPipe != null && tPipe.getClass().isInstance(this))) { + if (getClass().isInstance(tPipe) || (tPipe != null && tPipe.getClass() + .isInstance(this))) { connectAtSide(aSide); if (!((MetaPipeEntity) tPipe).isConnectedAtSide(tSide)) { // Make sure pipes all get together -- connect back to us if we're connecting to a pipe @@ -890,8 +897,11 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable { connectAtSide(aSide); return 1; } - if (!baseMetaTile.getWorld().getChunkProvider() - .chunkExists(baseMetaTile.getOffsetX(aSide, 1) >> 4, baseMetaTile.getOffsetZ(aSide, 1) >> 4)) { + if (!baseMetaTile.getWorld() + .getChunkProvider() + .chunkExists( + baseMetaTile.getOffsetX(aSide, 1) >> 4, + baseMetaTile.getOffsetZ(aSide, 1) >> 4)) { // Target chunk unloaded return -1; } @@ -921,7 +931,10 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable { byte tSide = GT_Utility.getOppositeSide(aSide); IGregTechTileEntity tTileEntity = getBaseMetaTileEntity().getIGregTechTileEntityAtSide(aSide); IMetaTileEntity tPipe = tTileEntity == null ? null : tTileEntity.getMetaTileEntity(); - if ((this.getClass().isInstance(tPipe) || (tPipe != null && tPipe.getClass().isInstance(this))) + if ((this.getClass() + .isInstance(tPipe) + || (tPipe != null && tPipe.getClass() + .isInstance(this))) && ((MetaPipeEntity) tPipe).isConnectedAtSide(tSide)) ((MetaPipeEntity) tPipe).disconnect(tSide); } diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java index 26caeaa416..a017fca2e0 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java @@ -129,7 +129,8 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac } else { throw new IllegalArgumentException("MetaMachine-Slot Nr. " + aID + " is already occupied!"); } - mName = aBasicName.replace(" ", "_").toLowerCase(Locale.ENGLISH); + mName = aBasicName.replace(" ", "_") + .toLowerCase(Locale.ENGLISH); setBaseMetaTileEntity(GregTech_API.constructBaseMetaTileEntity()); getBaseMetaTileEntity().setMetaTileID((short) aID); GT_LanguageManager.addStringLocalization("gt.blockmachines." + mName + ".name", aRegionalName); @@ -165,7 +166,8 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac @Override public void setBaseMetaTileEntity(IGregTechTileEntity aBaseMetaTileEntity) { if (mBaseMetaTileEntity != null && aBaseMetaTileEntity == null) { - mBaseMetaTileEntity.getMetaTileEntity().inValidate(); + mBaseMetaTileEntity.getMetaTileEntity() + .inValidate(); mBaseMetaTileEntity.setMetaTileEntity(null); } mBaseMetaTileEntity = aBaseMetaTileEntity; @@ -245,7 +247,13 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac && (((IGregTechTileEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaPipeEntity_Cable)) { // The tile entity we're facing is a cable, let's try to connect to it return ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() - .onWireCutterRightClick(aWrenchingSide, tSide, aPlayer, aX, aY, aZ); + .onWireCutterRightClick( + aWrenchingSide, + tSide, + aPlayer, + aX, + aY, + aZ); } return false; } @@ -260,7 +268,13 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac && (((IGregTechTileEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaPipeEntity_Cable)) { // The tile entity we're facing is a cable, let's try to connect to it return ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() - .onSolderingToolRightClick(aWrenchingSide, tSide, aPlayer, aX, aY, aZ); + .onSolderingToolRightClick( + aWrenchingSide, + tSide, + aPlayer, + aX, + aY, + aZ); } return false; } @@ -268,13 +282,17 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac @Override public void onExplosion() { GT_Log.exp.println( - "Machine at " + this.getBaseMetaTileEntity().getXCoord() + "Machine at " + this.getBaseMetaTileEntity() + .getXCoord() + " | " - + this.getBaseMetaTileEntity().getYCoord() + + this.getBaseMetaTileEntity() + .getYCoord() + " | " - + this.getBaseMetaTileEntity().getZCoord() + + this.getBaseMetaTileEntity() + .getZCoord() + " DIMID: " - + this.getBaseMetaTileEntity().getWorld().provider.dimensionId + + this.getBaseMetaTileEntity() + .getWorld().provider.dimensionId + " exploded."); } @@ -1180,7 +1198,8 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac currenttip.add( String.format( "Facing: %s", - ForgeDirection.getOrientation(mBaseMetaTileEntity.getFrontFacing()).name())); + ForgeDirection.getOrientation(mBaseMetaTileEntity.getFrontFacing()) + .name())); if (this instanceof IPowerChannelState) { // adapted from PowerStateWailaDataProvider @@ -1221,11 +1240,20 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac try { if (getProxy() == null) return "(proxy)"; if (getProxy().getNode() == null) return "(node)"; - if (getProxy().getNode().getGrid() == null) return "(grid)"; - if (!getProxy().getNode().meetsChannelRequirements()) return "(channels)"; - IPathingGrid pg = getProxy().getNode().getGrid().getCache(IPathingGrid.class); + if (getProxy().getNode() + .getGrid() + == null) + return "(grid)"; + if (!getProxy().getNode() + .meetsChannelRequirements()) + return "(channels)"; + IPathingGrid pg = getProxy().getNode() + .getGrid() + .getCache(IPathingGrid.class); if (!pg.isNetworkBooting()) return "(booting)"; - IEnergyGrid eg = getProxy().getNode().getGrid().getCache(IEnergyGrid.class); + IEnergyGrid eg = getProxy().getNode() + .getGrid() + .getCache(IEnergyGrid.class); if (!eg.isNetworkPowered()) return "(power)"; } catch (Throwable ex) { ex.printStackTrace(); diff --git a/src/main/java/gregtech/api/metatileentity/TileIC2EnergySink.java b/src/main/java/gregtech/api/metatileentity/TileIC2EnergySink.java index 6d6ec378d4..674ced4535 100644 --- a/src/main/java/gregtech/api/metatileentity/TileIC2EnergySink.java +++ b/src/main/java/gregtech/api/metatileentity/TileIC2EnergySink.java @@ -82,8 +82,9 @@ public class TileIC2EnergySink extends TileEntity implements IEnergySink { @Override public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) { - final long amps = (long) Math - .max(amount / (cableMeta != null ? cableMeta.mVoltage : myMeta.getInputVoltage() * 1.0), 1.0); + final long amps = (long) Math.max( + amount / (cableMeta != null ? cableMeta.mVoltage : myMeta.getInputVoltage() * 1.0), + 1.0); final long euPerAmp = (long) (amount / (amps * 1.0)); final IMetaTileEntity metaTile = myMeta.getMetaTileEntity(); @@ -97,8 +98,10 @@ public class TileIC2EnergySink extends TileEntity implements IEnergySink { amps, Sets.newHashSet((TileEntity) myMeta)); - } else usedAmps = myMeta - .injectEnergyUnits((byte) directionFrom.ordinal(), Math.min(euPerAmp, myMeta.getInputVoltage()), amps); + } else usedAmps = myMeta.injectEnergyUnits( + (byte) directionFrom.ordinal(), + Math.min(euPerAmp, myMeta.getInputVoltage()), + amps); return amount - (usedAmps * euPerAmp); // transferElectricity for cables diff --git a/src/main/java/gregtech/api/metatileentity/examples/GT_MetaTileEntity_E_Furnace.java b/src/main/java/gregtech/api/metatileentity/examples/GT_MetaTileEntity_E_Furnace.java index a372a37103..e8e313141d 100644 --- a/src/main/java/gregtech/api/metatileentity/examples/GT_MetaTileEntity_E_Furnace.java +++ b/src/main/java/gregtech/api/metatileentity/examples/GT_MetaTileEntity_E_Furnace.java @@ -32,28 +32,52 @@ public class GT_MetaTileEntity_E_Furnace extends GT_MetaTileEntity_BasicMachine "smelting", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_STEAM_FURNACE_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_FURNACE_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_FURNACE_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_STEAM_FURNACE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_FURNACE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_FURNACE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_STEAM_FURNACE_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_FURNACE_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_FURNACE_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_STEAM_FURNACE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_FURNACE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_FURNACE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_STEAM_FURNACE_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_FURNACE_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_FURNACE_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_STEAM_FURNACE), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_FURNACE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_FURNACE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_STEAM_FURNACE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_GLOW).glow().build())); + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_GLOW) + .glow() + .build())); } public GT_MetaTileEntity_E_Furnace(String aName, int aTier, String aDescription, ITexture[][][] aTextures, diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java index e2e0b13f12..790d4d6c1f 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java @@ -205,7 +205,9 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile @Override public long injectEnergyUnits(byte aSide, long aVoltage, long aAmperage) { if (!isConnectedAtSide(aSide) && aSide != 6) return 0; - if (!getBaseMetaTileEntity().getCoverInfoAtSide(aSide).letsEnergyIn()) return 0; + if (!getBaseMetaTileEntity().getCoverInfoAtSide(aSide) + .letsEnergyIn()) + return 0; final HashSet<TileEntity> nul = null; return transferElectricity(aSide, aVoltage, aAmperage, nul); } @@ -245,9 +247,11 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) { if (aBaseMetaTileEntity.isServerSide()) { lastAmperage = new int[16]; - lastWorldTick = aBaseMetaTileEntity.getWorld().getTotalWorldTime() - 1; // sets initial value -1 since it is - // in the same tick as first on post - // tick + lastWorldTick = aBaseMetaTileEntity.getWorld() + .getTotalWorldTime() + - 1; // sets initial value -1 since it is + // in the same tick as first on post + // tick } } @@ -546,8 +550,13 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile if ((tConn & (1 << ForgeDirection.WEST.ordinal())) != 0) tSide4 = 0f; if ((tConn & (1 << ForgeDirection.EAST.ordinal())) != 0) tSide5 = 1f; - return AxisAlignedBB - .getBoundingBox(aX + tSide4, aY + tSide0, aZ + tSide2, aX + tSide5, aY + tSide1, aZ + tSide3); + return AxisAlignedBB.getBoundingBox( + aX + tSide4, + aY + tSide0, + aZ + tSide2, + aX + tSide5, + aY + tSide1, + aZ + tSide3); } @Override diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java index 29237218a1..a3e44640e8 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java @@ -263,7 +263,8 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { && aEntity instanceof EntityLivingBase) { for (FluidStack tFluid : mFluids) { if (tFluid != null) { - final int tTemperature = tFluid.getFluid().getTemperature(tFluid); + final int tTemperature = tFluid.getFluid() + .getTemperature(tFluid); if (tTemperature > 320 && !isCoverOnSide( (BaseMetaPipeEntity) getBaseMetaTileEntity(), (EntityLivingBase) aEntity)) { @@ -314,7 +315,8 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { final FluidStack tFluid = mFluids[index]; if (tFluid != null && tFluid.amount > 0) { - final int tTemperature = tFluid.getFluid().getTemperature(tFluid); + final int tTemperature = tFluid.getFluid() + .getTemperature(tFluid); if (tTemperature > mHeatResistance) { if (aBaseMetaTileEntity.getRandomNumber(100) == 0) { // Poof @@ -341,21 +343,28 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { + " DIMID: " + aBaseMetaTileEntity.getWorld().provider.dimensionId); } - if (!mGasProof && tFluid.getFluid().isGaseous(tFluid)) { + if (!mGasProof && tFluid.getFluid() + .isGaseous(tFluid)) { tFluid.amount -= 5; sendSound((byte) 9); if (tTemperature > 320) { try { for (EntityLivingBase tLiving : (ArrayList<EntityLivingBase>) getBaseMetaTileEntity().getWorld() - .getEntitiesWithinAABB( - EntityLivingBase.class, - AxisAlignedBB.getBoundingBox( - getBaseMetaTileEntity().getXCoord() - 2, - getBaseMetaTileEntity().getYCoord() - 2, - getBaseMetaTileEntity().getZCoord() - 2, - getBaseMetaTileEntity().getXCoord() + 3, - getBaseMetaTileEntity().getYCoord() + 3, - getBaseMetaTileEntity().getZCoord() + 3))) { + .getEntitiesWithinAABB( + EntityLivingBase.class, + AxisAlignedBB.getBoundingBox( + getBaseMetaTileEntity().getXCoord() + - 2, + getBaseMetaTileEntity().getYCoord() + - 2, + getBaseMetaTileEntity().getZCoord() + - 2, + getBaseMetaTileEntity().getXCoord() + + 3, + getBaseMetaTileEntity().getYCoord() + + 3, + getBaseMetaTileEntity().getZCoord() + + 3))) { GT_Utility.applyHeatDamage(tLiving, (tTemperature - 300) / 25.0F); } } catch (Throwable e) { @@ -364,15 +373,21 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { } else if (tTemperature < 260) { try { for (EntityLivingBase tLiving : (ArrayList<EntityLivingBase>) getBaseMetaTileEntity().getWorld() - .getEntitiesWithinAABB( - EntityLivingBase.class, - AxisAlignedBB.getBoundingBox( - getBaseMetaTileEntity().getXCoord() - 2, - getBaseMetaTileEntity().getYCoord() - 2, - getBaseMetaTileEntity().getZCoord() - 2, - getBaseMetaTileEntity().getXCoord() + 3, - getBaseMetaTileEntity().getYCoord() + 3, - getBaseMetaTileEntity().getZCoord() + 3))) { + .getEntitiesWithinAABB( + EntityLivingBase.class, + AxisAlignedBB.getBoundingBox( + getBaseMetaTileEntity().getXCoord() + - 2, + getBaseMetaTileEntity().getYCoord() + - 2, + getBaseMetaTileEntity().getZCoord() + - 2, + getBaseMetaTileEntity().getXCoord() + + 3, + getBaseMetaTileEntity().getYCoord() + + 3, + getBaseMetaTileEntity().getZCoord() + + 3))) { GT_Utility.applyFrostDamage(tLiving, (270 - tTemperature) / 12.5F); } } catch (Throwable e) { @@ -402,8 +417,10 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { if (isConnectedAtSide(aSide) && tTank != null && (mLastReceivedFrom & (1 << aSide)) == 0 - && getBaseMetaTileEntity().getCoverInfoAtSide(aSide).letsFluidOut(tFluid.getFluid()) - && (gTank == null || gTank.getCoverInfoAtSide(tSide).letsFluidIn(tFluid.getFluid()))) { + && getBaseMetaTileEntity().getCoverInfoAtSide(aSide) + .letsFluidOut(tFluid.getFluid()) + && (gTank == null || gTank.getCoverInfoAtSide(tSide) + .letsFluidIn(tFluid.getFluid()))) { if (tTank.fill(ForgeDirection.getOrientation(tSide), tFluid, false) > 0) { tTanks.add(new MutableTriple<>(tTank, ForgeDirection.getOrientation(tSide), 0)); } @@ -435,8 +452,10 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { if (tEntry.right <= 0) continue; - final int tFilledAmount = tEntry.left - .fill(tEntry.middle, drainFromIndex(tEntry.right, false, index), false); + final int tFilledAmount = tEntry.left.fill( + tEntry.middle, + drainFromIndex(tEntry.right, false, index), + false); if (tFilledAmount > 0) tEntry.left.fill(tEntry.middle, drainFromIndex(tFilledAmount, true, index), true); @@ -510,7 +529,9 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { public boolean canConnect(byte aSide, TileEntity tTileEntity) { if (tTileEntity == null) return false; - final byte tSide = (byte) ForgeDirection.getOrientation(aSide).getOpposite().ordinal(); + final byte tSide = (byte) ForgeDirection.getOrientation(aSide) + .getOpposite() + .ordinal(); final IGregTechTileEntity baseMetaTile = getBaseMetaTileEntity(); if (baseMetaTile == null) return false; @@ -559,19 +580,19 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { if (aIndex == 9) { GT_Utility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 5, 1.0F, aX, aY, aZ); - new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD).setWorld(getBaseMetaTileEntity().getWorld()) - .<ParticleEventBuilder>times( - 6, - (x, i) -> x - .setMotion( - ForgeDirection.getOrientation(i).offsetX / 5.0, - ForgeDirection.getOrientation(i).offsetY / 5.0, - ForgeDirection.getOrientation(i).offsetZ / 5.0) - .setPosition( - aX - 0.5 + XSTR_INSTANCE.nextFloat(), - aY - 0.5 + XSTR_INSTANCE.nextFloat(), - aZ - 0.5 + XSTR_INSTANCE.nextFloat()) - .run()); + new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD) + .setWorld(getBaseMetaTileEntity().getWorld()) + .<ParticleEventBuilder>times( + 6, + (x, i) -> x.setMotion( + ForgeDirection.getOrientation(i).offsetX / 5.0, + ForgeDirection.getOrientation(i).offsetY / 5.0, + ForgeDirection.getOrientation(i).offsetZ / 5.0) + .setPosition( + aX - 0.5 + XSTR_INSTANCE.nextFloat(), + aY - 0.5 + XSTR_INSTANCE.nextFloat(), + aZ - 0.5 + XSTR_INSTANCE.nextFloat()) + .run()); } } @@ -625,16 +646,21 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { @Override public final int fill_default(ForgeDirection aSide, FluidStack aFluid, boolean doFill) { - if (aFluid == null || aFluid.getFluid().getID() <= 0) return 0; + if (aFluid == null || aFluid.getFluid() + .getID() + <= 0) + return 0; int index = -1; for (int i = 0; i < mPipeAmount; i++) { if (mFluids[i] != null && mFluids[i].isFluidEqual(aFluid)) { index = i; break; - } else if ((mFluids[i] == null || mFluids[i].getFluid().getID() <= 0) && index < 0) { - index = i; - } + } else if ((mFluids[i] == null || mFluids[i].getFluid() + .getID() + <= 0) && index < 0) { + index = i; + } } return fill_default_intoIndex(aSide, aFluid, doFill, index); @@ -642,9 +668,14 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { private int fill_default_intoIndex(ForgeDirection aSide, FluidStack aFluid, boolean doFill, int index) { if (index < 0 || index >= mPipeAmount) return 0; - if (aFluid == null || aFluid.getFluid().getID() <= 0) return 0; - - if (mFluids[index] == null || mFluids[index].getFluid().getID() <= 0) { + if (aFluid == null || aFluid.getFluid() + .getID() + <= 0) + return 0; + + if (mFluids[index] == null || mFluids[index].getFluid() + .getID() + <= 0) { if (aFluid.amount * mPipeAmount <= getCapacity()) { if (doFill) { mFluids[index] = aFluid.copy(); @@ -811,8 +842,13 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { if ((tConn & (1 << ForgeDirection.WEST.ordinal())) != 0) tSide4 = 0f; if ((tConn & (1 << ForgeDirection.EAST.ordinal())) != 0) tSide5 = 1f; - return AxisAlignedBB - .getBoundingBox(aX + tSide4, aY + tSide0, aZ + tSide2, aX + tSide5, aY + tSide1, aZ + tSide3); + return AxisAlignedBB.getBoundingBox( + aX + tSide4, + aY + tSide0, + aZ + tSide2, + aX + tSide5, + aY + tSide1, + aZ + tSide3); } @Override diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java index e449921d1d..302155a186 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Frame.java @@ -19,8 +19,9 @@ import gregtech.api.util.GT_OreDictUnificator; public class GT_MetaPipeEntity_Frame extends MetaPipeEntity { - private static final String localizedDescFormat = GT_LanguageManager - .addStringLocalization("gt.blockmachines.gt_frame.desc.format", "Just something you can put covers on."); + private static final String localizedDescFormat = GT_LanguageManager.addStringLocalization( + "gt.blockmachines.gt_frame.desc.format", + "Just something you can put covers on."); public final Materials mMaterial; public GT_MetaPipeEntity_Frame(int aID, String aName, String aNameRegional, Materials aMaterial) { diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java index 5d2211528b..9e55aa94c7 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java @@ -228,10 +228,9 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE for (boolean temp = true; temp && !isInventoryEmpty() && pipeCapacityCheck();) { temp = false; tPipeList.clear(); - for (IMetaTileEntityItemPipe tTileEntity : GT_Utility - .sortMapByValuesAcending( - IMetaTileEntityItemPipe.Util.scanPipes(this, new HashMap<>(), 0, false, false)) - .keySet()) { + for (IMetaTileEntityItemPipe tTileEntity : GT_Utility.sortMapByValuesAcending( + IMetaTileEntityItemPipe.Util.scanPipes(this, new HashMap<>(), 0, false, false)) + .keySet()) { if (temp) break; tPipeList.add(tTileEntity); while (!temp && !isInventoryEmpty() && tTileEntity.sendItemStack(aBaseMetaTileEntity)) @@ -308,7 +307,9 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE : null; if (gTileEntity != null) { if (gTileEntity.getMetaTileEntity() == null) return false; - if (gTileEntity.getMetaTileEntity().connectsToItemPipe(tSide)) return true; + if (gTileEntity.getMetaTileEntity() + .connectsToItemPipe(tSide)) + return true; connectable = true; } @@ -355,7 +356,8 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE @Override public boolean insertItemStackIntoTileEntity(Object aSender, byte aSide) { - if (getBaseMetaTileEntity().getCoverInfoAtSide(aSide).letsItemsOut(-1)) { + if (getBaseMetaTileEntity().getCoverInfoAtSide(aSide) + .letsItemsOut(-1)) { final TileEntity tInventory = getBaseMetaTileEntity().getTileEntityAtSide(aSide); if (tInventory != null && !(tInventory instanceof BaseMetaPipeEntity)) { if ((!(tInventory instanceof TileEntityHopper) && !(tInventory instanceof TileEntityDispenser)) @@ -510,8 +512,13 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE if ((tConn & (1 << ForgeDirection.WEST.ordinal())) != 0) tSide4 = 0f; if ((tConn & (1 << ForgeDirection.EAST.ordinal())) != 0) tSide5 = 1f; - return AxisAlignedBB - .getBoundingBox(aX + tSide4, aY + tSide0, aZ + tSide2, aX + tSide5, aY + tSide1, aZ + tSide3); + return AxisAlignedBB.getBoundingBox( + aX + tSide4, + aY + tSide0, + aZ + tSide2, + aX + tSide5, + aY + tSide1, + aZ + tSide3); } @Override diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java index 7eb396a293..7b2a4fa232 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java @@ -237,7 +237,8 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier @Override public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - if (GT_ModHandler.isElectricItem(aStack) && aStack.getUnlocalizedName().startsWith("gt.metaitem.01.")) { + if (GT_ModHandler.isElectricItem(aStack) && aStack.getUnlocalizedName() + .startsWith("gt.metaitem.01.")) { String name = aStack.getUnlocalizedName(); if (name.equals("gt.metaitem.01.32510") || name.equals("gt.metaitem.01.32511") || name.equals("gt.metaitem.01.32520") @@ -383,47 +384,67 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier switch (mInventory.length) { case 4: builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 2).startFromSlot(0).endAtSlot(3) - .slotCreator(index -> new BaseSlot(inventoryHandler, index) { - - @Override - public int getSlotStackLimit() { - return 1; - } - }).background(getGUITextureSet().getItemSlot()).build().setPos(70, 25)); + SlotGroup.ofItemHandler(inventoryHandler, 2) + .startFromSlot(0) + .endAtSlot(3) + .slotCreator(index -> new BaseSlot(inventoryHandler, index) { + + @Override + public int getSlotStackLimit() { + return 1; + } + }) + .background(getGUITextureSet().getItemSlot()) + .build() + .setPos(70, 25)); break; case 9: builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(0).endAtSlot(8) - .slotCreator(index -> new BaseSlot(inventoryHandler, index) { - - @Override - public int getSlotStackLimit() { - return 1; - } - }).background(getGUITextureSet().getItemSlot()).build().setPos(61, 16)); + SlotGroup.ofItemHandler(inventoryHandler, 3) + .startFromSlot(0) + .endAtSlot(8) + .slotCreator(index -> new BaseSlot(inventoryHandler, index) { + + @Override + public int getSlotStackLimit() { + return 1; + } + }) + .background(getGUITextureSet().getItemSlot()) + .build() + .setPos(61, 16)); break; case 16: builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 4).startFromSlot(0).endAtSlot(15) - .slotCreator(index -> new BaseSlot(inventoryHandler, index) { - - @Override - public int getSlotStackLimit() { - return 1; - } - }).background(getGUITextureSet().getItemSlot()).build().setPos(52, 7)); + SlotGroup.ofItemHandler(inventoryHandler, 4) + .startFromSlot(0) + .endAtSlot(15) + .slotCreator(index -> new BaseSlot(inventoryHandler, index) { + + @Override + public int getSlotStackLimit() { + return 1; + } + }) + .background(getGUITextureSet().getItemSlot()) + .build() + .setPos(52, 7)); break; default: builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 1).startFromSlot(0).endAtSlot(0) - .slotCreator(index -> new BaseSlot(inventoryHandler, index) { - - @Override - public int getSlotStackLimit() { - return 1; - } - }).background(getGUITextureSet().getItemSlot()).build().setPos(79, 34)); + SlotGroup.ofItemHandler(inventoryHandler, 1) + .startFromSlot(0) + .endAtSlot(0) + .slotCreator(index -> new BaseSlot(inventoryHandler, index) { + + @Override + public int getSlotStackLimit() { + return 1; + } + }) + .background(getGUITextureSet().getItemSlot()) + .build() + .setPos(79, 34)); break; } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java index 669b3c9495..a71b94b916 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java @@ -278,8 +278,10 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity // solid... !(stack.getItem() instanceof IFluidHandler) && // when the item is a fluid handler its not a // solid... - !stack.getItem().getUnlocalizedName().contains("bucket"); // since we cant really check for - // buckets... + !stack.getItem() + .getUnlocalizedName() + .contains("bucket"); // since we cant really check for + // buckets... } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java index 7ff173615a..78fc68ee81 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java @@ -503,8 +503,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B public void initDefaultModes(NBTTagCompound aNBT) { mMainFacing = -1; if (!getBaseMetaTileEntity().getWorld().isRemote) { - GT_ClientPreference tPreference = GT_Mod.gregtechproxy - .getClientPreference(getBaseMetaTileEntity().getOwnerUuid()); + GT_ClientPreference tPreference = GT_Mod.gregtechproxy.getClientPreference( + getBaseMetaTileEntity().getOwnerUuid()); if (tPreference != null) { mDisableFilter = !tPreference.isSingleBlockInitialFilterEnabled(); mDisableMultiStack = !tPreference.isSingleBlockInitialMultiStackEnabled(); @@ -569,8 +569,9 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B if (mProgresstime < 0 || drainEnergyForProcess(mEUt)) { if (++mProgresstime >= mMaxProgresstime) { for (int i = 0; i < mOutputItems.length; i++) - for (int j = 0; j < mOutputItems.length; j++) if (aBaseMetaTileEntity - .addStackToSlot(getOutputSlot() + ((j + i) % mOutputItems.length), mOutputItems[i])) + for (int j = 0; j < mOutputItems.length; j++) if (aBaseMetaTileEntity.addStackToSlot( + getOutputSlot() + ((j + i) % mOutputItems.length), + mOutputItems[i])) break; if (mOutputFluid != null) if (getDrainableStack() == null) setDrainableStack(mOutputFluid.copy()); @@ -731,8 +732,10 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B if (ItemList.Display_Fluid.isStackEqual(mInventory[tDisplayStackSlot], true, true)) mInventory[tDisplayStackSlot] = null; } else { - mInventory[tDisplayStackSlot] = GT_Utility - .getFluidDisplayStack(getFillableStack(), true, !displaysStackSize()); + mInventory[tDisplayStackSlot] = GT_Utility.getFluidDisplayStack( + getFillableStack(), + true, + !displaysStackSize()); } } } @@ -1058,11 +1061,26 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B public static boolean isValidForLowGravity(GT_Recipe tRecipe, int dimId) { return // TODO check or get a better solution - DimensionManager.getProvider(dimId).getClass().getName().contains("Orbit") - || DimensionManager.getProvider(dimId).getClass().getName().endsWith("Space") - || DimensionManager.getProvider(dimId).getClass().getName().endsWith("Asteroids") - || DimensionManager.getProvider(dimId).getClass().getName().endsWith("SS") - || DimensionManager.getProvider(dimId).getClass().getName().contains("SpaceStation"); + DimensionManager.getProvider(dimId) + .getClass() + .getName() + .contains("Orbit") + || DimensionManager.getProvider(dimId) + .getClass() + .getName() + .endsWith("Space") + || DimensionManager.getProvider(dimId) + .getClass() + .getName() + .endsWith("Asteroids") + || DimensionManager.getProvider(dimId) + .getClass() + .getName() + .endsWith("SS") + || DimensionManager.getProvider(dimId) + .getClass() + .getName() + .contains("SpaceStation"); } /** @@ -1213,12 +1231,14 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B currenttip.add( String.format( "Machine Facing: %s", - ForgeDirection.getOrientation(tag.getInteger("mainFacingSingleBlock")).name())); + ForgeDirection.getOrientation(tag.getInteger("mainFacingSingleBlock")) + .name())); currenttip.add( String.format( "Output Facing: %s", - ForgeDirection.getOrientation(tag.getInteger("outputFacingSingleBlock")).name())); + ForgeDirection.getOrientation(tag.getInteger("outputFacingSingleBlock")) + .name())); } @Override @@ -1267,8 +1287,9 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B getRecipeList().addGregTechLogoUI(builder, new Pos2d(0, 0)); } else { builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17) - .setPos(152, 63)); + new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()) + .setSize(17, 17) + .setPos(152, 63)); } } @@ -1331,7 +1352,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B */ protected SlotWidget createItemInputSlot(int index, IDrawable[] backgrounds, Pos2d pos) { return (SlotWidget) new SlotWidget(inventoryHandler, getInputSlot() + index).setAccess(true, true) - .setBackground(backgrounds).setPos(pos); + .setBackground(backgrounds) + .setPos(pos); } /** @@ -1339,7 +1361,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B */ protected SlotWidget createItemOutputSlot(int index, IDrawable[] backgrounds, Pos2d pos) { return (SlotWidget) new SlotWidget(inventoryHandler, getOutputSlot() + index).setAccess(true, false) - .setBackground(backgrounds).setPos(pos); + .setBackground(backgrounds) + .setPos(pos); } /** @@ -1347,46 +1370,71 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B */ protected SlotWidget createSpecialSlot(IDrawable[] backgrounds, Pos2d pos) { return (SlotWidget) new SlotWidget(inventoryHandler, getSpecialSlotIndex()).setAccess(true, true) - .disableShiftInsert() - .setGTTooltip( - () -> mTooltipCache.getData( - getRecipeList() != null && getRecipeList().usesSpecialSlot() ? SPECIAL_SLOT_TOOLTIP - : UNUSED_SLOT_TOOLTIP)) - .setTooltipShowUpDelay(TOOLTIP_DELAY).setBackground(backgrounds).setPos(pos); + .disableShiftInsert() + .setGTTooltip( + () -> mTooltipCache.getData( + getRecipeList() + != null + && getRecipeList().usesSpecialSlot() + ? SPECIAL_SLOT_TOOLTIP + : UNUSED_SLOT_TOOLTIP)) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setBackground(backgrounds) + .setPos(pos); } protected FluidDisplaySlotWidget createFluidInputSlot(IDrawable[] backgrounds, Pos2d pos) { return (FluidDisplaySlotWidget) new FluidDisplaySlotWidget( inventoryHandler, OTHER_SLOT_COUNT + mInputSlotCount + mOutputItems.length) - .setFluidAccessConstructor(() -> constructFluidAccess(true)).setIHasFluidDisplay(this) - .setCanDrain(true).setCanFill(true).setActionRealClick(FluidDisplaySlotWidget.Action.TRANSFER) - .setBeforeRealClick((clickData, widget) -> { - if (NetworkUtils.isClient()) { - // propagate display item content to actual fluid stored in this tank - setFillableStack(GT_Utility.getFluidFromDisplayStack(widget.getMcSlot().getStack())); - } - return true; - }).setUpdateFluidDisplayItem(this::updateFluidInputDisplayItem) - .setGTTooltip( - () -> mTooltipCache - .getData(FLUID_INPUT_TOOLTIP, GT_Utility.formatNumbers(getCapacity()))) - .setTooltipShowUpDelay(TOOLTIP_DELAY).setBackground(backgrounds).setPos(pos); + .setFluidAccessConstructor( + () -> constructFluidAccess(true)) + .setIHasFluidDisplay(this) + .setCanDrain(true) + .setCanFill(true) + .setActionRealClick( + FluidDisplaySlotWidget.Action.TRANSFER) + .setBeforeRealClick((clickData, widget) -> { + if (NetworkUtils.isClient()) { + // propagate display item content to + // actual fluid stored in this tank + setFillableStack( + GT_Utility.getFluidFromDisplayStack( + widget.getMcSlot() + .getStack())); + } + return true; + }) + .setUpdateFluidDisplayItem( + this::updateFluidInputDisplayItem) + .setGTTooltip( + () -> mTooltipCache.getData( + FLUID_INPUT_TOOLTIP, + GT_Utility.formatNumbers( + getCapacity()))) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setBackground(backgrounds) + .setPos(pos); } protected FluidDisplaySlotWidget createFluidOutputSlot(IDrawable[] backgrounds, Pos2d pos) { - return (FluidDisplaySlotWidget) createDrainableFluidSlot() - .setUpdateFluidDisplayItem(this::updateFluidOutputDisplayItem) - .setGTTooltip( - () -> mTooltipCache.getData(FLUID_OUTPUT_TOOLTIP, GT_Utility.formatNumbers(getCapacity()))) - .setTooltipShowUpDelay(TOOLTIP_DELAY).setBackground(backgrounds).setPos(pos); + return (FluidDisplaySlotWidget) createDrainableFluidSlot().setUpdateFluidDisplayItem( + this::updateFluidOutputDisplayItem) + .setGTTooltip( + () -> mTooltipCache.getData( + FLUID_OUTPUT_TOOLTIP, + GT_Utility.formatNumbers( + getCapacity()))) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setBackground(backgrounds) + .setPos(pos); } @Override protected SlotWidget createChargerSlot(int x, int y) { if (isSteampowered()) { - return (SlotWidget) createChargerSlot(x, y, UNUSED_SLOT_TOOLTIP, new String[0]) - .setBackground(getGUITextureSet().getItemSlot()); + return (SlotWidget) createChargerSlot(x, y, UNUSED_SLOT_TOOLTIP, new String[0]).setBackground( + getGUITextureSet().getItemSlot()); } else { return super.createChargerSlot(x, y); } @@ -1394,25 +1442,36 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B protected CycleButtonWidget createItemAutoOutputButton() { return (CycleButtonWidget) new CycleButtonWidget().setToggle(() -> mItemTransfer, val -> mItemTransfer = val) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM) - .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setGTTooltip(() -> mTooltipCache.getData(ITEM_TRANSFER_TOOLTIP)).setTooltipShowUpDelay(TOOLTIP_DELAY) - .setPos(25, 62).setSize(18, 18); + .setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_ITEM) + .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) + .setGTTooltip( + () -> mTooltipCache.getData(ITEM_TRANSFER_TOOLTIP)) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setPos(25, 62) + .setSize(18, 18); } protected CycleButtonWidget createFluidAutoOutputButton() { return (CycleButtonWidget) new CycleButtonWidget().setToggle(() -> mFluidTransfer, val -> mFluidTransfer = val) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID) - .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setGTTooltip(() -> mTooltipCache.getData(FLUID_TRANSFER_TOOLTIP)).setTooltipShowUpDelay(TOOLTIP_DELAY) - .setPos(7, 62).setSize(18, 18); + .setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID) + .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) + .setGTTooltip( + () -> mTooltipCache.getData(FLUID_TRANSFER_TOOLTIP)) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setPos(7, 62) + .setSize(18, 18); } protected ProgressBar createProgressBar(UITexture texture, int imageSize, ProgressBar.Direction direction, Pos2d pos, Size size) { final ProgressBar ret = new ProgressBar(); ret.setProgress(() -> maxProgresstime() != 0 ? (float) getProgresstime() / maxProgresstime() : 0) - .setTexture(texture, imageSize).setDirection(direction).setPos(pos).setSize(size); + .setTexture(texture, imageSize) + .setDirection(direction) + .setPos(pos) + .setSize(size); return ret; } @@ -1425,11 +1484,13 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B final Power powerInfo = getPower(); final String transferRectTooltip; if (isSteampowered()) { - transferRectTooltip = StatCollector - .translateToLocalFormatted(NEI_TRANSFER_STEAM_TOOLTIP, powerInfo.getTierString()); + transferRectTooltip = StatCollector.translateToLocalFormatted( + NEI_TRANSFER_STEAM_TOOLTIP, + powerInfo.getTierString()); } else { - transferRectTooltip = StatCollector - .translateToLocalFormatted(NEI_TRANSFER_VOLTAGE_TOOLTIP, powerInfo.getTierString()); + transferRectTooltip = StatCollector.translateToLocalFormatted( + NEI_TRANSFER_VOLTAGE_TOOLTIP, + powerInfo.getTierString()); } widget.setNEITransferRect(transferRectID, new Object[] { powerInfo }, transferRectTooltip); } @@ -1440,34 +1501,53 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B if (isSteampowered()) { for (Pair<SteamTexture, Pair<Size, Pos2d>> specialTexture : getRecipeList().specialTexturesSteam) { builder.widget( - new DrawableWidget().setDrawable(specialTexture.getLeft().get(getSteamVariant())) - .setSize(specialTexture.getRight().getLeft()) - .setPos(specialTexture.getRight().getRight())); + new DrawableWidget().setDrawable( + specialTexture.getLeft() + .get(getSteamVariant())) + .setSize( + specialTexture.getRight() + .getLeft()) + .setPos( + specialTexture.getRight() + .getRight())); } } else { for (Pair<IDrawable, Pair<Size, Pos2d>> specialTexture : getRecipeList().specialTextures) { builder.widget( new DrawableWidget().setDrawable(specialTexture.getLeft()) - .setSize(specialTexture.getRight().getLeft()) - .setPos(specialTexture.getRight().getRight())); + .setSize( + specialTexture.getRight() + .getLeft()) + .setPos( + specialTexture.getRight() + .getRight())); } } } protected DrawableWidget createErrorStatusArea(ModularWindow.Builder builder, IDrawable picture) { - return (DrawableWidget) new DrawableWidget().setDrawable(picture).setTooltipShowUpDelay(TOOLTIP_DELAY) - .setEnabled(widget -> !widget.getTooltip().isEmpty()).dynamicTooltip(this::getErrorDescriptions) - .dynamicTooltipShift(this::getErrorDescriptionsShift).setPos(79, 44).setSize(18, 18) - .attachSyncer( - new FakeSyncWidget.BooleanSyncer(() -> mStuttering, val -> mStuttering = val), - builder, - (widget, val) -> widget.notifyTooltipChange()) - .attachSyncer( - new FakeSyncWidget.IntegerSyncer( - () -> getBaseMetaTileEntity().getErrorDisplayID(), - val -> getBaseMetaTileEntity().setErrorDisplayID(val)), - builder, - (widget, val) -> widget.notifyTooltipChange()); + return (DrawableWidget) new DrawableWidget().setDrawable(picture) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setEnabled( + widget -> !widget.getTooltip() + .isEmpty()) + .dynamicTooltip(this::getErrorDescriptions) + .dynamicTooltipShift(this::getErrorDescriptionsShift) + .setPos(79, 44) + .setSize(18, 18) + .attachSyncer( + new FakeSyncWidget.BooleanSyncer( + () -> mStuttering, + val -> mStuttering = val), + builder, + (widget, val) -> widget.notifyTooltipChange()) + .attachSyncer( + new FakeSyncWidget.IntegerSyncer( + () -> getBaseMetaTileEntity().getErrorDisplayID(), + val -> getBaseMetaTileEntity().setErrorDisplayID( + val)), + builder, + (widget, val) -> widget.notifyTooltipChange()); } protected List<String> getErrorDescriptions() { diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java index 4098831e48..934554dfbc 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java @@ -174,18 +174,30 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE mNeedsSteamVenting = false; try { for (EntityLivingBase tLiving : (ArrayList<EntityLivingBase>) getBaseMetaTileEntity().getWorld() - .getEntitiesWithinAABB( - EntityLivingBase.class, - AxisAlignedBB.getBoundingBox( - getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 1), - getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 1), - getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 1), - getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 1) - + 1, - getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 1) - + 1, - getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 1) - + 1))) { + .getEntitiesWithinAABB( + EntityLivingBase.class, + AxisAlignedBB.getBoundingBox( + getBaseMetaTileEntity().getOffsetX( + getBaseMetaTileEntity().getFrontFacing(), + 1), + getBaseMetaTileEntity().getOffsetY( + getBaseMetaTileEntity().getFrontFacing(), + 1), + getBaseMetaTileEntity().getOffsetZ( + getBaseMetaTileEntity().getFrontFacing(), + 1), + getBaseMetaTileEntity().getOffsetX( + getBaseMetaTileEntity().getFrontFacing(), + 1) + + 1, + getBaseMetaTileEntity().getOffsetY( + getBaseMetaTileEntity().getFrontFacing(), + 1) + + 1, + getBaseMetaTileEntity().getOffsetZ( + getBaseMetaTileEntity().getFrontFacing(), + 1) + + 1))) { GT_Utility.applyHeatDamage(tLiving, getSteamDamage()); } } catch (Throwable e) { @@ -230,17 +242,22 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE if (aIndex == 9) { GT_Utility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 5, 1.0F, aX, aY, aZ); - new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD).setWorld(getBaseMetaTileEntity().getWorld()) - .setMotion( - ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()).offsetX / 5.0, - ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()).offsetY / 5.0, - ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()).offsetZ / 5.0) - .<ParticleEventBuilder>times( - 8, - x -> x.setPosition( - aX - 0.5 + XSTR_INSTANCE.nextFloat(), - aY - 0.5 + XSTR_INSTANCE.nextFloat(), - aZ - 0.5 + XSTR_INSTANCE.nextFloat()).run()); + new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD) + .setWorld(getBaseMetaTileEntity().getWorld()) + .setMotion( + ForgeDirection.getOrientation( + getBaseMetaTileEntity().getFrontFacing()).offsetX / 5.0, + ForgeDirection.getOrientation( + getBaseMetaTileEntity().getFrontFacing()).offsetY / 5.0, + ForgeDirection.getOrientation( + getBaseMetaTileEntity().getFrontFacing()).offsetZ / 5.0) + .<ParticleEventBuilder>times( + 8, + x -> x.setPosition( + aX - 0.5 + XSTR_INSTANCE.nextFloat(), + aY - 0.5 + XSTR_INSTANCE.nextFloat(), + aZ - 0.5 + XSTR_INSTANCE.nextFloat()) + .run()); } } @@ -251,7 +268,8 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE @Override public boolean allowCoverOnSide(byte aSide, GT_ItemStack aCoverID) { - return GregTech_API.getCoverBehaviorNew(aCoverID.toStack()).isSimpleCover() + return GregTech_API.getCoverBehaviorNew(aCoverID.toStack()) + .isSimpleCover() && super.allowCoverOnSide(aSide, aCoverID); } @@ -370,7 +388,9 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17).setPos(152, 63)); + new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()) + .setSize(17, 17) + .setPos(152, 63)); } @Override diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java index e51da3bbdc..5331f67dca 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java @@ -81,84 +81,92 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + "/OVERLAY_SIDE_ACTIVE")), TextureFactory.builder() - .addIcon( - (new CustomIcon( - "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) - + "/OVERLAY_SIDE_ACTIVE_GLOW"))) - .glow().build()), + .addIcon( + (new CustomIcon( + "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + + "/OVERLAY_SIDE_ACTIVE_GLOW"))) + .glow() + .build()), TextureFactory.of( TextureFactory.of( new CustomIcon( "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + "/OVERLAY_SIDE")), TextureFactory.builder() - .addIcon( - (new CustomIcon( - "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) - + "/OVERLAY_SIDE_GLOW"))) - .glow().build()), + .addIcon( + (new CustomIcon( + "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + + "/OVERLAY_SIDE_GLOW"))) + .glow() + .build()), TextureFactory.of( TextureFactory.of( new CustomIcon( "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + "/OVERLAY_FRONT_ACTIVE")), TextureFactory.builder() - .addIcon( - (new CustomIcon( - "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) - + "/OVERLAY_FRONT_ACTIVE_GLOW"))) - .glow().build()), + .addIcon( + (new CustomIcon( + "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + + "/OVERLAY_FRONT_ACTIVE_GLOW"))) + .glow() + .build()), TextureFactory.of( TextureFactory.of( new CustomIcon( "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + "/OVERLAY_FRONT")), TextureFactory.builder() - .addIcon( - (new CustomIcon( - "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) - + "/OVERLAY_FRONT_GLOW"))) - .glow().build()), + .addIcon( + (new CustomIcon( + "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + + "/OVERLAY_FRONT_GLOW"))) + .glow() + .build()), TextureFactory.of( TextureFactory.of( new CustomIcon( "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + "/OVERLAY_TOP_ACTIVE")), TextureFactory.builder() - .addIcon( - (new CustomIcon( - "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) - + "/OVERLAY_TOP_ACTIVE_GLOW"))) - .glow().build()), + .addIcon( + (new CustomIcon( + "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + + "/OVERLAY_TOP_ACTIVE_GLOW"))) + .glow() + .build()), TextureFactory.of( TextureFactory.of( new CustomIcon( "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + "/OVERLAY_TOP")), TextureFactory.builder() - .addIcon( - (new CustomIcon( - "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) - + "/OVERLAY_TOP_GLOW"))) - .glow().build()), + .addIcon( + (new CustomIcon( + "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + + "/OVERLAY_TOP_GLOW"))) + .glow() + .build()), TextureFactory.of( TextureFactory.of( new CustomIcon( "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + "/OVERLAY_BOTTOM_ACTIVE")), TextureFactory.builder() - .addIcon( - (new CustomIcon( - "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) - + "/OVERLAY_BOTTOM_ACTIVE_GLOW"))) - .glow().build()), + .addIcon( + (new CustomIcon( + "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + + "/OVERLAY_BOTTOM_ACTIVE_GLOW"))) + .glow() + .build()), TextureFactory.of( TextureFactory.of( new CustomIcon( "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + "/OVERLAY_BOTTOM")), TextureFactory.builder() - .addIcon( - (new CustomIcon( - "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) - + "/OVERLAY_BOTTOM_GLOW"))) - .glow().build())); + .addIcon( + (new CustomIcon( + "basicmachines/" + aOverlays.toLowerCase(Locale.ENGLISH) + + "/OVERLAY_BOTTOM_GLOW"))) + .glow() + .build())); this.mSharedTank = aSharedTank; this.mTankCapacity = aTankCapacity; this.mSpecialEffect = aSpecialEffect; @@ -1058,23 +1066,11 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ case 0: return false; case 1: - if (this.getFillableStack() == null) - return !this.mRequiresFluidForFiltering && this.getRecipeList().containsInput(aStack); - else return this.getRecipeList().findRecipe( - this.getBaseMetaTileEntity(), - this.mLastRecipe, - true, - true, - V[this.mTier], - new FluidStack[] { this.getFillableStack() }, - this.getSpecialSlot(), - appendSelectedCircuit(aStack)) != null; - case 2: - return (!this.mRequiresFluidForFiltering || this.getFillableStack() != null) && (((this.getInputAt(0) - != null && this.getInputAt(1) != null) - || (this.getInputAt(0) == null && this.getInputAt(1) == null - ? this.getRecipeList().containsInput(aStack) - : (this.getRecipeList().containsInput(aStack) && this.getRecipeList().findRecipe( + if (this.getFillableStack() == null) return !this.mRequiresFluidForFiltering && this.getRecipeList() + .containsInput( + aStack); + else return this.getRecipeList() + .findRecipe( this.getBaseMetaTileEntity(), this.mLastRecipe, true, @@ -1082,12 +1078,31 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ V[this.mTier], new FluidStack[] { this.getFillableStack() }, this.getSpecialSlot(), - aIndex == this.getInputSlot() - ? appendSelectedCircuit(aStack, this.getInputAt(1)) - : appendSelectedCircuit(this.getInputAt(0), aStack)) - != null)))); + appendSelectedCircuit(aStack)) + != null; + case 2: + return (!this.mRequiresFluidForFiltering || this.getFillableStack() != null) && (((this.getInputAt(0) + != null && this.getInputAt(1) != null) + || (this.getInputAt(0) == null && this.getInputAt(1) == null ? this.getRecipeList() + .containsInput(aStack) + : (this.getRecipeList() + .containsInput(aStack) + && this.getRecipeList() + .findRecipe( + this.getBaseMetaTileEntity(), + this.mLastRecipe, + true, + true, + V[this.mTier], + new FluidStack[] { this.getFillableStack() }, + this.getSpecialSlot(), + aIndex == this.getInputSlot() + ? appendSelectedCircuit(aStack, this.getInputAt(1)) + : appendSelectedCircuit(this.getInputAt(0), aStack)) + != null)))); default: { - int tID = this.getBaseMetaTileEntity().getMetaTileID(); + int tID = this.getBaseMetaTileEntity() + .getMetaTileID(); if (tID >= 211 && tID <= 218 || tID >= 1180 && tID <= 1187 || tID >= 10780 && tID <= 10786) { // assembler // lv-iv; // circuit @@ -1097,10 +1112,13 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ // assemblers // luv-uev if (GT_Utility.isStackValid(aStack)) for (int oreID : OreDictionary.getOreIDs(aStack)) { - if (OreDictionary.getOreName(oreID).startsWith("circuit")) return true; + if (OreDictionary.getOreName(oreID) + .startsWith("circuit")) + return true; } } - return this.getRecipeList().containsInput(aStack); + return this.getRecipeList() + .containsInput(aStack); } } } @@ -1124,12 +1142,22 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ && !aBaseMetaTileEntity.getOpacityAtSide(topFacing)) { new WorldSpawnedEventBuilder.ParticleEventBuilder().setMotion(0.0D, 0.0D, 0.0D) - .setIdentifier(ParticleFX.SMOKE) - .setPosition( - aBaseMetaTileEntity.getXCoord() + 0.8F - XSTR_INSTANCE.nextFloat() * 0.6F, - aBaseMetaTileEntity.getYCoord() + 0.9F + XSTR_INSTANCE.nextFloat() * 0.2F, - aBaseMetaTileEntity.getZCoord() + 0.8F - XSTR_INSTANCE.nextFloat() * 0.6F) - .setWorld(aBaseMetaTileEntity.getWorld()).run(); + .setIdentifier(ParticleFX.SMOKE) + .setPosition( + aBaseMetaTileEntity.getXCoord() + + 0.8F + - XSTR_INSTANCE.nextFloat() + * 0.6F, + aBaseMetaTileEntity.getYCoord() + + 0.9F + + XSTR_INSTANCE.nextFloat() + * 0.2F, + aBaseMetaTileEntity.getZCoord() + + 0.8F + - XSTR_INSTANCE.nextFloat() + * 0.6F) + .setWorld(aBaseMetaTileEntity.getWorld()) + .run(); } break; default: @@ -1192,8 +1220,11 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ } ParticleEventBuilder particleEventBuilder = (new ParticleEventBuilder()).setMotion(mX, 0, mZ) - .setPosition(x, y, z).setWorld(getBaseMetaTileEntity().getWorld()); - particleEventBuilder.setIdentifier(ParticleFX.LAVA).run(); + .setPosition(x, y, z) + .setWorld( + getBaseMetaTileEntity().getWorld()); + particleEventBuilder.setIdentifier(ParticleFX.LAVA) + .run(); } } break; @@ -1253,8 +1284,9 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ @Override protected ProgressBar createProgressBar(UITexture texture, int imageSize, ProgressBar.Direction direction, Pos2d pos, Size size) { - return super.createProgressBar(texture, imageSize, direction, pos, size) - .setTexture(progressBarTexture.get(), mRecipes.getProgressBarImageSize()); + return super.createProgressBar(texture, imageSize, direction, pos, size).setTexture( + progressBarTexture.get(), + mRecipes.getProgressBarImageSize()); } public enum X { diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java index 1286c84c9b..193d654af6 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicTank.java @@ -208,8 +208,11 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier } if (doesFillContainers()) { - ItemStack tOutput = GT_Utility - .fillFluidContainer(getDrainableStack(), mInventory[getInputSlot()], false, true); + ItemStack tOutput = GT_Utility.fillFluidContainer( + getDrainableStack(), + mInventory[getInputSlot()], + false, + true); if (tOutput != null && aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tOutput, 1)) { FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true); aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1); @@ -227,8 +230,10 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier if (ItemList.Display_Fluid.isStackEqual(mInventory[getStackDisplaySlot()], true, true)) mInventory[getStackDisplaySlot()] = null; } else { - mInventory[getStackDisplaySlot()] = GT_Utility - .getFluidDisplayStack(getDisplayedFluid(), true, !displaysStackSize()); + mInventory[getStackDisplaySlot()] = GT_Utility.getFluidDisplayStack( + getDisplayedFluid(), + true, + !displaysStackSize()); } } } @@ -245,13 +250,14 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier @Override public int fill(FluidStack aFluid, boolean doFill) { - if (aFluid == null || aFluid.getFluid().getID() <= 0 - || aFluid.amount <= 0 - || !canTankBeFilled() - || !isFluidInputAllowed(aFluid)) + if (aFluid == null || aFluid.getFluid() + .getID() + <= 0 || aFluid.amount <= 0 || !canTankBeFilled() || !isFluidInputAllowed(aFluid)) return 0; - if (getFillableStack() == null || getFillableStack().getFluid().getID() <= 0) { + if (getFillableStack() == null || getFillableStack().getFluid() + .getID() + <= 0) { if (aFluid.amount <= getCapacity()) { if (doFill) { setFillableStack(aFluid.copy()); @@ -337,34 +343,56 @@ public abstract class GT_MetaTileEntity_BasicTank extends GT_MetaTileEntity_Tier @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(7, 16).setSize(71, 45)) - .widget(new DrawableWidget().setDrawable(GT_UITextures.PICTURE_GAUGE).setPos(79, 34).setSize(18, 18)) - .widget( - new SlotWidget(inventoryHandler, getInputSlot()) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN) - .setPos(79, 16)) - .widget( - new SlotWidget(inventoryHandler, getOutputSlot()) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT) - .setPos(79, 52)) - .widget(createDrainableFluidSlot().setBackground(GT_UITextures.TRANSPARENT).setPos(58, 41)) - .widget(new TextWidget("Liquid Amount").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 20)).widget( - TextWidget - .dynamicString(() -> GT_Utility.parseNumberToString(mFluid != null ? mFluid.amount : 0)) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 30)); + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + .setPos(7, 16) + .setSize(71, 45)) + .widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_GAUGE) + .setPos(79, 34) + .setSize(18, 18)) + .widget( + new SlotWidget(inventoryHandler, getInputSlot()) + .setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_IN) + .setPos(79, 16)) + .widget( + new SlotWidget(inventoryHandler, getOutputSlot()) + .setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_OUT) + .setPos(79, 52)) + .widget( + createDrainableFluidSlot().setBackground(GT_UITextures.TRANSPARENT) + .setPos(58, 41)) + .widget( + new TextWidget("Liquid Amount").setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(10, 20)) + .widget( + TextWidget.dynamicString( + () -> GT_Utility.parseNumberToString(mFluid != null ? mFluid.amount : 0)) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(10, 30)); } protected FluidDisplaySlotWidget createDrainableFluidSlot() { - return new FluidDisplaySlotWidget(inventoryHandler, getStackDisplaySlot()) - .setFluidAccessConstructor(() -> constructFluidAccess(false)).setIHasFluidDisplay(this) - .setCanDrain(true).setCanFill(!isDrainableStackSeparate()) - .setActionRealClick(FluidDisplaySlotWidget.Action.TRANSFER).setBeforeRealClick((clickData, widget) -> { - if (NetworkUtils.isClient()) { - // propagate display item content to actual fluid stored in this tank - setDrainableStack(GT_Utility.getFluidFromDisplayStack(widget.getMcSlot().getStack())); - } - return true; - }); + return new FluidDisplaySlotWidget( + inventoryHandler, + getStackDisplaySlot()).setFluidAccessConstructor(() -> constructFluidAccess(false)) + .setIHasFluidDisplay(this) + .setCanDrain(true) + .setCanFill(!isDrainableStackSeparate()) + .setActionRealClick(FluidDisplaySlotWidget.Action.TRANSFER) + .setBeforeRealClick((clickData, widget) -> { + if (NetworkUtils.isClient()) { + // propagate display item content to actual fluid stored in this tank + setDrainableStack( + GT_Utility.getFluidFromDisplayStack( + widget.getMcSlot() + .getStack())); + } + return true; + }); } protected IFluidAccess constructFluidAccess(boolean aIsFillableStack) { diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java index 827f2b2ec9..1138b0a51d 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java @@ -61,14 +61,30 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM ITexture[][][] rTextures = new ITexture[ForgeDirection.VALID_DIRECTIONS.length][17][]; ITexture tIcon = getOverlayIcon(); ITexture tOut = TextureFactory.of(OVERLAY_PIPE_OUT); - ITexture tUp = TextureFactory - .of(TextureFactory.of(ARROW_UP), TextureFactory.builder().addIcon(ARROW_UP_GLOW).glow().build()); - ITexture tDown = TextureFactory - .of(TextureFactory.of(ARROW_DOWN), TextureFactory.builder().addIcon(ARROW_DOWN_GLOW).glow().build()); - ITexture tLeft = TextureFactory - .of(TextureFactory.of(ARROW_LEFT), TextureFactory.builder().addIcon(ARROW_LEFT_GLOW).glow().build()); - ITexture tRight = TextureFactory - .of(TextureFactory.of(ARROW_RIGHT), TextureFactory.builder().addIcon(ARROW_RIGHT_GLOW).glow().build()); + ITexture tUp = TextureFactory.of( + TextureFactory.of(ARROW_UP), + TextureFactory.builder() + .addIcon(ARROW_UP_GLOW) + .glow() + .build()); + ITexture tDown = TextureFactory.of( + TextureFactory.of(ARROW_DOWN), + TextureFactory.builder() + .addIcon(ARROW_DOWN_GLOW) + .glow() + .build()); + ITexture tLeft = TextureFactory.of( + TextureFactory.of(ARROW_LEFT), + TextureFactory.builder() + .addIcon(ARROW_LEFT_GLOW) + .glow() + .build()); + ITexture tRight = TextureFactory.of( + TextureFactory.of(ARROW_RIGHT), + TextureFactory.builder() + .addIcon(ARROW_RIGHT_GLOW) + .glow() + .build()); for (int i = 0; i < rTextures[0].length; i++) { rTextures[OUTPUT_INDEX][i] = new ITexture[] { MACHINE_CASINGS[mTier][i], tOut }; rTextures[ARROW_RIGHT_INDEX][i] = new ITexture[] { MACHINE_CASINGS[mTier][i], tRight, tIcon }; @@ -401,7 +417,8 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM if (toSet == 0) continue; int slot = validSlots.get(slotindex); slotindex++; - mInventory[slot] = stacks.get(sID).copy(); + mInventory[slot] = stacks.get(sID) + .copy(); toSet = Math.min(toSet, mInventory[slot].getMaxStackSize()); mInventory[slot].stackSize = toSet; slots.merge(sID, toSet, (a, b) -> a - b); @@ -433,15 +450,21 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM bOutput = !bOutput; if (bOutput) { GT_Utility.sendChatToPlayer( - widget.getContext().getPlayer(), + widget.getContext() + .getPlayer(), GT_Utility.trans("116", "Emit Energy to Outputside")); } else { GT_Utility.sendChatToPlayer( - widget.getContext().getPlayer(), + widget.getContext() + .getPlayer(), GT_Utility.trans("117", "Don't emit Energy")); } - }).setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_EMIT_ENERGY).setPos(7, 62) - .setSize(18, 18)); + }) + .setBackground( + GT_UITextures.BUTTON_STANDARD, + GT_UITextures.OVERLAY_BUTTON_EMIT_ENERGY) + .setPos(7, 62) + .setSize(18, 18)); } protected void addEmitRedstoneButton(ModularWindow.Builder builder) { @@ -449,30 +472,43 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM bRedstoneIfFull = !bRedstoneIfFull; if (bRedstoneIfFull) { GT_Utility.sendChatToPlayer( - widget.getContext().getPlayer(), + widget.getContext() + .getPlayer(), GT_Utility.trans("118", "Emit Redstone if no Slot is free")); } else { GT_Utility.sendChatToPlayer( - widget.getContext().getPlayer(), + widget.getContext() + .getPlayer(), GT_Utility.trans("119", "Don't emit Redstone")); } - }).setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_EMIT_REDSTONE).setPos(25, 62) - .setSize(18, 18)); + }) + .setBackground( + GT_UITextures.BUTTON_STANDARD, + GT_UITextures.OVERLAY_BUTTON_EMIT_REDSTONE) + .setPos(25, 62) + .setSize(18, 18)); } protected void addInvertRedstoneButton(ModularWindow.Builder builder) { builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { bInvert = !bInvert; if (bInvert) { - GT_Utility - .sendChatToPlayer(widget.getContext().getPlayer(), GT_Utility.trans("120", "Invert Redstone")); + GT_Utility.sendChatToPlayer( + widget.getContext() + .getPlayer(), + GT_Utility.trans("120", "Invert Redstone")); } else { GT_Utility.sendChatToPlayer( - widget.getContext().getPlayer(), + widget.getContext() + .getPlayer(), GT_Utility.trans("121", "Don't invert Redstone")); } - }).setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_INVERT_REDSTONE).setPos(43, 62) - .setSize(18, 18)); + }) + .setBackground( + GT_UITextures.BUTTON_STANDARD, + GT_UITextures.OVERLAY_BUTTON_INVERT_REDSTONE) + .setPos(43, 62) + .setSize(18, 18)); } protected void addStockingModeButton(ModularWindow.Builder builder) { @@ -480,22 +516,32 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM bStockingMode = !bStockingMode; if (bStockingMode) { GT_Utility.sendChatToPlayer( - widget.getContext().getPlayer(), + widget.getContext() + .getPlayer(), GT_Utility.trans( "217", "Stocking mode. Keeps this many items in destination input slots. This mode can be server unfriendly.")); } else { GT_Utility.sendChatToPlayer( - widget.getContext().getPlayer(), + widget.getContext() + .getPlayer(), GT_Utility.trans( "218", "Transfer size mode. Add exactly this many items in destination input slots as long as there is room.")); } - }).setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_STOCKING_MODE).setPos(61, 62) - .setSize(18, 18)); + }) + .setBackground( + GT_UITextures.BUTTON_STANDARD, + GT_UITextures.OVERLAY_BUTTON_STOCKING_MODE) + .setPos(61, 62) + .setSize(18, 18)); } protected void addInventorySlots(ModularWindow.Builder builder) { - builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 9).endAtSlot(26).build().setPos(7, 4)); + builder.widget( + SlotGroup.ofItemHandler(inventoryHandler, 9) + .endAtSlot(26) + .build() + .setPos(7, 4)); } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java index 830706f8fe..d9c32911b7 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java @@ -44,23 +44,27 @@ public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTil @Override protected IStructureDefinition<GT_MetaTileEntity_CubicMultiBlockBase<?>> computeValue(Class<?> type) { return StructureDefinition.<GT_MetaTileEntity_CubicMultiBlockBase<?>>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { { "hhh", "hhh", "hhh" }, { "h~h", "h-h", "hhh" }, - { "hhh", "hhh", "hhh" }, })) - .addElement( - 'h', - ofChain( - lazy( - t -> GT_StructureUtility - .<GT_MetaTileEntity_CubicMultiBlockBase<?>>buildHatchAdder() - .atLeastList(t.getAllowedHatches()) - .casingIndex(t.getHatchTextureIndex()).dot(1).build()), - onElementPass( - GT_MetaTileEntity_CubicMultiBlockBase::onCorrectCasingAdded, - lazy(GT_MetaTileEntity_CubicMultiBlockBase::getCasingElement)))) - .build(); + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { { "hhh", "hhh", "hhh" }, { "h~h", "h-h", "hhh" }, + { "hhh", "hhh", "hhh" }, })) + .addElement( + 'h', + ofChain( + lazy( + t -> GT_StructureUtility.<GT_MetaTileEntity_CubicMultiBlockBase<?>>buildHatchAdder() + .atLeastList( + t.getAllowedHatches()) + .casingIndex( + t.getHatchTextureIndex()) + .dot(1) + .build()), + onElementPass( + GT_MetaTileEntity_CubicMultiBlockBase::onCorrectCasingAdded, + lazy( + GT_MetaTileEntity_CubicMultiBlockBase::getCasingElement)))) + .build(); } }; private int mCasingAmount = 0; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java index e5cf3d5cc4..bd6facceee 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java @@ -131,8 +131,14 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta @Override public void saveNBTData(NBTTagCompound aNBT) { super.saveNBTData(aNBT); - aNBT.setByte("eRotation", (byte) mExtendedFacing.getRotation().getIndex()); - aNBT.setByte("eFlip", (byte) mExtendedFacing.getFlip().getIndex()); + aNBT.setByte( + "eRotation", + (byte) mExtendedFacing.getRotation() + .getIndex()); + aNBT.setByte( + "eFlip", + (byte) mExtendedFacing.getFlip() + .getIndex()); } @Override diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java index 9f75c283ec..cfc1ce6558 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java @@ -139,8 +139,10 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT long maxEnergy = 0; for (GT_MetaTileEntity_Hatch tHatch : getExoticAndNormalEnergyHatchList()) { if (isValidMetaTileEntity(tHatch)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); + storedEnergy += tHatch.getBaseMetaTileEntity() + .getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity() + .getEUCapacity(); } } long voltage = getAverageInputVoltage(); diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java index fc25a15beb..fc6dce9e70 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java @@ -145,12 +145,16 @@ public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { switch (mTier) { case 4: - getBaseMetaTileEntity() - .add2by2Slots(builder, getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CIRCUIT); + getBaseMetaTileEntity().add2by2Slots( + builder, + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_CIRCUIT); break; default: - getBaseMetaTileEntity() - .add4by4Slots(builder, getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CIRCUIT); + getBaseMetaTileEntity().add4by4Slots( + builder, + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_CIRCUIT); break; } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java index 959bcda530..42abf4839b 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java @@ -132,8 +132,8 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch @Override public void initDefaultModes(NBTTagCompound aNBT) { if (!getBaseMetaTileEntity().getWorld().isRemote) { - GT_ClientPreference tPreference = GT_Mod.gregtechproxy - .getClientPreference(getBaseMetaTileEntity().getOwnerUuid()); + GT_ClientPreference tPreference = GT_Mod.gregtechproxy.getClientPreference( + getBaseMetaTileEntity().getOwnerUuid()); if (tPreference != null) disableFilter = !tPreference.isInputBusInitialFilterEnabled(); } } @@ -174,7 +174,8 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch if (toSet == 0) continue; int slot = validSlots.get(slotindex); slotindex++; - mInventory[slot] = stacks.get(sID).copy(); + mInventory[slot] = stacks.get(sID) + .copy(); toSet = Math.min(toSet, mInventory[slot].getMaxStackSize()); mInventory[slot].stackSize = toSet; slots.merge(sID, toSet, (a, b) -> a - b); @@ -201,7 +202,9 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch @Override public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (!getBaseMetaTileEntity().getCoverInfoAtSide(aSide).isGUIClickable()) return; + if (!getBaseMetaTileEntity().getCoverInfoAtSide(aSide) + .isGUIClickable()) + return; if (aPlayer.isSneaking()) { if (disableSort) { disableSort = false; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java index bcc260fd2e..d380baf8ed 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java @@ -96,14 +96,20 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { if (mAuto) return new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_AUTOMAINTENANCE_IDLE), - TextureFactory.builder().addIcon(OVERLAY_AUTOMAINTENANCE_IDLE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_AUTOMAINTENANCE_IDLE_GLOW) + .glow() + .build() }; return new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_MAINTENANCE) }; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { if (mAuto) return new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_AUTOMAINTENANCE), - TextureFactory.builder().addIcon(OVERLAY_AUTOMAINTENANCE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_AUTOMAINTENANCE_GLOW) + .glow() + .build() }; return new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_MAINTENANCE), TextureFactory.of(OVERLAY_DUCTTAPE) }; } @@ -146,7 +152,10 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch if (aBaseMetaTileEntity.isClientSide()) return true; if (aSide == aBaseMetaTileEntity.getFrontFacing()) { // only allow OC robot fake player - if (aPlayer instanceof FakePlayer && !aPlayer.getGameProfile().getName().endsWith(".robot")) return false; + if (aPlayer instanceof FakePlayer && !aPlayer.getGameProfile() + .getName() + .endsWith(".robot")) + return false; ItemStack tStack = aPlayer.getCurrentEquippedItem(); if (tStack != null) { if (tStack.getItem() instanceof ItemToolbox) { @@ -193,8 +202,10 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch amt = tStack.stackSize; boolean temp = true; for (ItemStack aStack : mInventory) { - if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility - .areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true))) { + if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual( + GT_OreDictUnificator.get(false, aStack), + tStack, + true))) { amt -= aStack.stackSize; if (amt < 1) { temp = false; @@ -211,8 +222,10 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch if (tStack != null) { amt = tStack.stackSize; for (ItemStack aStack : mInventory) { - if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility - .areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true))) { + if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual( + GT_OreDictUnificator.get(false, aStack), + tStack, + true))) { if (aStack.stackSize < amt) { amt -= aStack.stackSize; aStack.stackSize = 0; @@ -322,28 +335,33 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch getBaseMetaTileEntity().add2by2Slots(builder); } else { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.SLOT_MAINTENANCE).setPos(78, 33).setSize(20, 20)) - .widget(new SlotWidget(BaseSlot.empty()) { - - @Override - public boolean handleDragAndDrop(ItemStack draggedStack, int button) { - return false; - } - - @Override - protected void phantomClick(ClickData clickData, ItemStack cursorStack) { - if (cursorStack == null) return; - onToolClick(cursorStack, getContext().getPlayer()); - if (cursorStack.stackSize < 1) { - getContext().getPlayer().inventory.setItemStack(null); - } - if (getContext().getPlayer() instanceof EntityPlayerMP) { - ((EntityPlayerMP) getContext().getPlayer()).updateHeldItem(); - } - } - }.disableShiftInsert().setBackground(GT_UITextures.TRANSPARENT).setPos(79, 34)).widget( - new TextWidget("Click with Tool to repair.").setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(8, 12)); + new DrawableWidget().setDrawable(GT_UITextures.SLOT_MAINTENANCE) + .setPos(78, 33) + .setSize(20, 20)) + .widget(new SlotWidget(BaseSlot.empty()) { + + @Override + public boolean handleDragAndDrop(ItemStack draggedStack, int button) { + return false; + } + + @Override + protected void phantomClick(ClickData clickData, ItemStack cursorStack) { + if (cursorStack == null) return; + onToolClick(cursorStack, getContext().getPlayer()); + if (cursorStack.stackSize < 1) { + getContext().getPlayer().inventory.setItemStack(null); + } + if (getContext().getPlayer() instanceof EntityPlayerMP) { + ((EntityPlayerMP) getContext().getPlayer()).updateHeldItem(); + } + } + }.disableShiftInsert() + .setBackground(GT_UITextures.TRANSPARENT) + .setPos(79, 34)) + .widget( + new TextWidget("Click with Tool to repair.").setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(8, 12)); } } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java index b41f45e6d2..f0f1705b1f 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java @@ -34,7 +34,7 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch { private final int pollutionReduction = calculatePollutionReduction(100); private final int pollutionRecover = 100 - pollutionReduction; private final String[] description = String.format(localizedDescFormat, pollutionReduction, pollutionRecover) - .split("\\R"); + .split("\\R"); private final boolean[] facings = new boolean[ForgeDirection.VALID_DIRECTIONS.length]; public GT_MetaTileEntity_Hatch_Muffler(int aID, String aName, String aNameRegional, int aTier) { @@ -103,8 +103,12 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch { @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { super.onPostTick(aBaseMetaTileEntity, aTick); - if (aBaseMetaTileEntity.isClientSide() && this.getBaseMetaTileEntity().isActive()) { - pollutionParticles(this.getBaseMetaTileEntity().getWorld(), ParticleFX.LARGE_SMOKE.toString()); + if (aBaseMetaTileEntity.isClientSide() && this.getBaseMetaTileEntity() + .isActive()) { + pollutionParticles( + this.getBaseMetaTileEntity() + .getWorld(), + ParticleFX.LARGE_SMOKE.toString()); } } @@ -159,26 +163,35 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch { zSpd = aDir.offsetZ * (0.1F + 0.2F * XSTR_INSTANCE.nextFloat()); } - WorldSpawnedEventBuilder.ParticleEventBuilder events = new WorldSpawnedEventBuilder.ParticleEventBuilder() - .setIdentifier(name).setWorld(aWorld).setMotion(xSpd, ySpd, zSpd); + WorldSpawnedEventBuilder.ParticleEventBuilder events = new WorldSpawnedEventBuilder.ParticleEventBuilder().setIdentifier( + name) + .setWorld( + aWorld) + .setMotion( + xSpd, + ySpd, + zSpd); if (chk1) { events.setPosition( xPos + ran1 * 0.5F, yPos + XSTR_INSTANCE.nextFloat() * 0.5F, - zPos + XSTR_INSTANCE.nextFloat() * 0.5F).run(); + zPos + XSTR_INSTANCE.nextFloat() * 0.5F) + .run(); } if (chk2) { events.setPosition( xPos + ran2 * 0.5F, yPos + XSTR_INSTANCE.nextFloat() * 0.5F, - zPos + XSTR_INSTANCE.nextFloat() * 0.5F).run(); + zPos + XSTR_INSTANCE.nextFloat() * 0.5F) + .run(); } if (chk3) { events.setPosition( xPos + ran3 * 0.5F, yPos + XSTR_INSTANCE.nextFloat() * 0.5F, - zPos + XSTR_INSTANCE.nextFloat() * 0.5F).run(); + zPos + XSTR_INSTANCE.nextFloat() * 0.5F) + .run(); } } @@ -217,6 +230,7 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch { */ public void setInValidFacings(ForgeDirection... aFacings) { Arrays.fill(facings, true); - Arrays.stream(aFacings).forEach(face -> facings[face.ordinal()] = false); + Arrays.stream(aFacings) + .forEach(face -> facings[face.ordinal()] = false); } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java index 7d95e0b17c..1b7fedce22 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java @@ -171,10 +171,9 @@ public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_ @Override public int fill(FluidStack aFluid, boolean doFill) { - if (aFluid == null || aFluid.getFluid().getID() <= 0 - || aFluid.amount <= 0 - || !canTankBeFilled() - || !isFluidInputAllowed(aFluid)) + if (aFluid == null || aFluid.getFluid() + .getID() + <= 0 || aFluid.amount <= 0 || !canTankBeFilled() || !isFluidInputAllowed(aFluid)) return 0; if (!hasFluid(aFluid) && getFirstEmptySlot() != -1) { int tFilled = Math.min(aFluid.amount, mCapacityPer); @@ -304,21 +303,36 @@ public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_ final int slotId = i; builder.widget( new FluidDisplaySlotWidget(inventoryHandler, slotId) - .setFluidAccessConstructor(() -> constructFluidAccess(slotId)).setIHasFluidDisplay(this) - .setCanDrain(true).setCanFill(!isDrainableStackSeparate()) - .setActionRealClick(FluidDisplaySlotWidget.Action.TRANSFER) - .setBeforeRealClick((clickData, widget) -> { - if (NetworkUtils.isClient()) { - // propagate display item content to actual fluid stored in this tank - setFluid( - GT_Utility.getFluidFromDisplayStack(widget.getMcSlot().getStack()), - slotId); - } - ItemStack tStackHeld = widget.getContext().getPlayer().inventory.getItemStack(); - FluidStack tFluidHeld = GT_Utility.getFluidForFilledItem(tStackHeld, true); - return constructFluidAccess(slotId).isMatch(tFluidHeld, slotId); - }).setUpdateFluidDisplayItem(() -> updateFluidDisplayItem(slotId)) - .setBackground(ModularUITextures.FLUID_SLOT).setPos(positions[slotId])); + .setFluidAccessConstructor( + () -> constructFluidAccess(slotId)) + .setIHasFluidDisplay(this) + .setCanDrain(true) + .setCanFill(!isDrainableStackSeparate()) + .setActionRealClick( + FluidDisplaySlotWidget.Action.TRANSFER) + .setBeforeRealClick((clickData, widget) -> { + if (NetworkUtils.isClient()) { + // propagate display item content to + // actual fluid stored in this tank + setFluid( + GT_Utility.getFluidFromDisplayStack( + widget.getMcSlot() + .getStack()), + slotId); + } + ItemStack tStackHeld = widget.getContext() + .getPlayer().inventory.getItemStack(); + FluidStack tFluidHeld = GT_Utility.getFluidForFilledItem( + tStackHeld, + true); + return constructFluidAccess(slotId).isMatch( + tFluidHeld, + slotId); + }) + .setUpdateFluidDisplayItem( + () -> updateFluidDisplayItem(slotId)) + .setBackground(ModularUITextures.FLUID_SLOT) + .setPos(positions[slotId])); } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java index ed29f8fe08..4a8e745a25 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java @@ -123,16 +123,18 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch impl public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { super.onPostTick(aBaseMetaTileEntity, aTick); if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && mFluid != null) { - IFluidHandler tTileEntity = aBaseMetaTileEntity - .getITankContainerAtSide(aBaseMetaTileEntity.getFrontFacing()); + IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide( + aBaseMetaTileEntity.getFrontFacing()); if (tTileEntity != null) { FluidStack tDrained = aBaseMetaTileEntity.drain( ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()), Math.max(1, mFluid.amount), false); if (tDrained != null) { - int tFilledAmount = tTileEntity - .fill(ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()), tDrained, false); + int tFilledAmount = tTileEntity.fill( + ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()), + tDrained, + false); if (tFilledAmount > 0) { tTileEntity.fill( ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()), @@ -163,7 +165,8 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch impl lockedFluidName = aNBT.getString("lockedFluidName"); lockedFluidName = lockedFluidName.length() == 0 ? null : lockedFluidName; if (GT_Utility.getFluidFromUnlocalizedName(lockedFluidName) != null) { - lockedFluidName = GT_Utility.getFluidFromUnlocalizedName(lockedFluidName).getName(); + lockedFluidName = GT_Utility.getFluidFromUnlocalizedName(lockedFluidName) + .getName(); } } @@ -239,7 +242,9 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch impl @Override public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (!getBaseMetaTileEntity().getCoverInfoAtSide(aSide).isGUIClickable()) return; + if (!getBaseMetaTileEntity().getCoverInfoAtSide(aSide) + .isGUIClickable()) + return; if (aPlayer.isSneaking()) { mMode = (byte) ((mMode + 9) % 10); } else { @@ -287,8 +292,12 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch impl "115.3", "currently none, will be locked to the next that is put in (or use fluid cell to lock)"); } else { - this.setLockedFluidName(this.getDrainableStack().getFluid().getName()); - inBrackets = this.getDrainableStack().getLocalizedName(); + this.setLockedFluidName( + this.getDrainableStack() + .getFluid() + .getName()); + inBrackets = this.getDrainableStack() + .getLocalizedName(); } GT_Utility.sendChatToPlayer( aPlayer, @@ -305,8 +314,12 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch impl "115.3", "currently none, will be locked to the next that is put in (or use fluid cell to lock)"); } else { - this.setLockedFluidName(this.getDrainableStack().getFluid().getName()); - inBrackets = this.getDrainableStack().getLocalizedName(); + this.setLockedFluidName( + this.getDrainableStack() + .getFluid() + .getName()); + inBrackets = this.getDrainableStack() + .getLocalizedName(); } GT_Utility.sendChatToPlayer( aPlayer, @@ -316,7 +329,9 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch impl } private boolean tryToLockHatch(EntityPlayer aPlayer, byte aSide) { - if (!getBaseMetaTileEntity().getCoverInfoAtSide(aSide).isGUIClickable()) return false; + if (!getBaseMetaTileEntity().getCoverInfoAtSide(aSide) + .isGUIClickable()) + return false; if (!isFluidLocked()) return false; final ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem(); if (tCurrentItem == null) return false; @@ -324,7 +339,9 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch impl if (tFluid == null && tCurrentItem.getItem() instanceof IFluidContainerItem) tFluid = ((IFluidContainerItem) tCurrentItem.getItem()).getFluid(tCurrentItem); if (tFluid != null) { - if (getLockedFluidName() != null && !getLockedFluidName().equals(tFluid.getFluid().getName())) { + if (getLockedFluidName() != null && !getLockedFluidName().equals( + tFluid.getFluid() + .getName())) { GT_Utility.sendChatToPlayer( aPlayer, String.format( @@ -334,7 +351,9 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch impl "Hatch is locked to a different fluid. To change the locking, empty it and made it locked to the next fluid with a screwdriver. Currently locked to"), StatCollector.translateToLocal(getLockedFluidName()))); } else { - setLockedFluidName(tFluid.getFluid().getName()); + setLockedFluidName( + tFluid.getFluid() + .getName()); if (mMode == 8) GT_Utility.sendChatToPlayer( aPlayer, String.format( @@ -427,7 +446,9 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch impl @Override protected void onEmptyingContainerWhenEmpty() { if (this.lockedFluidName == null && this.mFluid != null && isFluidLocked()) { - this.setLockedFluidName(this.mFluid.getFluid().getName()); + this.setLockedFluidName( + this.mFluid.getFluid() + .getName()); final EntityPlayer player; if (playerThatLockedfluid == null || (player = playerThatLockedfluid.get()) == null) return; GT_Utility.sendChatToPlayer( @@ -459,7 +480,8 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch impl + EnumChatFormatting.RESET, (!isFluidLocked() || lockedFluidName == null) ? "Not Locked" : ("Locked to " + StatCollector.translateToLocal( - FluidRegistry.getFluidStack(lockedFluidName, 1).getUnlocalizedName())) }; + FluidRegistry.getFluidStack(lockedFluidName, 1) + .getUnlocalizedName())) }; } @Override @@ -471,28 +493,51 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch impl public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { super.addUIWidgets(builder, buildContext); builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(98, 16).setSize(71, 45)) - .widget( - new FluidDisplaySlotWidget(inventoryHandler, getLockedDisplaySlot()).setIHasFluidDisplay(this) - .setActionRealClick(FluidDisplaySlotWidget.Action.LOCK) - .setActionDragAndDrop(FluidDisplaySlotWidget.Action.LOCK) - .setBeforeClick((clickData, widget) -> { - if (NetworkUtils.isClient()) { - // propagate display item content to actual fluid stored in this tank - setDrainableStack( - GT_Utility.getFluidFromDisplayStack(mInventory[getStackDisplaySlot()])); - } - return true; - }).setBackground(GT_UITextures.TRANSPARENT).setPos(149, 41)) - .widget(new TextWidget("Locked Fluid").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(101, 20)) - .widget(TextWidget.dynamicString(() -> { - final ItemStack lockedDisplayStack = mInventory[getLockedDisplaySlot()]; - return lockedDisplayStack == null ? "None" : lockedDisplayStack.getDisplayName(); - }).setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setTextAlignment(Alignment.CenterLeft) - .setMaxWidth(65).setPos(101, 30)) - // #updateFluidDisplayItem invalidates locked fluid slot - // if lockedFluidName == null or mMode is incorrect - .widget(new FakeSyncWidget.StringSyncer(() -> lockedFluidName, val -> lockedFluidName = val)) - .widget(new FakeSyncWidget.ByteSyncer(() -> mMode, val -> mMode = val)); + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + .setPos(98, 16) + .setSize(71, 45)) + .widget( + new FluidDisplaySlotWidget(inventoryHandler, getLockedDisplaySlot()).setIHasFluidDisplay(this) + .setActionRealClick( + FluidDisplaySlotWidget.Action.LOCK) + .setActionDragAndDrop( + FluidDisplaySlotWidget.Action.LOCK) + .setBeforeClick( + (clickData, + widget) -> { + if (NetworkUtils.isClient()) { + // propagate + // display + // item + // content to + // actual + // fluid + // stored in + // this tank + setDrainableStack( + GT_Utility.getFluidFromDisplayStack( + mInventory[getStackDisplaySlot()])); + } + return true; + }) + .setBackground( + GT_UITextures.TRANSPARENT) + .setPos(149, 41)) + .widget( + new TextWidget("Locked Fluid").setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(101, 20)) + .widget(TextWidget.dynamicString(() -> { + final ItemStack lockedDisplayStack = mInventory[getLockedDisplaySlot()]; + return lockedDisplayStack == null ? "None" : lockedDisplayStack.getDisplayName(); + }) + .setSynced(false) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setTextAlignment(Alignment.CenterLeft) + .setMaxWidth(65) + .setPos(101, 30)) + // #updateFluidDisplayItem invalidates locked fluid slot + // if lockedFluidName == null or mMode is incorrect + .widget(new FakeSyncWidget.StringSyncer(() -> lockedFluidName, val -> lockedFluidName = val)) + .widget(new FakeSyncWidget.ByteSyncer(() -> mMode, val -> mMode = val)); } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java index 094ad29471..c970b64cb9 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java @@ -160,8 +160,8 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch i public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { super.onPostTick(aBaseMetaTileEntity, aTick); if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && (aTick & 0x7) == 0) { - final IInventory tTileEntity = aBaseMetaTileEntity - .getIInventoryAtSide(aBaseMetaTileEntity.getFrontFacing()); + final IInventory tTileEntity = aBaseMetaTileEntity.getIInventoryAtSide( + aBaseMetaTileEntity.getFrontFacing()); if (tTileEntity != null) { moveMultipleItemStacks( aBaseMetaTileEntity, diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 51086d806b..d2083fc87c 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -104,29 +104,43 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity public GT_MetaTileEntity_MultiBlockBase(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 2); - GT_MetaTileEntity_MultiBlockBase.disableMaintenance = GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false); - this.damageFactorLow = GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "MultiBlockMachines.damageFactorLow", 5); - this.damageFactorHigh = (float) GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "MultiBlockMachines.damageFactorHigh", 0.6f); + GT_MetaTileEntity_MultiBlockBase.disableMaintenance = GregTech_API.sMachineFile.get( + ConfigCategories.machineconfig, + "MultiBlockMachines.disableMaintenance", + false); + this.damageFactorLow = GregTech_API.sMachineFile.get( + ConfigCategories.machineconfig, + "MultiBlockMachines.damageFactorLow", + 5); + this.damageFactorHigh = (float) GregTech_API.sMachineFile.get( + ConfigCategories.machineconfig, + "MultiBlockMachines.damageFactorHigh", + 0.6f); this.mNEI = ""; } public GT_MetaTileEntity_MultiBlockBase(String aName) { super(aName, 2); - GT_MetaTileEntity_MultiBlockBase.disableMaintenance = GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "MultiBlockMachines.disableMaintenance", false); - this.damageFactorLow = GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "MultiBlockMachines.damageFactorLow", 5); - this.damageFactorHigh = (float) GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "MultiBlockMachines.damageFactorHigh", 0.6f); + GT_MetaTileEntity_MultiBlockBase.disableMaintenance = GregTech_API.sMachineFile.get( + ConfigCategories.machineconfig, + "MultiBlockMachines.disableMaintenance", + false); + this.damageFactorLow = GregTech_API.sMachineFile.get( + ConfigCategories.machineconfig, + "MultiBlockMachines.damageFactorLow", + 5); + this.damageFactorHigh = (float) GregTech_API.sMachineFile.get( + ConfigCategories.machineconfig, + "MultiBlockMachines.damageFactorHigh", + 0.6f); } public static boolean isValidMetaTileEntity(MetaTileEntity aMetaTileEntity) { - return aMetaTileEntity.getBaseMetaTileEntity() != null - && aMetaTileEntity.getBaseMetaTileEntity().getMetaTileEntity() == aMetaTileEntity - && !aMetaTileEntity.getBaseMetaTileEntity().isDead(); + return aMetaTileEntity.getBaseMetaTileEntity() != null && aMetaTileEntity.getBaseMetaTileEntity() + .getMetaTileEntity() + == aMetaTileEntity + && !aMetaTileEntity.getBaseMetaTileEntity() + .isDead(); } @Override @@ -433,7 +447,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity try { GT_Mod.achievements.issueAchivementHatch( aBaseMetaTileEntity.getWorld() - .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), + .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), tStack); } catch (Exception ignored) {} addOutput(tStack); @@ -458,7 +472,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity try { GT_Mod.achievements.issueAchievement( aBaseMetaTileEntity.getWorld() - .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), + .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "oilplant"); } catch (Exception ignored) {} } @@ -523,7 +537,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity if (getBaseMetaTileEntity().isActive() && activitySound != null) { if (activitySoundLoop == null) { activitySoundLoop = new GT_SoundLoop(activitySound, getBaseMetaTileEntity(), false, true); - Minecraft.getMinecraft().getSoundHandler().playSound(activitySoundLoop); + Minecraft.getMinecraft() + .getSoundHandler() + .playSound(activitySoundLoop); } } else { if (activitySoundLoop != null) { @@ -683,13 +699,15 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity } } if (mInventory[1] != null && getBaseMetaTileEntity().getRandomNumber(2) == 0 - && !mInventory[1].getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.")) { + && !mInventory[1].getUnlocalizedName() + .startsWith("gt.blockmachines.basicmachine.")) { if (mInventory[1].getItem() instanceof GT_MetaGenerated_Tool_01) { NBTTagCompound tNBT = mInventory[1].getTagCompound(); ((GT_MetaGenerated_Tool) mInventory[1].getItem()).doDamage( mInventory[1], - (long) getDamageToComponent(mInventory[1]) * (long) Math - .min(mEUt / this.damageFactorLow, Math.pow(mEUt, this.damageFactorHigh))); + (long) getDamageToComponent(mInventory[1]) * (long) Math.min( + mEUt / this.damageFactorLow, + Math.pow(mEUt, this.damageFactorHigh))); if (mInventory[1].stackSize == 0) mInventory[1] = null; } } @@ -700,13 +718,17 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity public void explodeMultiblock() { GT_Log.exp.println( - "MultiBlockExplosion at: " + this.getBaseMetaTileEntity().getXCoord() + "MultiBlockExplosion at: " + this.getBaseMetaTileEntity() + .getXCoord() + " | " - + this.getBaseMetaTileEntity().getYCoord() + + this.getBaseMetaTileEntity() + .getYCoord() + " | " - + this.getBaseMetaTileEntity().getZCoord() + + this.getBaseMetaTileEntity() + .getZCoord() + " DIMID: " - + this.getBaseMetaTileEntity().getWorld().provider.dimensionId + + this.getBaseMetaTileEntity() + .getWorld().provider.dimensionId + "."); GT_Pollution.addPollution(getBaseMetaTileEntity(), GT_Mod.gregtechproxy.mPollutionOnExplosion); @@ -722,7 +744,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity mMaintenanceHatches); for (MetaTileEntity tTileEntity : allHatches) { if (tTileEntity != null && tTileEntity.getBaseMetaTileEntity() != null) { - tTileEntity.getBaseMetaTileEntity().doExplosion(V[8]); + tTileEntity.getBaseMetaTileEntity() + .doExplosion(V[8]); } } getBaseMetaTileEntity().doExplosion(V[8]); @@ -780,11 +803,13 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity aRemainder = (int) (leftToInject - (aAmpsToInject * aVoltage)); ampsOnCurrentHatch = (int) Math.min(aDynamo.maxAmperesOut(), aAmpsToInject); for (int i = 0; i < ampsOnCurrentHatch; i++) { - aDynamo.getBaseMetaTileEntity().increaseStoredEnergyUnits(aVoltage, false); + aDynamo.getBaseMetaTileEntity() + .increaseStoredEnergyUnits(aVoltage, false); } injected += aVoltage * ampsOnCurrentHatch; if (aRemainder > 0 && ampsOnCurrentHatch < aDynamo.maxAmperesOut()) { - aDynamo.getBaseMetaTileEntity().increaseStoredEnergyUnits(aRemainder, false); + aDynamo.getBaseMetaTileEntity() + .increaseStoredEnergyUnits(aRemainder, false); injected += aRemainder; } } @@ -795,7 +820,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity public long getMaxInputVoltage() { long rVoltage = 0; for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) - if (isValidMetaTileEntity(tHatch)) rVoltage += tHatch.getBaseMetaTileEntity().getInputVoltage(); + if (isValidMetaTileEntity(tHatch)) rVoltage += tHatch.getBaseMetaTileEntity() + .getInputVoltage(); return rVoltage; } @@ -877,7 +903,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity public boolean drainEnergyInput(long aEU) { if (aEU <= 0) return true; for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) if (isValidMetaTileEntity(tHatch)) { - if (tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(aEU, false)) return true; + if (tHatch.getBaseMetaTileEntity() + .decreaseStoredEnergyUnits(aEU, false)) + return true; } return false; } @@ -946,7 +974,9 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity ItemStack single = aStack.splitStack(1); for (GT_MetaTileEntity_Hatch_Output tHatch : mOutputHatches) { if (!outputSuccess && isValidMetaTileEntity(tHatch) && tHatch.outputsItems()) { - if (tHatch.getBaseMetaTileEntity().addStackToSlot(1, single)) outputSuccess = true; + if (tHatch.getBaseMetaTileEntity() + .addStackToSlot(1, single)) + outputSuccess = true; } } } @@ -960,9 +990,15 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity for (GT_MetaTileEntity_Hatch_Input tHatch : mInputHatches) { tHatch.mRecipeMap = getRecipeMap(); if (isValidMetaTileEntity(tHatch)) { - if (GT_Utility.areStacksEqual(aStack, tHatch.getBaseMetaTileEntity().getStackInSlot(0))) { - if (tHatch.getBaseMetaTileEntity().getStackInSlot(0).stackSize >= aStack.stackSize) { - tHatch.getBaseMetaTileEntity().decrStackSize(0, aStack.stackSize); + if (GT_Utility.areStacksEqual( + aStack, + tHatch.getBaseMetaTileEntity() + .getStackInSlot(0))) { + if (tHatch.getBaseMetaTileEntity() + .getStackInSlot(0).stackSize + >= aStack.stackSize) { + tHatch.getBaseMetaTileEntity() + .decrStackSize(0, aStack.stackSize); return true; } } @@ -971,10 +1007,18 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity for (GT_MetaTileEntity_Hatch_InputBus tHatch : mInputBusses) { tHatch.mRecipeMap = getRecipeMap(); if (isValidMetaTileEntity(tHatch)) { - for (int i = tHatch.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) { - if (GT_Utility.areStacksEqual(aStack, tHatch.getBaseMetaTileEntity().getStackInSlot(i))) { - if (tHatch.getBaseMetaTileEntity().getStackInSlot(i).stackSize >= aStack.stackSize) { - tHatch.getBaseMetaTileEntity().decrStackSize(i, aStack.stackSize); + for (int i = tHatch.getBaseMetaTileEntity() + .getSizeInventory() + - 1; i >= 0; i--) { + if (GT_Utility.areStacksEqual( + aStack, + tHatch.getBaseMetaTileEntity() + .getStackInSlot(i))) { + if (tHatch.getBaseMetaTileEntity() + .getStackInSlot(i).stackSize + >= aStack.stackSize) { + tHatch.getBaseMetaTileEntity() + .decrStackSize(i, aStack.stackSize); return true; } } @@ -993,8 +1037,12 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity // } for (GT_MetaTileEntity_Hatch_OutputBus tHatch : mOutputBusses) { if (isValidMetaTileEntity(tHatch)) { - for (int i = tHatch.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) { - rList.add(tHatch.getBaseMetaTileEntity().getStackInSlot(i)); + for (int i = tHatch.getBaseMetaTileEntity() + .getSizeInventory() + - 1; i >= 0; i--) { + rList.add( + tHatch.getBaseMetaTileEntity() + .getStackInSlot(i)); } } } @@ -1029,13 +1077,20 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity for (GT_MetaTileEntity_Hatch_InputBus tHatch : mInputBusses) { tHatch.mRecipeMap = getRecipeMap(); if (isValidMetaTileEntity(tHatch)) { - for (int i = tHatch.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) { - if (tHatch.getBaseMetaTileEntity().getStackInSlot(i) != null) - rList.add(tHatch.getBaseMetaTileEntity().getStackInSlot(i)); + for (int i = tHatch.getBaseMetaTileEntity() + .getSizeInventory() + - 1; i >= 0; i--) { + if (tHatch.getBaseMetaTileEntity() + .getStackInSlot(i) + != null) + rList.add( + tHatch.getBaseMetaTileEntity() + .getStackInSlot(i)); } } } - if (getStackInSlot(1) != null && getStackInSlot(1).getUnlocalizedName().startsWith("gt.integrated_circuit")) + if (getStackInSlot(1) != null && getStackInSlot(1).getUnlocalizedName() + .startsWith("gt.integrated_circuit")) rList.add(getStackInSlot(1)); return rList; } @@ -1229,8 +1284,10 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity long maxEnergy = 0; for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) { if (isValidMetaTileEntity(tHatch)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); + storedEnergy += tHatch.getBaseMetaTileEntity() + .getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity() + .getEUCapacity(); } } @@ -1519,134 +1576,158 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(4, 4).setSize(190, 85)); + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + .setPos(4, 4) + .setSize(190, 85)); final SlotWidget inventorySlot = new SlotWidget(inventoryHandler, 1); - builder.widget(inventorySlot.setPos(173, 167).setBackground(GT_UITextures.SLOT_DARK_GRAY)); + builder.widget( + inventorySlot.setPos(173, 167) + .setBackground(GT_UITextures.SLOT_DARK_GRAY)); final DynamicPositionedColumn screenElements = new DynamicPositionedColumn(); drawTexts(screenElements, inventorySlot); builder.widget(screenElements); builder.widget(createPowerSwitchButton()) - .widget(new FakeSyncWidget.BooleanSyncer(() -> getBaseMetaTileEntity().isAllowedToWork(), val -> { - if (val) getBaseMetaTileEntity().enableWorking(); - else getBaseMetaTileEntity().disableWorking(); - })); + .widget(new FakeSyncWidget.BooleanSyncer(() -> getBaseMetaTileEntity().isAllowedToWork(), val -> { + if (val) getBaseMetaTileEntity().enableWorking(); + else getBaseMetaTileEntity().disableWorking(); + })); builder.widget(createVoidExcessButton()) - .widget(new FakeSyncWidget.BooleanSyncer(() -> voidExcess, val -> voidExcess = val)); + .widget(new FakeSyncWidget.BooleanSyncer(() -> voidExcess, val -> voidExcess = val)); builder.widget(createInputSeparationButton()) - .widget(new FakeSyncWidget.BooleanSyncer(() -> inputSeparation, val -> inputSeparation = val)); + .widget(new FakeSyncWidget.BooleanSyncer(() -> inputSeparation, val -> inputSeparation = val)); builder.widget(createBatchModeButton()) - .widget(new FakeSyncWidget.BooleanSyncer(() -> batchMode, val -> batchMode = val)); + .widget(new FakeSyncWidget.BooleanSyncer(() -> batchMode, val -> batchMode = val)); - builder.widget(createLockToSingleRecipeButton()).widget( - new FakeSyncWidget.BooleanSyncer(() -> mLockedToSingleRecipe, val -> mLockedToSingleRecipe = val)); + builder.widget(createLockToSingleRecipeButton()) + .widget( + new FakeSyncWidget.BooleanSyncer( + () -> mLockedToSingleRecipe, + val -> mLockedToSingleRecipe = val)); } @Override public void addGregTechLogo(ModularWindow.Builder builder) {} protected void drawTexts(DynamicPositionedColumn screenElements, SlotWidget inventorySlot) { - screenElements.setSynced(false).setSpace(0).setPos(10, 7); - - screenElements - .widget( - new TextWidget(GT_Utility.trans("132", "Pipe is loose.")) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> !mWrench)) - .widget(new FakeSyncWidget.BooleanSyncer(() -> mWrench, val -> mWrench = val)); - screenElements - .widget( - new TextWidget(GT_Utility.trans("133", "Screws are loose.")) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> !mScrewdriver)) - .widget(new FakeSyncWidget.BooleanSyncer(() -> mScrewdriver, val -> mScrewdriver = val)); - screenElements - .widget( - new TextWidget(GT_Utility.trans("134", "Something is stuck.")) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> !mSoftHammer)) - .widget(new FakeSyncWidget.BooleanSyncer(() -> mSoftHammer, val -> mSoftHammer = val)); - screenElements - .widget( - new TextWidget(GT_Utility.trans("135", "Platings are dented.")) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> !mHardHammer)) - .widget(new FakeSyncWidget.BooleanSyncer(() -> mHardHammer, val -> mHardHammer = val)); - screenElements - .widget( - new TextWidget(GT_Utility.trans("136", "Circuitry burned out.")) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> !mSolderingTool)) - .widget(new FakeSyncWidget.BooleanSyncer(() -> mSolderingTool, val -> mSolderingTool = val)); - screenElements - .widget( - new TextWidget(GT_Utility.trans("137", "That doesn't belong there.")) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> !mCrowbar)) - .widget(new FakeSyncWidget.BooleanSyncer(() -> mCrowbar, val -> mCrowbar = val)); - screenElements - .widget( - new TextWidget(GT_Utility.trans("138", "Incomplete Structure.")) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> !mMachine)) - .widget(new FakeSyncWidget.BooleanSyncer(() -> mMachine, val -> mMachine = val)); + screenElements.setSynced(false) + .setSpace(0) + .setPos(10, 7); + + screenElements.widget( + new TextWidget(GT_Utility.trans("132", "Pipe is loose.")).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> !mWrench)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> mWrench, val -> mWrench = val)); + screenElements.widget( + new TextWidget(GT_Utility.trans("133", "Screws are loose.")).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> !mScrewdriver)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> mScrewdriver, val -> mScrewdriver = val)); + screenElements.widget( + new TextWidget(GT_Utility.trans("134", "Something is stuck.")).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> !mSoftHammer)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> mSoftHammer, val -> mSoftHammer = val)); + screenElements.widget( + new TextWidget(GT_Utility.trans("135", "Platings are dented.")).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> !mHardHammer)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> mHardHammer, val -> mHardHammer = val)); + screenElements.widget( + new TextWidget(GT_Utility.trans("136", "Circuitry burned out.")).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> !mSolderingTool)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> mSolderingTool, val -> mSolderingTool = val)); + screenElements.widget( + new TextWidget(GT_Utility.trans("137", "That doesn't belong there.")) + .setDefaultColor( + COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> !mCrowbar)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> mCrowbar, val -> mCrowbar = val)); + screenElements.widget( + new TextWidget(GT_Utility.trans("138", "Incomplete Structure.")).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> !mMachine)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> mMachine, val -> mMachine = val)); screenElements.widget( new TextWidget("Too Uncertain.").setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> (getBaseMetaTileEntity().getErrorDisplayID() & 128) != 0)); + .setEnabled( + widget -> (getBaseMetaTileEntity().getErrorDisplayID() & 128) + != 0)); screenElements.widget( new TextWidget("Invalid Parameters.").setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> (getBaseMetaTileEntity().getErrorDisplayID() & 256) != 0)); - - screenElements - .widget( - new TextWidget(GT_Utility.trans("139", "Hit with Soft Mallet")) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled( - widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 - && !getBaseMetaTileEntity().isActive())) - .widget( - new FakeSyncWidget.IntegerSyncer( - () -> getBaseMetaTileEntity().getErrorDisplayID(), - val -> getBaseMetaTileEntity().setErrorDisplayID(val))) - .widget( - new FakeSyncWidget.BooleanSyncer( - () -> getBaseMetaTileEntity().isActive(), - val -> getBaseMetaTileEntity().setActive(val))); + .setEnabled( + widget -> (getBaseMetaTileEntity().getErrorDisplayID() + & 256) != 0)); + screenElements.widget( - new TextWidget(GT_Utility.trans("140", "to (re-)start the Machine")) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled( - widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 - && !getBaseMetaTileEntity().isActive())); + new TextWidget(GT_Utility.trans("139", "Hit with Soft Mallet")).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled( + widget -> getBaseMetaTileEntity().getErrorDisplayID() + == 0 + && !getBaseMetaTileEntity().isActive())) + .widget( + new FakeSyncWidget.IntegerSyncer( + () -> getBaseMetaTileEntity().getErrorDisplayID(), + val -> getBaseMetaTileEntity().setErrorDisplayID(val))) + .widget( + new FakeSyncWidget.BooleanSyncer( + () -> getBaseMetaTileEntity().isActive(), + val -> getBaseMetaTileEntity().setActive(val))); + screenElements.widget( + new TextWidget( + GT_Utility.trans("140", "to (re-)start the Machine")).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled( + widget -> getBaseMetaTileEntity().getErrorDisplayID() + == 0 + && !getBaseMetaTileEntity().isActive())); screenElements.widget( new TextWidget(GT_Utility.trans("141", "if it doesn't start.")).setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled( - widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 - && !getBaseMetaTileEntity().isActive())); + .setEnabled( + widget -> getBaseMetaTileEntity().getErrorDisplayID() + == 0 + && !getBaseMetaTileEntity().isActive())); screenElements.widget( new TextWidget(GT_Utility.trans("142", "Running perfectly.")).setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled( - widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 - && getBaseMetaTileEntity().isActive())); + .setEnabled( + widget -> getBaseMetaTileEntity().getErrorDisplayID() + == 0 + && getBaseMetaTileEntity().isActive())); screenElements.widget( new TextWidget(GT_Utility.trans("143", "Missing Mining Pipe")).setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> { - if (getBaseMetaTileEntity().getErrorDisplayID() == 0 - && this instanceof GT_MetaTileEntity_DrillerBase) { - final ItemStack tItem = inventorySlot.getMcSlot().getStack(); - return tItem == null || !GT_Utility - .areStacksEqual(tItem, GT_ModHandler.getIC2Item("miningPipe", 1L)); - } - return false; - })); + .setEnabled(widget -> { + if (getBaseMetaTileEntity().getErrorDisplayID() + == 0 + && this instanceof GT_MetaTileEntity_DrillerBase) { + final ItemStack tItem = inventorySlot.getMcSlot() + .getStack(); + return tItem == null + || !GT_Utility.areStacksEqual( + tItem, + GT_ModHandler.getIC2Item( + "miningPipe", + 1L)); + } + return false; + })); screenElements.widget( new TextWidget(GT_Utility.trans("144", "Missing Turbine Rotor")).setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> { - if (getBaseMetaTileEntity().getErrorDisplayID() == 0 - && this instanceof GT_MetaTileEntity_LargeTurbine) { - final ItemStack tItem = inventorySlot.getMcSlot().getStack(); - return tItem == null || !(tItem.getItem() == GT_MetaGenerated_Tool_01.INSTANCE - && tItem.getItemDamage() >= 170 - && tItem.getItemDamage() <= 177); - } - return false; - })); + .setEnabled(widget -> { + if (getBaseMetaTileEntity().getErrorDisplayID() + == 0 + && this instanceof GT_MetaTileEntity_LargeTurbine) { + final ItemStack tItem = inventorySlot.getMcSlot() + .getStack(); + return tItem == null || !(tItem + .getItem() + == GT_MetaGenerated_Tool_01.INSTANCE + && tItem.getItemDamage() + >= 170 + && tItem.getItemDamage() + <= 177); + } + return false; + })); } protected ButtonWidget createPowerSwitchButton() { @@ -1656,21 +1737,25 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity } else { getBaseMetaTileEntity().enableWorking(); } - }).setPlayClickSoundResource( - () -> getBaseMetaTileEntity().isAllowedToWork() ? SoundResource.GUI_BUTTON_UP.resourceLocation - : SoundResource.GUI_BUTTON_DOWN.resourceLocation) - .setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(GT_UITextures.BUTTON_STANDARD); - if (getBaseMetaTileEntity().isAllowedToWork()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_ON); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_OFF); - } - return ret.toArray(new IDrawable[0]); - }).setPos(174, 148).setSize(16, 16); + }) + .setPlayClickSoundResource( + () -> getBaseMetaTileEntity().isAllowedToWork() + ? SoundResource.GUI_BUTTON_UP.resourceLocation + : SoundResource.GUI_BUTTON_DOWN.resourceLocation) + .setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(GT_UITextures.BUTTON_STANDARD); + if (getBaseMetaTileEntity().isAllowedToWork()) { + ret.add(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_ON); + } else { + ret.add(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_OFF); + } + return ret.toArray(new IDrawable[0]); + }) + .setPos(174, 148) + .setSize(16, 16); button.addTooltip(StatCollector.translateToLocal("GT5U.gui.button.power_switch")) - .setTooltipShowUpDelay(TOOLTIP_DELAY); + .setTooltipShowUpDelay(TOOLTIP_DELAY); return (ButtonWidget) button; } @@ -1679,26 +1764,30 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity if (isVoidExcessButtonEnabled()) { voidExcess = !voidExcess; } - }).setPlayClickSound(true).setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(GT_UITextures.BUTTON_STANDARD); - if (isVoidExcessButtonEnabled()) { - if (isVoidExcessEnabled()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS_ON); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS_OFF); - } - } else { - if (isVoidExcessEnabled()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS_ON_DISABLED); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS_OFF_DISABLED); - } - } - return ret.toArray(new IDrawable[0]); - }).setPos(8, 91).setSize(16, 16); + }) + .setPlayClickSound(true) + .setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(GT_UITextures.BUTTON_STANDARD); + if (isVoidExcessButtonEnabled()) { + if (isVoidExcessEnabled()) { + ret.add(GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS_ON); + } else { + ret.add(GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS_OFF); + } + } else { + if (isVoidExcessEnabled()) { + ret.add(GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS_ON_DISABLED); + } else { + ret.add(GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS_OFF_DISABLED); + } + } + return ret.toArray(new IDrawable[0]); + }) + .setPos(8, 91) + .setSize(16, 16); button.addTooltip(StatCollector.translateToLocal("GT5U.gui.button.void_excess")) - .setTooltipShowUpDelay(TOOLTIP_DELAY); + .setTooltipShowUpDelay(TOOLTIP_DELAY); return (ButtonWidget) button; } @@ -1707,26 +1796,32 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity if (isInputSeparationButtonEnabled()) { inputSeparation = !inputSeparation; } - }).setPlayClickSound(true).setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(GT_UITextures.BUTTON_STANDARD); - if (isInputSeparationButtonEnabled()) { - if (isInputSeparationEnabled()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_ON); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_OFF); - } - } else { - if (isInputSeparationEnabled()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_ON_DISABLED); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_OFF_DISABLED); - } - } - return ret.toArray(new IDrawable[0]); - }).setPos(26, 91).setSize(16, 16); + }) + .setPlayClickSound(true) + .setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(GT_UITextures.BUTTON_STANDARD); + if (isInputSeparationButtonEnabled()) { + if (isInputSeparationEnabled()) { + ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_ON); + } else { + ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_OFF); + } + } else { + if (isInputSeparationEnabled()) { + ret.add( + GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_ON_DISABLED); + } else { + ret.add( + GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_OFF_DISABLED); + } + } + return ret.toArray(new IDrawable[0]); + }) + .setPos(26, 91) + .setSize(16, 16); button.addTooltip(StatCollector.translateToLocal("GT5U.gui.button.input_separation")) - .setTooltipShowUpDelay(TOOLTIP_DELAY); + .setTooltipShowUpDelay(TOOLTIP_DELAY); return (ButtonWidget) button; } @@ -1735,26 +1830,30 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity if (isBatchModeButtonEnabled()) { batchMode = !batchMode; } - }).setPlayClickSound(true).setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(GT_UITextures.BUTTON_STANDARD); - if (isBatchModeButtonEnabled()) { - if (isBatchModeEnabled()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_ON); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_OFF); - } - } else { - if (isBatchModeEnabled()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_ON_DISABLED); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_OFF_DISABLED); - } - } - return ret.toArray(new IDrawable[0]); - }).setPos(44, 91).setSize(16, 16); + }) + .setPlayClickSound(true) + .setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(GT_UITextures.BUTTON_STANDARD); + if (isBatchModeButtonEnabled()) { + if (isBatchModeEnabled()) { + ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_ON); + } else { + ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_OFF); + } + } else { + if (isBatchModeEnabled()) { + ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_ON_DISABLED); + } else { + ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_OFF_DISABLED); + } + } + return ret.toArray(new IDrawable[0]); + }) + .setPos(44, 91) + .setSize(16, 16); button.addTooltip(StatCollector.translateToLocal("GT5U.gui.button.batch_mode")) - .setTooltipShowUpDelay(TOOLTIP_DELAY); + .setTooltipShowUpDelay(TOOLTIP_DELAY); return (ButtonWidget) button; } @@ -1763,26 +1862,30 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity if (supportsSingleRecipeLocking()) { mLockedToSingleRecipe = !mLockedToSingleRecipe; } - }).setPlayClickSound(true).setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(GT_UITextures.BUTTON_STANDARD); - if (supportsSingleRecipeLocking()) { - if (isRecipeLockingEnabled()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_LOCKED); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_UNLOCKED); - } - } else { - if (isRecipeLockingEnabled()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_LOCKED_DISABLED); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_UNLOCKED_DISABLED); - } - } - return ret.toArray(new IDrawable[0]); - }).setPos(62, 91).setSize(16, 16); + }) + .setPlayClickSound(true) + .setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(GT_UITextures.BUTTON_STANDARD); + if (supportsSingleRecipeLocking()) { + if (isRecipeLockingEnabled()) { + ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_LOCKED); + } else { + ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_UNLOCKED); + } + } else { + if (isRecipeLockingEnabled()) { + ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_LOCKED_DISABLED); + } else { + ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_UNLOCKED_DISABLED); + } + } + return ret.toArray(new IDrawable[0]); + }) + .setPos(62, 91) + .setSize(16, 16); button.addTooltip(StatCollector.translateToLocal("GT5U.gui.button.lock_recipe")) - .setTooltipShowUpDelay(TOOLTIP_DELAY); + .setTooltipShowUpDelay(TOOLTIP_DELAY); return (ButtonWidget) button; } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SpecialFilter.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SpecialFilter.java index 6becb5e806..890733e363 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SpecialFilter.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SpecialFilter.java @@ -90,58 +90,80 @@ public abstract class GT_MetaTileEntity_SpecialFilter extends GT_MetaTileEntity_ builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { bInvertFilter = !bInvertFilter; if (bInvertFilter) { - GT_Utility.sendChatToPlayer(widget.getContext().getPlayer(), GT_Utility.trans("124", "Invert Filter")); + GT_Utility.sendChatToPlayer( + widget.getContext() + .getPlayer(), + GT_Utility.trans("124", "Invert Filter")); } else { GT_Utility.sendChatToPlayer( - widget.getContext().getPlayer(), + widget.getContext() + .getPlayer(), GT_Utility.trans("125", "Don't invert Filter")); } - }).setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_INVERT_FILTER).setPos(61, 62) - .setSize(18, 18)).widget(new ButtonWidget().setOnClick((clickData, widget) -> { - bNBTAllowed = !bNBTAllowed; - if (bNBTAllowed) { - GT_Utility.sendChatToPlayer( - widget.getContext().getPlayer(), - GT_Utility.trans("126", "Ignore NBT")); - } else { - GT_Utility.sendChatToPlayer( - widget.getContext().getPlayer(), - GT_Utility.trans("127", "NBT has to match")); - } - }).setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_NBT).setPos(79, 62) - .setSize(18, 18)) - .widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_WHITE.apply(27, false)) - .setPos(6, 19).setSize(27, 24)) - .widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_BLUE.apply(42, true)) - .setPos(53, 19).setSize(42, 24)) - .widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_RED.apply(19, true)) - .setPos(152, 19).setSize(19, 24)) - .widget(new SlotWidget(BaseSlot.phantom(inventoryHandler, 9)) { - - @Override - protected void phantomClick(ClickData clickData, ItemStack cursorStack) { - clickTypeIcon(clickData.mouseButton != 0, cursorStack); - } - - @Override - public void buildTooltip(List<Text> tooltip) { - if (getEmptySlotTooltip() != null) { - tooltip.addAll(getEmptySlotTooltip()); - } - super.buildTooltip(tooltip); - } - - @Override - public List<String> getExtraTooltip() { - if (getItemExtraTooltip() != null) { - return getItemExtraTooltip(); - } - return Collections.emptyList(); - } - }.disableShiftInsert().setPos(34, 22).setBackground(GT_UITextures.BUTTON_STANDARD)) - .widget(SlotGroup.ofItemHandler(inventoryHandler, 3).endAtSlot(8).build().setPos(97, 4)); + }) + .setBackground( + GT_UITextures.BUTTON_STANDARD, + GT_UITextures.OVERLAY_BUTTON_INVERT_FILTER) + .setPos(61, 62) + .setSize(18, 18)) + .widget(new ButtonWidget().setOnClick((clickData, widget) -> { + bNBTAllowed = !bNBTAllowed; + if (bNBTAllowed) { + GT_Utility.sendChatToPlayer( + widget.getContext() + .getPlayer(), + GT_Utility.trans("126", "Ignore NBT")); + } else { + GT_Utility.sendChatToPlayer( + widget.getContext() + .getPlayer(), + GT_Utility.trans("127", "NBT has to match")); + } + }) + .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_NBT) + .setPos(79, 62) + .setSize(18, 18)) + .widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_WHITE.apply(27, false)) + .setPos(6, 19) + .setSize(27, 24)) + .widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_BLUE.apply(42, true)) + .setPos(53, 19) + .setSize(42, 24)) + .widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_RED.apply(19, true)) + .setPos(152, 19) + .setSize(19, 24)) + .widget(new SlotWidget(BaseSlot.phantom(inventoryHandler, 9)) { + + @Override + protected void phantomClick(ClickData clickData, ItemStack cursorStack) { + clickTypeIcon(clickData.mouseButton != 0, cursorStack); + } + + @Override + public void buildTooltip(List<Text> tooltip) { + if (getEmptySlotTooltip() != null) { + tooltip.addAll(getEmptySlotTooltip()); + } + super.buildTooltip(tooltip); + } + + @Override + public List<String> getExtraTooltip() { + if (getItemExtraTooltip() != null) { + return getItemExtraTooltip(); + } + return Collections.emptyList(); + } + }.disableShiftInsert() + .setPos(34, 22) + .setBackground(GT_UITextures.BUTTON_STANDARD)) + .widget( + SlotGroup.ofItemHandler(inventoryHandler, 3) + .endAtSlot(8) + .build() + .setPos(97, 4)); } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java index 9c069bbd5f..3424baca8b 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java @@ -124,7 +124,15 @@ public abstract class GT_MetaTileEntity_TieredMachineBlock extends MetaTileEntit protected SlotWidget createChargerSlot(int x, int y, String tooltipKey, Object[] tooltipArgs) { return (SlotWidget) new SlotWidget(inventoryHandler, rechargerSlotStartIndex()).disableShiftInsert() - .setGTTooltip(() -> mTooltipCache.getData(tooltipKey, tooltipArgs)).setTooltipShowUpDelay(TOOLTIP_DELAY) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CHARGER).setPos(x, y); + .setGTTooltip( + () -> mTooltipCache.getData( + tooltipKey, + tooltipArgs)) + .setTooltipShowUpDelay( + TOOLTIP_DELAY) + .setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_CHARGER) + .setPos(x, y); } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java index a70ee0d5e7..cb98e202ad 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java @@ -175,9 +175,10 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi for (byte i = 0; i < 6 && aBaseMetaTileEntity.getStoredEU() < aBaseMetaTileEntity.getEUCapacity(); i++) if (aBaseMetaTileEntity.inputEnergyFrom(i)) { TileEntity tTileEntity = aBaseMetaTileEntity.getTileEntityAtSide(i); - if (tTileEntity instanceof IEnergyProvider && ((IEnergyProvider) tTileEntity) - .extractEnergy(ForgeDirection.getOrientation(GT_Utility.getOppositeSide(i)), 1, true) - == 1) { + if (tTileEntity instanceof IEnergyProvider && ((IEnergyProvider) tTileEntity).extractEnergy( + ForgeDirection.getOrientation(GT_Utility.getOppositeSide(i)), + 1, + true) == 1) { long tEU = (long) ((IEnergyProvider) tTileEntity).extractEnergy( ForgeDirection.getOrientation(GT_Utility.getOppositeSide(i)), GT_Utility.safeInt(maxEUInput() * 100L / GregTech_API.mRFtoEU), @@ -271,7 +272,8 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi IWailaConfigHandler config) { final int facing = getBaseMetaTileEntity().getFrontFacing(); final NBTTagCompound tag = accessor.getNBTData(); - final int side = (byte) accessor.getSide().ordinal(); + final int side = (byte) accessor.getSide() + .ordinal(); final boolean allowedToWork = tag.getBoolean("isAllowedToWork"); final byte inputTier = GT_Utility.getTier(tag.getLong("maxEUInput")); diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java index 997898a34e..1c61f9ffa7 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Dynamo.java @@ -125,7 +125,8 @@ public class GT_MetaTileEntity_Wireless_Dynamo extends GT_MetaTileEntity_Hatch_D if (aTick == 1) { // UUID and username of the owner. - owner_uuid = aBaseMetaTileEntity.getOwnerUuid().toString(); + owner_uuid = aBaseMetaTileEntity.getOwnerUuid() + .toString(); owner_name = aBaseMetaTileEntity.getOwnerName(); strongCheckOrAddUser(owner_uuid, owner_name); diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java index 756a1b138a..e17cc6fbfb 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Wireless_Hatch.java @@ -18,8 +18,8 @@ import gregtech.api.metatileentity.MetaTileEntity; public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_Energy implements IGlobalWirelessEnergy, IWirelessEnergyHatchInformation { - private final BigInteger eu_transferred_per_operation = BigInteger - .valueOf(2 * V[mTier] * ticks_between_energy_addition); + private final BigInteger eu_transferred_per_operation = BigInteger.valueOf( + 2 * V[mTier] * ticks_between_energy_addition); private final long eu_transferred_per_operation_long = eu_transferred_per_operation.longValue(); private String owner_uuid; @@ -131,7 +131,8 @@ public class GT_MetaTileEntity_Wireless_Hatch extends GT_MetaTileEntity_Hatch_En if (aTick == 1) { // UUID and username of the owner. - owner_uuid = aBaseMetaTileEntity.getOwnerUuid().toString(); + owner_uuid = aBaseMetaTileEntity.getOwnerUuid() + .toString(); owner_name = aBaseMetaTileEntity.getOwnerName(); strongCheckOrAddUser(owner_uuid, owner_name); diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java index 8eddd5980b..81997c1e76 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java @@ -448,13 +448,15 @@ public class MultiTileEntityBlock extends Block final byte aSide = (byte) side; final CoverableTileEntity tile = (CoverableTileEntity) tTileEntity; if (side != -1) { - final Block facadeBlock = tile.getCoverInfoAtSide(aSide).getFacadeBlock(); + final Block facadeBlock = tile.getCoverInfoAtSide(aSide) + .getFacadeBlock(); if (facadeBlock != null) return facadeBlock; } else { // we do not allow more than one type of facade per block, so no need to check every side // see comment in gregtech.common.covers.GT_Cover_FacadeBase.isCoverPlaceable for (byte tSide : ALL_VALID_SIDES) { - final Block facadeBlock = tile.getCoverInfoAtSide(tSide).getFacadeBlock(); + final Block facadeBlock = tile.getCoverInfoAtSide(tSide) + .getFacadeBlock(); if (facadeBlock != null) { return facadeBlock; } @@ -531,8 +533,8 @@ public class MultiTileEntityBlock extends Block return aTileEntity instanceof IMTE_GetComparatorInputOverride ? ((IMTE_GetComparatorInputOverride) aTileEntity).getComparatorInputOverride((byte) aSide) : aTileEntity instanceof IMTE_IsProvidingWeakPower - ? ((IMTE_IsProvidingWeakPower) aTileEntity) - .isProvidingWeakPower(GT_Utility.getOppositeSide(aSide)) + ? ((IMTE_IsProvidingWeakPower) aTileEntity).isProvidingWeakPower( + GT_Utility.getOppositeSide(aSide)) : super.getComparatorInputOverride(aWorld, aX, aY, aZ, aSide); } @@ -550,8 +552,8 @@ public class MultiTileEntityBlock extends Block public final boolean isSideSolid(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection aSide) { final TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); return aTileEntity instanceof IMultiTileEntity - ? ((IMultiTileEntity) aTileEntity) - .isSideSolid((byte) (aSide != null ? aSide.ordinal() : GT_Values.SIDE_UNKNOWN)) + ? ((IMultiTileEntity) aTileEntity).isSideSolid( + (byte) (aSide != null ? aSide.ordinal() : GT_Values.SIDE_UNKNOWN)) : mOpaque; } @@ -595,8 +597,11 @@ public class MultiTileEntityBlock extends Block double aExplosionX, double aExplosionY, double aExplosionZ) { final TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); return aTileEntity instanceof IMultiTileEntity - ? ((IMultiTileEntity) aTileEntity) - .getExplosionResistance(aExploder, aExplosionX, aExplosionY, aExplosionZ) + ? ((IMultiTileEntity) aTileEntity).getExplosionResistance( + aExploder, + aExplosionX, + aExplosionY, + aExplosionZ) : 1.0F; } diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlockInternal.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlockInternal.java index 3dcf5eded3..690430b673 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlockInternal.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlockInternal.java @@ -51,8 +51,13 @@ public class MultiTileEntityBlockInternal extends Block implements IRenderedBloc public boolean placeBlock(World aWorld, int aX, int aY, int aZ, byte aSide, short aMetaData, NBTTagCompound aNBT, boolean aCauseBlockUpdates, boolean aForcePlacement) { - final MultiTileEntityContainer aMTEContainer = mMultiTileEntityRegistry - .getNewTileEntityContainer(aWorld, aX, aY, aZ, aMetaData, aNBT); + final MultiTileEntityContainer aMTEContainer = mMultiTileEntityRegistry.getNewTileEntityContainer( + aWorld, + aX, + aY, + aZ, + aMetaData, + aNBT); if (aMTEContainer == null) return false; final Block tReplacedBlock = aWorld.getBlock(aX, aY, aZ); @@ -85,8 +90,7 @@ public class MultiTileEntityBlockInternal extends Block implements IRenderedBloc try { if (aMTEContainer.mTileEntity instanceof IMTE_HasMultiBlockMachineRelevantData) { - if (((IMTE_HasMultiBlockMachineRelevantData) aMTEContainer.mTileEntity) - .hasMultiBlockMachineRelevantData()) + if (((IMTE_HasMultiBlockMachineRelevantData) aMTEContainer.mTileEntity).hasMultiBlockMachineRelevantData()) GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } catch (Throwable e) { diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java index 195fed3100..593a3c46e7 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityClassContainer.java @@ -44,8 +44,11 @@ public class MultiTileEntityClassContainer { /* End and register the Builder with the registry */ final MultiTileEntityRegistry registry = mRegistry.get(); - if (mParameters.hasKey(NBT.MATERIAL) && !mParameters.hasKey(NBT.COLOR)) mParameters - .setInteger(NBT.COLOR, GT_Util.getRGBInt(Materials.get(mParameters.getString(NBT.MATERIAL)).getRGBA())); + if (mParameters.hasKey(NBT.MATERIAL) && !mParameters.hasKey(NBT.COLOR)) mParameters.setInteger( + NBT.COLOR, + GT_Util.getRGBInt( + Materials.get(mParameters.getString(NBT.MATERIAL)) + .getRGBA())); try { mCanonicalTileEntity = mClass.newInstance(); diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityItemInternal.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityItemInternal.java index aad842c68b..23ad00dabd 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityItemInternal.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityItemInternal.java @@ -50,8 +50,8 @@ public class MultiTileEntityItemInternal extends ItemBlock implements IFluidCont @Override @SuppressWarnings("unchecked") public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { - final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry - .getNewTileEntityContainer(aStack); + final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry.getNewTileEntityContainer( + aStack); if (tTileEntityContainer == null) { aList.add("INVALID ITEM!"); return; @@ -74,8 +74,12 @@ public class MultiTileEntityItemInternal extends ItemBlock implements IFluidCont public void getSubItems(Item aItem, CreativeTabs aTab, List aList) { for (MultiTileEntityClassContainer tClass : mBlock.mMultiTileEntityRegistry.mRegistrations) { if (!tClass.mHidden) { - if (((IMultiTileEntity) tClass.mCanonicalTileEntity) - .getSubItems(mBlock, aItem, aTab, aList, tClass.mID)) { + if (((IMultiTileEntity) tClass.mCanonicalTileEntity).getSubItems( + mBlock, + aItem, + aTab, + aList, + tClass.mID)) { aList.add(mBlock.mMultiTileEntityRegistry.getItem(tClass.mID)); } } @@ -105,37 +109,56 @@ public class MultiTileEntityItemInternal extends ItemBlock implements IFluidCont if (aStack.stackSize == 0 || (aPlayer != null && !aPlayer.canPlayerEdit(aX, aY, aZ, aSide, aStack))) return false; - final MultiTileEntityContainer aMTEContainer = mBlock.mMultiTileEntityRegistry - .getNewTileEntityContainer(aWorld, aX, aY, aZ, aStack); + final MultiTileEntityContainer aMTEContainer = mBlock.mMultiTileEntityRegistry.getNewTileEntityContainer( + aWorld, + aX, + aY, + aZ, + aStack); - if (aMTEContainer != null - && (aPlayer == null || aPlayer.isSneaking() - || !(aMTEContainer.mTileEntity instanceof IMTE_OnlyPlaceableWhenSneaking) - || !((IMTE_OnlyPlaceableWhenSneaking) aMTEContainer.mTileEntity) - .onlyPlaceableWhenSneaking()) + if (aMTEContainer != null && (aPlayer == null || aPlayer.isSneaking() + || !(aMTEContainer.mTileEntity instanceof IMTE_OnlyPlaceableWhenSneaking) + || !((IMTE_OnlyPlaceableWhenSneaking) aMTEContainer.mTileEntity).onlyPlaceableWhenSneaking()) && (aWorld.checkNoEntityCollision(AxisAlignedBB.getBoundingBox(aX, aY, aZ, aX + 1, aY + 1, aZ + 1)) || (aMTEContainer.mTileEntity instanceof IMTE_IgnoreEntityCollisionWhenPlacing - && ((IMTE_IgnoreEntityCollisionWhenPlacing) aMTEContainer.mTileEntity) - .ignoreEntityCollisionWhenPlacing( - aStack, - aPlayer, - aWorld, - aX, - aY, - aZ, - (byte) aSide, - aHitX, - aHitY, - aHitZ))) + && ((IMTE_IgnoreEntityCollisionWhenPlacing) aMTEContainer.mTileEntity).ignoreEntityCollisionWhenPlacing( + aStack, + aPlayer, + aWorld, + aX, + aY, + aZ, + (byte) aSide, + aHitX, + aHitY, + aHitZ))) && (!(aMTEContainer.mTileEntity instanceof IMTE_CanPlace) - || ((IMTE_CanPlace) aMTEContainer.mTileEntity) - .canPlace(aStack, aPlayer, aWorld, aX, aY, aZ, (byte) aSide, aHitX, aHitY, aHitZ)) + || ((IMTE_CanPlace) aMTEContainer.mTileEntity).canPlace( + aStack, + aPlayer, + aWorld, + aX, + aY, + aZ, + (byte) aSide, + aHitX, + aHitY, + aHitZ)) && aWorld.setBlock(aX, aY, aZ, aMTEContainer.mBlock, 15 - aMTEContainer.mBlockMetaData, 2)) { aMTEContainer.setMultiTile(aWorld, aX, aY, aZ); try { - if (((IMultiTileEntity) aMTEContainer.mTileEntity) - .onPlaced(aStack, aPlayer, aWorld, aX, aY, aZ, (byte) aSide, aHitX, aHitY, aHitZ)) { + if (((IMultiTileEntity) aMTEContainer.mTileEntity).onPlaced( + aStack, + aPlayer, + aWorld, + aX, + aY, + aZ, + (byte) aSide, + aHitX, + aHitY, + aHitZ)) { aWorld.playSoundEffect( aX + 0.5, aY + 0.5, @@ -149,8 +172,7 @@ public class MultiTileEntityItemInternal extends ItemBlock implements IFluidCont } try { if (aMTEContainer.mTileEntity instanceof IMTE_HasMultiBlockMachineRelevantData - && (((IMTE_HasMultiBlockMachineRelevantData) aMTEContainer.mTileEntity) - .hasMultiBlockMachineRelevantData())) { + && (((IMTE_HasMultiBlockMachineRelevantData) aMTEContainer.mTileEntity).hasMultiBlockMachineRelevantData())) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); } } catch (Throwable e) { @@ -188,8 +210,8 @@ public class MultiTileEntityItemInternal extends ItemBlock implements IFluidCont public void updateItemStack(ItemStack aStack) { final MultiTileEntityClassContainer tContainer = mBlock.mMultiTileEntityRegistry.getClassContainer(aStack); if (tContainer == null) return; - final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry - .getNewTileEntityContainer(aStack); + final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry.getNewTileEntityContainer( + aStack); if (tTileEntityContainer != null && tTileEntityContainer.mTileEntity instanceof IItemUpdatable) { ((IItemUpdatable) tTileEntityContainer.mTileEntity).updateItemStack(aStack); } @@ -199,8 +221,8 @@ public class MultiTileEntityItemInternal extends ItemBlock implements IFluidCont public void updateItemStack(ItemStack aStack, World aWorld, int aX, int aY, int aZ) { final MultiTileEntityClassContainer tContainer = mBlock.mMultiTileEntityRegistry.getClassContainer(aStack); if (tContainer == null) return; - final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry - .getNewTileEntityContainer(aStack); + final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry.getNewTileEntityContainer( + aStack); if (tTileEntityContainer != null && tTileEntityContainer.mTileEntity instanceof IItemUpdatable) { ((IItemUpdatable) tTileEntityContainer.mTileEntity).updateItemStack(aStack, aWorld, aX, aY, aZ); } @@ -210,11 +232,12 @@ public class MultiTileEntityItemInternal extends ItemBlock implements IFluidCont public int getItemStackLimit(ItemStack aStack) { final MultiTileEntityClassContainer tContainer = mBlock.mMultiTileEntityRegistry.getClassContainer(aStack); if (tContainer == null) return 1; - final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry - .getNewTileEntityContainer(aStack); + final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry.getNewTileEntityContainer( + aStack); if (tTileEntityContainer != null && tTileEntityContainer.mTileEntity instanceof IMTE_GetMaxStackSize) { - return ((IMTE_GetMaxStackSize) tTileEntityContainer.mTileEntity) - .getMaxStackSize(aStack, tContainer.mStackSize); + return ((IMTE_GetMaxStackSize) tTileEntityContainer.mTileEntity).getMaxStackSize( + aStack, + tContainer.mStackSize); } return tContainer.mStackSize; } @@ -226,8 +249,8 @@ public class MultiTileEntityItemInternal extends ItemBlock implements IFluidCont @Override public FluidStack getFluid(ItemStack aStack) { - final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry - .getNewTileEntityContainer(aStack); + final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry.getNewTileEntityContainer( + aStack); if (tTileEntityContainer != null && tTileEntityContainer.mTileEntity instanceof IFluidContainerItem) { final FluidStack rFluid = ((IFluidContainerItem) tTileEntityContainer.mTileEntity).getFluid(aStack); updateItemStack(aStack); @@ -238,8 +261,8 @@ public class MultiTileEntityItemInternal extends ItemBlock implements IFluidCont @Override public int getCapacity(ItemStack aStack) { - final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry - .getNewTileEntityContainer(aStack); + final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry.getNewTileEntityContainer( + aStack); if (tTileEntityContainer != null && tTileEntityContainer.mTileEntity instanceof IFluidContainerItem) { final int rCapacity = ((IFluidContainerItem) tTileEntityContainer.mTileEntity).getCapacity(aStack); updateItemStack(aStack); @@ -250,8 +273,8 @@ public class MultiTileEntityItemInternal extends ItemBlock implements IFluidCont @Override public int fill(ItemStack aStack, FluidStack aFluid, boolean aDoFill) { - final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry - .getNewTileEntityContainer(aStack); + final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry.getNewTileEntityContainer( + aStack); if (tTileEntityContainer != null && tTileEntityContainer.mTileEntity instanceof IFluidContainerItem) { final int tFilled = ((IFluidContainerItem) tTileEntityContainer.mTileEntity).fill(aStack, aFluid, aDoFill); updateItemStack(aStack); @@ -262,11 +285,13 @@ public class MultiTileEntityItemInternal extends ItemBlock implements IFluidCont @Override public FluidStack drain(ItemStack aStack, int aMaxDrain, boolean aDoDrain) { - final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry - .getNewTileEntityContainer(aStack); + final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry.getNewTileEntityContainer( + aStack); if (tTileEntityContainer != null && tTileEntityContainer.mTileEntity instanceof IFluidContainerItem) { - final FluidStack rFluid = ((IFluidContainerItem) tTileEntityContainer.mTileEntity) - .drain(aStack, aMaxDrain, aDoDrain); + final FluidStack rFluid = ((IFluidContainerItem) tTileEntityContainer.mTileEntity).drain( + aStack, + aMaxDrain, + aDoDrain); updateItemStack(aStack); return rFluid; } diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java index 9fc35963b3..56414dfb4e 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java @@ -137,15 +137,19 @@ public class MultiTileEntityRegistry { if (tFailed) { GT_FML_LOGGER.error("MULTI-TILE REGISTRY ERROR: STACKTRACE START"); int i = 0; - for (StackTraceElement tElement : new Exception().getStackTrace()) - if (i++ < 5 && !tElement.getClassName().startsWith("sun")) GT_FML_LOGGER.error("\tat " + tElement); - else break; + for (StackTraceElement tElement : new Exception().getStackTrace()) if (i++ < 5 && !tElement.getClassName() + .startsWith( + "sun")) + GT_FML_LOGGER.error("\tat " + tElement); + else break; GT_FML_LOGGER.error("MULTI-TILE REGISTRY ERROR: STACKTRACE END"); return null; } - GT_LanguageManager - .addStringLocalization(mNameInternal + "." + aClassContainer.mID + ".name", aLocalised, false); + GT_LanguageManager.addStringLocalization( + mNameInternal + "." + aClassContainer.mID + ".name", + aLocalised, + false); mRegistry.put(aClassContainer.mID, aClassContainer); mLastRegisteredID = aClassContainer.mID; mRegistrations.add(aClassContainer); diff --git a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java index fdf72b4eab..bff998aa89 100644 --- a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java +++ b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java @@ -137,8 +137,9 @@ public abstract class MultiTileEntity extends CoverableTileEntity implements IMu @Override public void copyTextures() { // Loading an instance - final TileEntity tCanonicalTileEntity = MultiTileEntityRegistry - .getCanonicalTileEntity(getMultiTileEntityRegistryID(), getMultiTileEntityID()); + final TileEntity tCanonicalTileEntity = MultiTileEntityRegistry.getCanonicalTileEntity( + getMultiTileEntityRegistryID(), + getMultiTileEntityID()); if (tCanonicalTileEntity instanceof MultiTileEntity) textures = ((MultiTileEntity) tCanonicalTileEntity).textures; } @@ -166,7 +167,8 @@ public abstract class MultiTileEntity extends CoverableTileEntity implements IMu if (nbt.hasKey("y")) yCoord = nbt.getInteger("y"); if (nbt.hasKey("z")) zCoord = nbt.getInteger("z"); // read the custom Name. - if (nbt.hasKey(NBT.DISPAY)) customName = nbt.getCompoundTag(NBT.DISPAY).getString(NBT.CUSTOM_NAME); + if (nbt.hasKey(NBT.DISPAY)) customName = nbt.getCompoundTag(NBT.DISPAY) + .getString(NBT.CUSTOM_NAME); // And now everything else. try { @@ -740,7 +742,8 @@ public abstract class MultiTileEntity extends CoverableTileEntity implements IMu if (!getCoverInfoAtSide(aSide).isGUIClickable()) return false; } if (isServerSide()) { - if (!privateAccess() || aPlayer.getDisplayName().equalsIgnoreCase(getOwnerName())) { + if (!privateAccess() || aPlayer.getDisplayName() + .equalsIgnoreCase(getOwnerName())) { final ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem(); final byte wrenchSide = GT_Utility.determineWrenchingSide(aSide, aX, aY, aZ); @@ -767,7 +770,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity implements IMu if (getCoverIDAtSide(coverSide) == 0) { if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCovers.keySet())) { if (GregTech_API.getCoverBehaviorNew(tCurrentItem) - .isCoverPlaceable(coverSide, tCurrentItem, this) + .isCoverPlaceable(coverSide, tCurrentItem, this) && allowCoverOnSide(coverSide, new GT_ItemStack(tCurrentItem))) { setCoverItemAtSide(coverSide, tCurrentItem); if (!aPlayer.capabilities.isCreativeMode) tCurrentItem.stackSize--; @@ -953,7 +956,8 @@ public abstract class MultiTileEntity extends CoverableTileEntity implements IMu if ((ownerName.length() == 0) && isServerSide()) { setOwnerName(aPlayer.getDisplayName()); setOwnerUuid(aPlayer.getUniqueID()); - } else return !privateAccess() || aPlayer.getDisplayName().equals("Player") + } else return !privateAccess() || aPlayer.getDisplayName() + .equals("Player") || ownerName.equals("Player") || ownerName.equals(aPlayer.getDisplayName()); return true; @@ -1066,7 +1070,11 @@ public abstract class MultiTileEntity extends CoverableTileEntity implements IMu public void getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { super.getWailaBody(itemStack, currenttip, accessor, config); - currenttip.add(String.format("Facing: %s", ForgeDirection.getOrientation(getFrontFacing()).name())); + currenttip.add( + String.format( + "Facing: %s", + ForgeDirection.getOrientation(getFrontFacing()) + .name())); } @Override @@ -1143,7 +1151,8 @@ public abstract class MultiTileEntity extends CoverableTileEntity implements IMu final IFluidTank tTank = getFluidTankDrainable((byte) aDirection.ordinal(), aFluid); if (tTank == null || tTank.getFluid() == null || tTank.getFluidAmount() == 0 - || !tTank.getFluid().isFluidEqual(aFluid)) + || !tTank.getFluid() + .isFluidEqual(aFluid)) return null; return tTank.drain(aFluid.amount, aDoDrain); } @@ -1160,14 +1169,18 @@ public abstract class MultiTileEntity extends CoverableTileEntity implements IMu public boolean canFill(ForgeDirection aDirection, Fluid aFluid) { if (aFluid == null) return false; final IFluidTank tTank = getFluidTankFillable((byte) aDirection.ordinal(), new FluidStack(aFluid, 0)); - return tTank != null && (tTank.getFluid() == null || tTank.getFluid().getFluid() == aFluid); + return tTank != null && (tTank.getFluid() == null || tTank.getFluid() + .getFluid() + == aFluid); } @Override public boolean canDrain(ForgeDirection aDirection, Fluid aFluid) { if (aFluid == null) return false; final IFluidTank tTank = getFluidTankDrainable((byte) aDirection.ordinal(), new FluidStack(aFluid, 0)); - return tTank != null && (tTank.getFluid() != null && tTank.getFluid().getFluid() == aFluid); + return tTank != null && (tTank.getFluid() != null && tTank.getFluid() + .getFluid() + == aFluid); } @Override diff --git a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java index a3d94bd97c..8d96ff58f5 100644 --- a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java +++ b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java @@ -218,7 +218,7 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl // `setCapacityMultiplier` for (int i = 0; i < inputTanks.length; i++) { inputTanks[i] = new FluidTankGT(capacity).setCapacityMultiplier(maxParallel * 2L) - .readFromNBT(nbt, NBT.TANK_IN + i); + .readFromNBT(nbt, NBT.TANK_IN + i); } for (int i = 0; i < outputTanks.length; i++) { outputTanks[i] = new FluidTankGT().readFromNBT(nbt, NBT.TANK_OUT + i); @@ -287,8 +287,9 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl @Override public void copyTextures() { // Loading an instance - final TileEntity tCanonicalTileEntity = MultiTileEntityRegistry - .getCanonicalTileEntity(getMultiTileEntityRegistryID(), getMultiTileEntityID()); + final TileEntity tCanonicalTileEntity = MultiTileEntityRegistry.getCanonicalTileEntity( + getMultiTileEntityRegistryID(), + getMultiTileEntityID()); if (tCanonicalTileEntity instanceof MultiTileBasicMachine) { textures = ((MultiTileBasicMachine) tCanonicalTileEntity).textures; texturesInactive = ((MultiTileBasicMachine) tCanonicalTileEntity).texturesInactive; @@ -301,13 +302,14 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl @Override public ITexture[] getTexture(Block aBlock, byte aSide, boolean isActive, int aRenderPass) { if (aSide != facing) { - return new ITexture[] { TextureFactory - .of(textures[GT_Values.FACING_ROTATIONS[facing][aSide]], GT_Util.getRGBaArray(rgba)) }; + return new ITexture[] { TextureFactory.of( + textures[GT_Values.FACING_ROTATIONS[facing][aSide]], + GT_Util.getRGBaArray(rgba)) }; } return new ITexture[] { TextureFactory.of(textures[GT_Values.FACING_ROTATIONS[facing][aSide]], GT_Util.getRGBaArray(rgba)), - TextureFactory - .of((active ? texturesActive : texturesInactive)[GT_Values.FACING_ROTATIONS[facing][aSide]]) }; + TextureFactory.of( + (active ? texturesActive : texturesInactive)[GT_Values.FACING_ROTATIONS[facing][aSide]]) }; } @Override @@ -518,8 +520,13 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl } ProcessingLogic logic = ((ProcessingLogicHost) this).getProcessingLogic(); logic.clear(); - boolean result = logic.setInputItems(inputInventory.getStacks().toArray(new ItemStack[0])) - .setCurrentOutputItems(outputInventory.getStacks().toArray(new ItemStack[0])).process(); + boolean result = logic.setInputItems( + inputInventory.getStacks() + .toArray(new ItemStack[0])) + .setCurrentOutputItems( + outputInventory.getStacks() + .toArray(new ItemStack[0])) + .process(); setDuration(logic.getDuration()); setEut(logic.getEut()); setItemOutputs(logic.getOutputItems()); @@ -591,7 +598,9 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl if (isActive() && activitySound != null) { if (activitySoundLoop == null) { activitySoundLoop = new GT_SoundLoop(activitySound, this, false, true); - Minecraft.getMinecraft().getSoundHandler().playSound(activitySoundLoop); + Minecraft.getMinecraft() + .getSoundHandler() + .playSound(activitySoundLoop); } } else { if (activitySoundLoop != null) { diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockController.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockController.java index f5f36a7b0f..72e766d54c 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockController.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockController.java @@ -176,8 +176,14 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex super.writeMultiTileNBT(nbt); nbt.setBoolean(NBT.STRUCTURE_OK, structureOkay); - nbt.setByte(NBT.ROTATION, (byte) extendedFacing.getRotation().getIndex()); - nbt.setByte(NBT.FLIP, (byte) extendedFacing.getFlip().getIndex()); + nbt.setByte( + NBT.ROTATION, + (byte) extendedFacing.getRotation() + .getIndex()); + nbt.setByte( + NBT.FLIP, + (byte) extendedFacing.getFlip() + .getIndex()); saveUpgradeInventoriesToNBT(nbt); } @@ -684,8 +690,13 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex @Override public boolean placeBlock(S t, World world, int x, int y, int z, ItemStack trigger) { final MultiTileEntityRegistry tRegistry = MultiTileEntityRegistry.getRegistry(registryID); - final MultiTileEntityContainer tContainer = tRegistry - .getNewTileEntityContainer(world, x, y, z, meta, null); + final MultiTileEntityContainer tContainer = tRegistry.getNewTileEntityContainer( + world, + x, + y, + z, + meta, + null); if (tContainer == null) { GT_FML_LOGGER.error("NULL CONTAINER"); return false; @@ -751,7 +762,8 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex final IFluidTank tTank = getFluidTankDrainable(aPart, (byte) aDirection.ordinal(), aFluid); if (tTank == null || tTank.getFluid() == null || tTank.getFluidAmount() == 0 - || !tTank.getFluid().isFluidEqual(aFluid)) + || !tTank.getFluid() + .isFluidEqual(aFluid)) return null; final FluidStack rDrained = tTank.drain(aFluid.amount, aDoDrain); if (rDrained != null && aDoDrain) markInventoryBeenModified(); @@ -772,14 +784,18 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex public boolean canFill(MultiBlockPart aPart, ForgeDirection aDirection, Fluid aFluid) { if (aFluid == null) return false; final IFluidTank tTank = getFluidTankFillable(aPart, (byte) aDirection.ordinal(), new FluidStack(aFluid, 0)); - return tTank != null && (tTank.getFluid() == null || tTank.getFluid().getFluid() == aFluid); + return tTank != null && (tTank.getFluid() == null || tTank.getFluid() + .getFluid() + == aFluid); } @Override public boolean canDrain(MultiBlockPart aPart, ForgeDirection aDirection, Fluid aFluid) { if (aFluid == null) return false; final IFluidTank tTank = getFluidTankDrainable(aPart, (byte) aDirection.ordinal(), new FluidStack(aFluid, 0)); - return tTank != null && (tTank.getFluid() != null && tTank.getFluid().getFluid() == aFluid); + return tTank != null && (tTank.getFluid() != null && tTank.getFluid() + .getFluid() + == aFluid); } @Override @@ -1077,7 +1093,9 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex } final String lockedInventory = aPart.getLockedInventory(); if (lockedInventory != null && !lockedInventory.equals("")) { - str.append(" [Locked: ").append(lockedInventory).append("]"); + str.append(" [Locked: ") + .append(lockedInventory) + .append("]"); } return str.toString(); @@ -1127,17 +1145,25 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex */ protected ItemStack[] getAllItemInputs() { - return getInventoriesForInput().getStacks().toArray(new ItemStack[0]); + return getInventoriesForInput().getStacks() + .toArray(new ItemStack[0]); } protected ItemStack[] getAllOutputItems() { - return getInventoriesForOutput().getStacks().toArray(new ItemStack[0]); + return getInventoriesForOutput().getStacks() + .toArray(new ItemStack[0]); } protected Iterable<Pair<ItemStack[], String>> getItemInputsForEachInventory() { - return multiBlockInputInventory.entrySet().stream() - .map((entry) -> Pair.of(entry.getValue().getStacks().toArray(new ItemStack[0]), entry.getKey())) - .collect(Collectors.toList()); + return multiBlockInputInventory.entrySet() + .stream() + .map( + (entry) -> Pair.of( + entry.getValue() + .getStacks() + .toArray(new ItemStack[0]), + entry.getKey())) + .collect(Collectors.toList()); } protected void setItemOutputs(String inventory, ItemStack... itemOutputs) { @@ -1193,7 +1219,8 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex for (FluidStack fluid : fluidsToOutput) { int index = 0; while (fluid != null && fluid.amount > 0 && index < tanks.size()) { - int filled = tanks.get(index++).fill(fluid, true); + int filled = tanks.get(index++) + .fill(fluid, true); fluid.amount -= filled; } } @@ -1219,12 +1246,15 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex boolean result = false; if (isSeparateInputs()) { for (Pair<ItemStack[], String> inventory : getItemInputsForEachInventory()) { - IItemHandlerModifiable outputInventory = multiBlockOutputInventory - .getOrDefault(inventory.getLeft(), null); + IItemHandlerModifiable outputInventory = multiBlockOutputInventory.getOrDefault( + inventory.getLeft(), + null); result = logic.setInputItems(inventory.getLeft()) - .setCurrentOutputItems( - outputInventory != null ? outputInventory.getStacks().toArray(new ItemStack[0]) : null) - .process(); + .setCurrentOutputItems( + outputInventory != null ? outputInventory.getStacks() + .toArray(new ItemStack[0]) + : null) + .process(); if (result) { inventoryName = inventory.getRight(); break; @@ -1232,7 +1262,9 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex logic.clear(); } } else { - result = logic.setInputItems(getAllItemInputs()).setCurrentOutputItems(getAllOutputItems()).process(); + result = logic.setInputItems(getAllItemInputs()) + .setCurrentOutputItems(getAllOutputItems()) + .process(); } setDuration(logic.getDuration()); setEut(logic.getEut()); @@ -1283,7 +1315,8 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex } protected Widget getGregTechLogo() { - return new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17); + return new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()) + .setSize(17, 17); } @Override @@ -1298,86 +1331,97 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex TabContainer tabs = new TabContainer().setButtonSize(20, 24); tabs.addTabButton( new TabButton(page++) - .setBackground( - false, - ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0, 1f, 0.5f), - new ItemDrawable(getStackForm(1)).withFixedSize(16, 16).withOffset(2, 4)) - .setBackground( - true, - ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0.5f, 1f, 1f), - new ItemDrawable(getStackForm(1)).withFixedSize(16, 16).withOffset(2, 4)) - .addTooltip(getLocalName()).setPos(20 * (page - 1), -20)) - .addPage(createMainPage().setSize(getGUIWidth(), getGUIHeight())); + .setBackground( + false, + ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0, 1f, 0.5f), + new ItemDrawable(getStackForm(1)).withFixedSize(16, 16) + .withOffset(2, 4)) + .setBackground( + true, + ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0.5f, 1f, 1f), + new ItemDrawable(getStackForm(1)).withFixedSize(16, 16) + .withOffset(2, 4)) + .addTooltip(getLocalName()) + .setPos(20 * (page - 1), -20)) + .addPage(createMainPage().setSize(getGUIWidth(), getGUIHeight())); if (hasItemInput()) { tabs.addTabButton( new TabButton(page++) - .setBackground( - false, - ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0, 1f, 0.5f), - GT_UITextures.PICTURE_ITEM_IN.withFixedSize(16, 16).withOffset(2, 4)) - .setBackground( - true, - ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0.5f, 1f, 1f), - GT_UITextures.PICTURE_ITEM_IN.withFixedSize(16, 16).withOffset(2, 4)) - .setPos(20 * (page - 1), -20)) - .addPage( - new MultiChildWidget().addChild(getItemInventoryInputGUI()) - .addChild(getGregTechLogo().setPos(147, 86)) - .setSize(getGUIWidth(), getGUIHeight())); + .setBackground( + false, + ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0, 1f, 0.5f), + GT_UITextures.PICTURE_ITEM_IN.withFixedSize(16, 16) + .withOffset(2, 4)) + .setBackground( + true, + ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0.5f, 1f, 1f), + GT_UITextures.PICTURE_ITEM_IN.withFixedSize(16, 16) + .withOffset(2, 4)) + .setPos(20 * (page - 1), -20)) + .addPage( + new MultiChildWidget().addChild(getItemInventoryInputGUI()) + .addChild(getGregTechLogo().setPos(147, 86)) + .setSize(getGUIWidth(), getGUIHeight())); } if (hasItemOutput()) { tabs.addTabButton( new TabButton(page++) - .setBackground( - false, - ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0, 1f, 0.5f), - GT_UITextures.PICTURE_ITEM_OUT.withFixedSize(16, 16).withOffset(2, 4)) - .setBackground( - true, - ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0.5f, 1f, 1f), - GT_UITextures.PICTURE_ITEM_OUT.withFixedSize(16, 16).withOffset(2, 4)) - .setPos(20 * (page - 1), -20)) - .addPage( - new MultiChildWidget().addChild(getItemInventoryOutputGUI()) - .addChild(getGregTechLogo().setPos(147, 86)) - .setSize(getGUIWidth(), getGUIHeight())); + .setBackground( + false, + ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0, 1f, 0.5f), + GT_UITextures.PICTURE_ITEM_OUT.withFixedSize(16, 16) + .withOffset(2, 4)) + .setBackground( + true, + ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0.5f, 1f, 1f), + GT_UITextures.PICTURE_ITEM_OUT.withFixedSize(16, 16) + .withOffset(2, 4)) + .setPos(20 * (page - 1), -20)) + .addPage( + new MultiChildWidget().addChild(getItemInventoryOutputGUI()) + .addChild(getGregTechLogo().setPos(147, 86)) + .setSize(getGUIWidth(), getGUIHeight())); } if (hasFluidInput()) { tabs.addTabButton( new TabButton(page++) - .setBackground( - false, - ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0, 1f, 0.5f), - GT_UITextures.PICTURE_FLUID_IN.withFixedSize(16, 16).withOffset(2, 4)) - .setBackground( - true, - ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0.5f, 1f, 1f), - GT_UITextures.PICTURE_FLUID_IN.withFixedSize(16, 16).withOffset(2, 4)) - .setPos(20 * (page - 1), -20)) - .addPage( - new MultiChildWidget().addChild(getFluidInventoryInputGUI()) - .addChild(getGregTechLogo().setPos(147, 86)) - .setSize(getGUIWidth(), getGUIHeight())); + .setBackground( + false, + ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0, 1f, 0.5f), + GT_UITextures.PICTURE_FLUID_IN.withFixedSize(16, 16) + .withOffset(2, 4)) + .setBackground( + true, + ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0.5f, 1f, 1f), + GT_UITextures.PICTURE_FLUID_IN.withFixedSize(16, 16) + .withOffset(2, 4)) + .setPos(20 * (page - 1), -20)) + .addPage( + new MultiChildWidget().addChild(getFluidInventoryInputGUI()) + .addChild(getGregTechLogo().setPos(147, 86)) + .setSize(getGUIWidth(), getGUIHeight())); } if (hasFluidOutput()) { tabs.addTabButton( new TabButton(page++) - .setBackground( - false, - ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0, 1f, 0.5f), - GT_UITextures.PICTURE_FLUID_OUT.withFixedSize(16, 16).withOffset(2, 4)) - .setBackground( - true, - ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0.5f, 1f, 1f), - GT_UITextures.PICTURE_FLUID_OUT.withFixedSize(16, 16).withOffset(2, 4)) - .setPos(20 * (page - 1), -20)) - .addPage( - new MultiChildWidget().addChild(getFluidInventoryOutputGUI()) - .addChild(getGregTechLogo().setPos(147, 86)) - .setSize(getGUIWidth(), getGUIHeight())); + .setBackground( + false, + ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0, 1f, 0.5f), + GT_UITextures.PICTURE_FLUID_OUT.withFixedSize(16, 16) + .withOffset(2, 4)) + .setBackground( + true, + ModularUITextures.VANILLA_TAB_TOP_START.getSubArea(0, 0.5f, 1f, 1f), + GT_UITextures.PICTURE_FLUID_OUT.withFixedSize(16, 16) + .withOffset(2, 4)) + .setPos(20 * (page - 1), -20)) + .addPage( + new MultiChildWidget().addChild(getFluidInventoryOutputGUI()) + .addChild(getGregTechLogo().setPos(147, 86)) + .setSize(getGUIWidth(), getGUIHeight())); } builder.widget(tabs); } @@ -1385,26 +1429,30 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex protected MultiChildWidget createMainPage() { MultiChildWidget page = new MultiChildWidget(); page.addChild( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(7, 4).setSize(160, 75)) - .addChild(createButtons()); + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + .setPos(7, 4) + .setSize(160, 75)) + .addChild(createButtons()); return page; } protected MultiChildWidget createButtons() { MultiChildWidget buttons = new MultiChildWidget(); - buttons.setSize(16, 167).setPos(7, 86); + buttons.setSize(16, 167) + .setPos(7, 86); buttons.addChild(createPowerSwitchButton()) - .addChild(new FakeSyncWidget.BooleanSyncer(() -> isAllowedToWork(), val -> { - if (val) enableWorking(); - else disableWorking(); - })).addChild(createVoidExcessButton()) - .addChild(new FakeSyncWidget.BooleanSyncer(() -> voidExcess, val -> voidExcess = val)) - .addChild(createInputSeparationButton()) - .addChild(new FakeSyncWidget.BooleanSyncer(() -> separateInputs, val -> separateInputs = val)) - .addChild(createBatchModeButton()) - .addChild(new FakeSyncWidget.BooleanSyncer(() -> batchMode, val -> batchMode = val)) - .addChild(createLockToSingleRecipeButton()) - .addChild(new FakeSyncWidget.BooleanSyncer(() -> recipeLock, val -> recipeLock = val)); + .addChild(new FakeSyncWidget.BooleanSyncer(() -> isAllowedToWork(), val -> { + if (val) enableWorking(); + else disableWorking(); + })) + .addChild(createVoidExcessButton()) + .addChild(new FakeSyncWidget.BooleanSyncer(() -> voidExcess, val -> voidExcess = val)) + .addChild(createInputSeparationButton()) + .addChild(new FakeSyncWidget.BooleanSyncer(() -> separateInputs, val -> separateInputs = val)) + .addChild(createBatchModeButton()) + .addChild(new FakeSyncWidget.BooleanSyncer(() -> batchMode, val -> batchMode = val)) + .addChild(createLockToSingleRecipeButton()) + .addChild(new FakeSyncWidget.BooleanSyncer(() -> recipeLock, val -> recipeLock = val)); return buttons; } @@ -1415,11 +1463,13 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex for (int rows = 0; rows * 4 < Math.min(inv.getSlots(), 128); rows++) { final int columnsToMake = Math.min(Math.min(inv.getSlots(), 128) - rows * 4, 4); for (int column = 0; column < columnsToMake; column++) { - scrollable - .widget(new SlotWidget(inv, rows * 4 + column).setPos(column * 18, rows * 18).setSize(18, 18)); + scrollable.widget( + new SlotWidget(inv, rows * 4 + column).setPos(column * 18, rows * 18) + .setSize(18, 18)); } } - return scrollable.setSize(18 * 4 + 4, 18 * 5).setPos(52, 7); + return scrollable.setSize(18 * 4 + 4, 18 * 5) + .setPos(52, 7); } protected Widget getItemInventoryOutputGUI() { @@ -1428,11 +1478,13 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex for (int rows = 0; rows * 4 < Math.min(inv.getSlots(), 128); rows++) { final int columnsToMake = Math.min(Math.min(inv.getSlots(), 128) - rows * 4, 4); for (int column = 0; column < columnsToMake; column++) { - scrollable - .widget(new SlotWidget(inv, rows * 4 + column).setPos(column * 18, rows * 18).setSize(18, 18)); + scrollable.widget( + new SlotWidget(inv, rows * 4 + column).setPos(column * 18, rows * 18) + .setSize(18, 18)); } } - return scrollable.setSize(18 * 4 + 4, 18 * 5).setPos(52, 7); + return scrollable.setSize(18 * 4 + 4, 18 * 5) + .setPos(52, 7); } protected IItemHandlerModifiable getInventoriesForInput() { @@ -1450,10 +1502,13 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex final int columnsToMake = Math.min(tanks.length - rows * 4, 4); for (int column = 0; column < columnsToMake; column++) { final FluidSlotWidget fluidSlot = new FluidSlotWidget(tanks[rows * 4 + column]); - scrollable.widget(fluidSlot.setPos(column * 18, rows * 18).setSize(18, 18)); + scrollable.widget( + fluidSlot.setPos(column * 18, rows * 18) + .setSize(18, 18)); } } - return scrollable.setSize(18 * 4 + 4, 18 * 4).setPos(52, 7); + return scrollable.setSize(18 * 4 + 4, 18 * 4) + .setPos(52, 7); } protected Widget getFluidInventoryOutputGUI() { @@ -1464,10 +1519,13 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex for (int column = 0; column < columnsToMake; column++) { final FluidSlotWidget fluidSlot = new FluidSlotWidget(tanks[rows * 4 + column]); fluidSlot.setInteraction(true, false); - scrollable.widget(fluidSlot.setPos(column * 18, rows * 18).setSize(18, 18)); + scrollable.widget( + fluidSlot.setPos(column * 18, rows * 18) + .setSize(18, 18)); } } - return scrollable.setSize(18 * 4 + 4, 18 * 5).setPos(52, 7); + return scrollable.setSize(18 * 4 + 4, 18 * 5) + .setPos(52, 7); } protected ButtonWidget createPowerSwitchButton() { @@ -1477,7 +1535,8 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex } else { enableWorking(); } - }).setPlayClickSound(true); + }) + .setPlayClickSound(true); button.setBackground(() -> { List<UITexture> ret = new ArrayList<>(); ret.add(GT_UITextures.BUTTON_STANDARD); @@ -1487,9 +1546,11 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex ret.add(GT_UITextures.OVERLAY_BUTTON_POWER_SWITCH_OFF); } return ret.toArray(new IDrawable[0]); - }).setPos(144, 0).setSize(16, 16); + }) + .setPos(144, 0) + .setSize(16, 16); button.addTooltip(StatCollector.translateToLocal("GT5U.gui.button.power_switch")) - .setTooltipShowUpDelay(TOOLTIP_DELAY); + .setTooltipShowUpDelay(TOOLTIP_DELAY); return button; } @@ -1498,7 +1559,8 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex if (isVoidExcessButtonEnabled()) { voidExcess = !voidExcess; } - }).setPlayClickSound(true); + }) + .setPlayClickSound(true); button.setBackground(() -> { List<UITexture> ret = new ArrayList<>(); ret.add(GT_UITextures.BUTTON_STANDARD); @@ -1516,9 +1578,11 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex } } return ret.toArray(new IDrawable[0]); - }).setPos(54, 0).setSize(16, 16); + }) + .setPos(54, 0) + .setSize(16, 16); button.addTooltip(StatCollector.translateToLocal("GT5U.gui.button.void_excess")) - .setTooltipShowUpDelay(TOOLTIP_DELAY); + .setTooltipShowUpDelay(TOOLTIP_DELAY); return button; } @@ -1535,26 +1599,32 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex if (isInputSeparationButtonEnabled()) { separateInputs = !separateInputs; } - }).setPlayClickSound(true).setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(GT_UITextures.BUTTON_STANDARD); - if (isInputSeparationButtonEnabled()) { - if (isInputSeparationEnabled()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_ON); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_OFF); - } - } else { - if (isInputSeparationEnabled()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_ON_DISABLED); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_OFF_DISABLED); - } - } - return ret.toArray(new IDrawable[0]); - }).setPos(36, 0).setSize(16, 16); + }) + .setPlayClickSound(true) + .setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(GT_UITextures.BUTTON_STANDARD); + if (isInputSeparationButtonEnabled()) { + if (isInputSeparationEnabled()) { + ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_ON); + } else { + ret.add(GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_OFF); + } + } else { + if (isInputSeparationEnabled()) { + ret.add( + GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_ON_DISABLED); + } else { + ret.add( + GT_UITextures.OVERLAY_BUTTON_INPUT_SEPARATION_OFF_DISABLED); + } + } + return ret.toArray(new IDrawable[0]); + }) + .setPos(36, 0) + .setSize(16, 16); button.addTooltip(StatCollector.translateToLocal("GT5U.gui.button.input_separation")) - .setTooltipShowUpDelay(TOOLTIP_DELAY); + .setTooltipShowUpDelay(TOOLTIP_DELAY); return (ButtonWidget) button; } @@ -1571,26 +1641,30 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex if (isBatchModeButtonEnabled()) { batchMode = !batchMode; } - }).setPlayClickSound(true).setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(GT_UITextures.BUTTON_STANDARD); - if (isBatchModeButtonEnabled()) { - if (isBatchModeEnabled()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_ON); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_OFF); - } - } else { - if (isBatchModeEnabled()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_ON_DISABLED); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_OFF_DISABLED); - } - } - return ret.toArray(new IDrawable[0]); - }).setPos(18, 0).setSize(16, 16); + }) + .setPlayClickSound(true) + .setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(GT_UITextures.BUTTON_STANDARD); + if (isBatchModeButtonEnabled()) { + if (isBatchModeEnabled()) { + ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_ON); + } else { + ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_OFF); + } + } else { + if (isBatchModeEnabled()) { + ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_ON_DISABLED); + } else { + ret.add(GT_UITextures.OVERLAY_BUTTON_BATCH_MODE_OFF_DISABLED); + } + } + return ret.toArray(new IDrawable[0]); + }) + .setPos(18, 0) + .setSize(16, 16); button.addTooltip(StatCollector.translateToLocal("GT5U.gui.button.batch_mode")) - .setTooltipShowUpDelay(TOOLTIP_DELAY); + .setTooltipShowUpDelay(TOOLTIP_DELAY); return (ButtonWidget) button; } @@ -1607,26 +1681,30 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex if (supportsSingleRecipeLocking()) { recipeLock = !recipeLock; } - }).setPlayClickSound(true).setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(GT_UITextures.BUTTON_STANDARD); - if (supportsSingleRecipeLocking()) { - if (isRecipeLockingEnabled()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_LOCKED); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_UNLOCKED); - } - } else { - if (isRecipeLockingEnabled()) { - ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_LOCKED_DISABLED); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_UNLOCKED_DISABLED); - } - } - return ret.toArray(new IDrawable[0]); - }).setPos(0, 0).setSize(16, 16); + }) + .setPlayClickSound(true) + .setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(GT_UITextures.BUTTON_STANDARD); + if (supportsSingleRecipeLocking()) { + if (isRecipeLockingEnabled()) { + ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_LOCKED); + } else { + ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_UNLOCKED); + } + } else { + if (isRecipeLockingEnabled()) { + ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_LOCKED_DISABLED); + } else { + ret.add(GT_UITextures.OVERLAY_BUTTON_RECIPE_UNLOCKED_DISABLED); + } + } + return ret.toArray(new IDrawable[0]); + }) + .setPos(0, 0) + .setSize(16, 16); button.addTooltip(StatCollector.translateToLocal("GT5U.gui.button.lock_recipe")) - .setTooltipShowUpDelay(TOOLTIP_DELAY); + .setTooltipShowUpDelay(TOOLTIP_DELAY); return (ButtonWidget) button; } diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java index 9d40732b74..0ea8cd77c8 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java @@ -335,8 +335,9 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity @Override public void copyTextures() { // Loading an instance - final TileEntity tCanonicalTileEntity = MultiTileEntityRegistry - .getCanonicalTileEntity(getMultiTileEntityRegistryID(), getMultiTileEntityID()); + final TileEntity tCanonicalTileEntity = MultiTileEntityRegistry.getCanonicalTileEntity( + getMultiTileEntityRegistryID(), + getMultiTileEntityID()); if (tCanonicalTileEntity instanceof MultiBlockPart) textures = ((MultiBlockPart) tCanonicalTileEntity).textures; } @@ -662,11 +663,14 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity for (int rows = 0; rows * 4 < Math.min(inv.getSlots(), 128); rows++) { int columnsToMake = Math.min(Math.min(inv.getSlots(), 128) - rows * 4, 4); for (int column = 0; column < columnsToMake; column++) { - scrollable - .widget(new SlotWidget(inv, rows * 4 + column).setPos(column * 18, rows * 18).setSize(18, 18)); + scrollable.widget( + new SlotWidget(inv, rows * 4 + column).setPos(column * 18, rows * 18) + .setSize(18, 18)); } } - builder.widget(scrollable.setSize(18 * 4 + 4, 18 * 4).setPos(52, 18)); + builder.widget( + scrollable.setSize(18 * 4 + 4, 18 * 4) + .setPos(52, 18)); DropDownWidget dropDown = new DropDownWidget(); dropDown.addDropDownItemsSimple( controller.getInventoryNames(this), @@ -684,8 +688,11 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity }, true); builder.widget( - dropDown.setSelected(mLockedInventoryIndex).setExpandedMaxHeight(60) - .setDirection(DropDownWidget.Direction.DOWN).setPos(53, 5).setSize(70, 11)); + dropDown.setSelected(mLockedInventoryIndex) + .setExpandedMaxHeight(60) + .setDirection(DropDownWidget.Direction.DOWN) + .setPos(53, 5) + .setSize(70, 11)); } protected String getNameOfInventoryFromIndex(final IMultiBlockController controller, int index) { @@ -710,10 +717,14 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity if (modeSelected(FLUID_OUT)) { fluidSlot.setInteraction(true, false); } - scrollable.widget(fluidSlot.setPos(column * 18, rows * 18).setSize(18, 18)); + scrollable.widget( + fluidSlot.setPos(column * 18, rows * 18) + .setSize(18, 18)); } } - builder.widget(scrollable.setSize(18 * 4 + 4, 18 * 4).setPos(52, 7)); + builder.widget( + scrollable.setSize(18 * 4 + 4, 18 * 4) + .setPos(52, 7)); } @Override @@ -747,8 +758,9 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity public void addGregTechLogo(Builder builder) { if (modeSelected(ITEM_IN, ITEM_OUT)) { builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17) - .setPos(152, 74)); + new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()) + .setSize(17, 17) + .setPos(152, 74)); } else { super.addGregTechLogo(builder); } diff --git a/src/main/java/gregtech/api/net/GT_Packet_Pollution.java b/src/main/java/gregtech/api/net/GT_Packet_Pollution.java index b095dd6238..c298af2db4 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_Pollution.java +++ b/src/main/java/gregtech/api/net/GT_Packet_Pollution.java @@ -25,7 +25,9 @@ public class GT_Packet_Pollution extends GT_Packet_New { @Override public void encode(ByteBuf aOut) { - aOut.writeInt(chunk.chunkXPos).writeInt(chunk.chunkZPos).writeInt(pollution); + aOut.writeInt(chunk.chunkXPos) + .writeInt(chunk.chunkZPos) + .writeInt(pollution); } @Override diff --git a/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java b/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java index 66faa2c7d7..971ed66aec 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java +++ b/src/main/java/gregtech/api/net/GT_Packet_SendCoverData.java @@ -88,7 +88,9 @@ public class GT_Packet_SendCoverData extends GT_Packet_New { aData.readInt(), aData.readByte(), coverId = aData.readInt(), - GregTech_API.getCoverBehaviorNew(coverId).createDataObject().readFromPacket(aData, null)); + GregTech_API.getCoverBehaviorNew(coverId) + .createDataObject() + .readFromPacket(aData, null)); } @Override diff --git a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java b/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java index 917e0865da..ac72730705 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java +++ b/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java @@ -101,8 +101,10 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New { final IConfigurationCircuitSupport machine = ((BaseTileEntity) tile).getConfigurationCircuitSupport(); if (machine == null) return; if (!machine.allowSelectCircuit()) return; - machine.getConfigurationCircuits().stream().filter(stack -> GT_Utility.areStacksEqual(stack, circuit)) - .findFirst() - .ifPresent(stack -> ((IHasInventory) tile).setInventorySlotContents(machine.getCircuitSlot(), stack)); + machine.getConfigurationCircuits() + .stream() + .filter(stack -> GT_Utility.areStacksEqual(stack, circuit)) + .findFirst() + .ifPresent(stack -> ((IHasInventory) tile).setInventorySlotContents(machine.getCircuitSlot(), stack)); } } diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java index cb38ca5d32..99a5c55dc6 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntity.java @@ -138,8 +138,19 @@ public class GT_Packet_TileEntity extends GT_Packet_New { mUpdate, mRedstone, mColor); - else if (tTileEntity instanceof BaseMetaPipeEntity) ((BaseMetaPipeEntity) tTileEntity) - .receiveMetaTileEntityData(mID, mC0, mC1, mC2, mC3, mC4, mC5, mTexture, mUpdate, mRedstone, mColor); + else if (tTileEntity instanceof BaseMetaPipeEntity) + ((BaseMetaPipeEntity) tTileEntity).receiveMetaTileEntityData( + mID, + mC0, + mC1, + mC2, + mC3, + mC4, + mC5, + mTexture, + mUpdate, + mRedstone, + mColor); } catch (Exception e) { GT_Mod.GT_FML_LOGGER.error( "Exception setting tile entity data for tile entity {} at ({}, {}, {})", diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java index f14e000a3b..86321f9287 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java @@ -177,7 +177,9 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { aData.readInt(), aData.readByte(), coverID = aData.readInt(), - GregTech_API.getCoverBehaviorNew(coverID).createDataObject().readFromPacket(aData, null), + GregTech_API.getCoverBehaviorNew(coverID) + .createDataObject() + .readFromPacket(aData, null), aData.readInt(), aData.readInt(), aData.readInt()); @@ -207,7 +209,8 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { if (gui instanceof GT_GUICover) { ((GT_GUICover) gui).setParentGuiId(parentGuiId); } - Minecraft.getMinecraft().displayGuiScreen(gui); + Minecraft.getMinecraft() + .displayGuiScreen(gui); } } } diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java index 562edc9770..453ed88e60 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverNew.java @@ -96,7 +96,9 @@ public class GT_Packet_TileEntityCoverNew extends GT_Packet_New { aData.readInt(), aData.readByte(), coverId = aData.readInt(), - GregTech_API.getCoverBehaviorNew(coverId).createDataObject().readFromPacket(aData, mPlayer), + GregTech_API.getCoverBehaviorNew(coverId) + .createDataObject() + .readFromPacket(aData, mPlayer), aData.readInt()); } diff --git a/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java b/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java index cac5405eec..6f0f8d215d 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java +++ b/src/main/java/gregtech/api/net/GT_Packet_WirelessRedstoneCover.java @@ -88,7 +88,9 @@ public class GT_Packet_WirelessRedstoneCover extends GT_Packet_TileEntityCover { if (world != null && world.blockExists(mX, mY, mZ)) { TileEntity tile = world.getTileEntity(mX, mY, mZ); if (tile instanceof IGregTechTileEntity && !((IGregTechTileEntity) tile).isDead()) { - int tPrivateChannel = (mCheckBoxValue > 0) ? mPlayer.getUniqueID().hashCode() & PRIVATE_MASK : 0; + int tPrivateChannel = (mCheckBoxValue > 0) ? mPlayer.getUniqueID() + .hashCode() + & PRIVATE_MASK : 0; int tCoverData = tPrivateChannel | (mCheckBoxValue & CHECKBOX_MASK) | (mPublicChannel & PUBLIC_MASK); ((IGregTechTileEntity) tile).receiveCoverData(side, coverID, tCoverData); } diff --git a/src/main/java/gregtech/api/objects/GT_ChunkManager.java b/src/main/java/gregtech/api/objects/GT_ChunkManager.java index 291e669741..6101deedbc 100644 --- a/src/main/java/gregtech/api/objects/GT_ChunkManager.java +++ b/src/main/java/gregtech/api/objects/GT_ChunkManager.java @@ -46,9 +46,12 @@ public class GT_ChunkManager List<Ticket> validTickets = new ArrayList<>(); if (GT_Values.alwaysReloadChunkloaders) { for (Ticket ticket : tickets) { - int x = ticket.getModData().getInteger("OwnerX"); - int y = ticket.getModData().getInteger("OwnerY"); - int z = ticket.getModData().getInteger("OwnerZ"); + int x = ticket.getModData() + .getInteger("OwnerX"); + int y = ticket.getModData() + .getInteger("OwnerY"); + int z = ticket.getModData() + .getInteger("OwnerZ"); if (y > 0) { TileEntity tile = world.getTileEntity(x, y, z); if (tile != null && tile instanceof IGregTechTileEntity @@ -59,8 +62,7 @@ public class GT_ChunkManager if (((IGregTechTileEntity) tile).getMetaTileEntity() instanceof IChunkLoader) ForgeChunkManager.forceChunk( ticket, - ((IChunkLoader) ((IGregTechTileEntity) tile).getMetaTileEntity()) - .getActiveChunk()); + ((IChunkLoader) ((IGregTechTileEntity) tile).getMetaTileEntity()).getActiveChunk()); validTickets.add(ticket); } } @@ -86,16 +88,21 @@ public class GT_ChunkManager public static boolean requestPlayerChunkLoad(TileEntity owner, ChunkCoordIntPair chunkXZ, String player) { if (!GT_Values.enableChunkloaders) return false; if (!GT_Values.alwaysReloadChunkloaders && chunkXZ == null) return false; - if (GT_Values.debugChunkloaders && chunkXZ != null) GT_Log.out - .println("GT_ChunkManager: Chunk request: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")"); + if (GT_Values.debugChunkloaders && chunkXZ != null) GT_Log.out.println( + "GT_ChunkManager: Chunk request: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")"); if (instance.registeredTickets.containsKey(owner)) { ForgeChunkManager.forceChunk(instance.registeredTickets.get(owner), chunkXZ); } else { Ticket ticket; - if (player.equals("")) ticket = ForgeChunkManager - .requestTicket(GT_Mod.instance, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL); - else ticket = ForgeChunkManager - .requestPlayerTicket(GT_Mod.instance, player, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL); + if (player.equals("")) ticket = ForgeChunkManager.requestTicket( + GT_Mod.instance, + owner.getWorldObj(), + ForgeChunkManager.Type.NORMAL); + else ticket = ForgeChunkManager.requestPlayerTicket( + GT_Mod.instance, + player, + owner.getWorldObj(), + ForgeChunkManager.Type.NORMAL); if (ticket == null) { if (GT_Values.debugChunkloaders) GT_Log.out.println("GT_ChunkManager: ForgeChunkManager.requestTicket failed"); @@ -128,8 +135,8 @@ public class GT_ChunkManager if (!GT_Values.enableChunkloaders) return; Ticket ticket = instance.registeredTickets.get(owner); if (ticket != null) { - if (GT_Values.debugChunkloaders) GT_Log.out - .println("GT_ChunkManager: Chunk release: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")"); + if (GT_Values.debugChunkloaders) GT_Log.out.println( + "GT_ChunkManager: Chunk release: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")"); ForgeChunkManager.unforceChunk(ticket, chunkXZ); } } @@ -146,8 +153,8 @@ public class GT_ChunkManager + ", " + owner.zCoord + ")"); - for (ChunkCoordIntPair chunk : ticket.getChunkList()) GT_Log.out - .println("GT_ChunkManager: Chunk release: (" + chunk.chunkXPos + ", " + chunk.chunkZPos + ")"); + for (ChunkCoordIntPair chunk : ticket.getChunkList()) GT_Log.out.println( + "GT_ChunkManager: Chunk release: (" + chunk.chunkXPos + ", " + chunk.chunkZPos + ")"); } ForgeChunkManager.releaseTicket(ticket); instance.registeredTickets.remove(owner); diff --git a/src/main/java/gregtech/api/objects/GT_FluidStack.java b/src/main/java/gregtech/api/objects/GT_FluidStack.java index 55bbf712fa..b5b6f6ff19 100644 --- a/src/main/java/gregtech/api/objects/GT_FluidStack.java +++ b/src/main/java/gregtech/api/objects/GT_FluidStack.java @@ -18,8 +18,8 @@ import gregtech.api.util.GT_Utility; */ public class GT_FluidStack extends FluidStack { - private static final Collection<GT_FluidStack> sAllFluidStacks = Collections - .newSetFromMap(new WeakHashMap<>(10000)); + private static final Collection<GT_FluidStack> sAllFluidStacks = Collections.newSetFromMap( + new WeakHashMap<>(10000)); private static volatile boolean lock = false; private Fluid mFluid; @@ -57,7 +57,8 @@ public class GT_FluidStack extends FluidStack { if (ForgeVersion.getBuildVersion() < 1355 && ForgeVersion.getRevisionVersion() < 4) { int fluidID; try { - fluidID = this.getFluid().getID(); + fluidID = this.getFluid() + .getID(); } catch (Throwable e) { System.err.println(e); } @@ -79,7 +80,11 @@ public class GT_FluidStack extends FluidStack { @Override public String toString() { - return String - .format("GT_FluidStack: %s x %s, ID:%s", this.amount, this.getFluid().getName(), this.getFluidID()); + return String.format( + "GT_FluidStack: %s x %s, ID:%s", + this.amount, + this.getFluid() + .getName(), + this.getFluidID()); } } diff --git a/src/main/java/gregtech/api/objects/GT_HashSet.java b/src/main/java/gregtech/api/objects/GT_HashSet.java index 578d22a4a3..1f12b669b3 100644 --- a/src/main/java/gregtech/api/objects/GT_HashSet.java +++ b/src/main/java/gregtech/api/objects/GT_HashSet.java @@ -44,7 +44,8 @@ public class GT_HashSet<E extends GT_ItemStack> extends AbstractSet<E> { @Override public Iterator<E> iterator() { - return (Iterator<E>) map.keySet().iterator(); + return (Iterator<E>) map.keySet() + .iterator(); } @Override diff --git a/src/main/java/gregtech/api/objects/GT_StdRenderedTexture.java b/src/main/java/gregtech/api/objects/GT_StdRenderedTexture.java index 079260c7dc..e40fb96ef2 100644 --- a/src/main/java/gregtech/api/objects/GT_StdRenderedTexture.java +++ b/src/main/java/gregtech/api/objects/GT_StdRenderedTexture.java @@ -35,7 +35,8 @@ public class GT_StdRenderedTexture extends GT_RenderedTexture { @Override public void renderYNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) { LightingHelper lighting = new LightingHelper(aRenderer); - lighting.setupLightingYNeg(aBlock, aX, aY, aZ).setupColor(ForgeDirection.DOWN.ordinal(), mRGBa); + lighting.setupLightingYNeg(aBlock, aX, aY, aZ) + .setupColor(ForgeDirection.DOWN.ordinal(), mRGBa); aRenderer.renderFaceYNeg(aBlock, aX, aY, aZ, mIconContainer.getIcon()); if (mIconContainer.getOverlayIcon() != null) { lighting.setupColor(ForgeDirection.DOWN.ordinal(), 0xffffff); diff --git a/src/main/java/gregtech/api/objects/GT_UO_Dimension.java b/src/main/java/gregtech/api/objects/GT_UO_Dimension.java index fffa68fadf..4f534956c7 100644 --- a/src/main/java/gregtech/api/objects/GT_UO_Dimension.java +++ b/src/main/java/gregtech/api/objects/GT_UO_Dimension.java @@ -17,12 +17,16 @@ public class GT_UO_Dimension { fFluids = HashBiMap.create(); if (aConfigCategory.containsKey("Dimension")) { aConfigCategory.get("Dimension").comment = "Dimension ID or Class Name"; - Dimension = aConfigCategory.get("Dimension").getString(); + Dimension = aConfigCategory.get("Dimension") + .getString(); } maxChance = 0; // GT_FML_LOGGER.info("GT UO "+aConfigCategory.getName()+" Dimension:"+Dimension); - for (int i = 0; i < aConfigCategory.getChildren().size(); i++) { - GT_UO_Fluid fluid = new GT_UO_Fluid((ConfigCategory) aConfigCategory.getChildren().toArray()[i]); + for (int i = 0; i < aConfigCategory.getChildren() + .size(); i++) { + GT_UO_Fluid fluid = new GT_UO_Fluid( + (ConfigCategory) aConfigCategory.getChildren() + .toArray()[i]); fFluids.put(fluid.Registry, fluid); maxChance += fluid.Chance; } @@ -40,7 +44,8 @@ public class GT_UO_Dimension { } public String getUOFluidKey(GT_UO_Fluid uoFluid) { - return fFluids.inverse().get(uoFluid); + return fFluids.inverse() + .get(uoFluid); } public GT_UO_Fluid getUOFluid(String key) { diff --git a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java b/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java index e717f857d5..cd03380d8d 100644 --- a/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java +++ b/src/main/java/gregtech/api/objects/GT_UO_DimensionList.java @@ -24,7 +24,10 @@ public class GT_UO_DimensionList { if (fDimensionList.containsKey(Integer.toString(aDimension))) return fDimensionList.get(Integer.toString(aDimension)); for (BiMap.Entry<String, GT_UO_Dimension> dl : fDimensionList.entrySet()) - if (DimensionManager.getProvider(aDimension).getClass().getName().contains(dl.getValue().Dimension)) + if (DimensionManager.getProvider(aDimension) + .getClass() + .getName() + .contains(dl.getValue().Dimension)) return dl.getValue(); return fDimensionList.get("Default"); } @@ -41,14 +44,19 @@ public class GT_UO_DimensionList { public void SetConfigValues(String aDimensionName, String aDimension, String aName, String aRegistry, int aMinAmount, int aMaxAmount, int aChance, int aDecreasePerOperationAmount) { String Category = fCategory + "." + aDimensionName; - fConfig.get(Category, "Dimension", aDimension).getString(); + fConfig.get(Category, "Dimension", aDimension) + .getString(); Category += "." + aName; - fConfig.get(Category, "Registry", aRegistry).getString(); - fConfig.get(Category, "MinAmount", aMinAmount).getInt(aMinAmount); - fConfig.get(Category, "MaxAmount", aMaxAmount).getInt(aMaxAmount); - fConfig.get(Category, "Chance", aChance).getInt(aChance); + fConfig.get(Category, "Registry", aRegistry) + .getString(); + fConfig.get(Category, "MinAmount", aMinAmount) + .getInt(aMinAmount); + fConfig.get(Category, "MaxAmount", aMaxAmount) + .getInt(aMaxAmount); + fConfig.get(Category, "Chance", aChance) + .getInt(aChance); fConfig.get(Category, "DecreasePerOperationAmount", aDecreasePerOperationAmount) - .getInt(aDecreasePerOperationAmount); + .getInt(aDecreasePerOperationAmount); // IT IS IN BUCKETS!!! } @@ -74,12 +82,17 @@ public class GT_UO_DimensionList { fConfig.setCategoryComment(fCategory + ".Moon", "Set Moon Generating"); blackList = new int[] { -1, 1 }; - blackList = aConfig.get(fCategory, "DimBlackList", blackList, "Dimension IDs Black List").getIntList(); + blackList = aConfig.get(fCategory, "DimBlackList", blackList, "Dimension IDs Black List") + .getIntList(); java.util.Arrays.sort(blackList); - for (int i = 0; i < fConfig.getCategory(fCategory).getChildren().size(); i++) { + for (int i = 0; i < fConfig.getCategory(fCategory) + .getChildren() + .size(); i++) { GT_UO_Dimension Dimension = new GT_UO_Dimension( - (ConfigCategory) fConfig.getCategory(fCategory).getChildren().toArray()[i]); + (ConfigCategory) fConfig.getCategory(fCategory) + .getChildren() + .toArray()[i]); fDimensionList.put(Dimension.Dimension, Dimension); } } diff --git a/src/main/java/gregtech/api/objects/GT_UO_Fluid.java b/src/main/java/gregtech/api/objects/GT_UO_Fluid.java index 7916131b63..555d8856b2 100644 --- a/src/main/java/gregtech/api/objects/GT_UO_Fluid.java +++ b/src/main/java/gregtech/api/objects/GT_UO_Fluid.java @@ -19,26 +19,31 @@ public class GT_UO_Fluid { public GT_UO_Fluid(ConfigCategory aConfigCategory) { // TODO CONFIGURE if (aConfigCategory.containsKey("Registry")) { aConfigCategory.get("Registry").comment = "Fluid registry name"; - Registry = aConfigCategory.get("Registry").getString(); + Registry = aConfigCategory.get("Registry") + .getString(); } if (aConfigCategory.containsKey("MaxAmount")) { - aConfigCategory - .get("MaxAmount").comment = "Max amount generation (per operation, sets the VeinData) 80000 MAX"; - MaxAmount = aConfigCategory.get("MaxAmount").getInt(0); + aConfigCategory.get( + "MaxAmount").comment = "Max amount generation (per operation, sets the VeinData) 80000 MAX"; + MaxAmount = aConfigCategory.get("MaxAmount") + .getInt(0); } if (aConfigCategory.containsKey("MinAmount")) { aConfigCategory.get("MinAmount").comment = "Min amount generation (per operation, sets the VeinData) 0 MIN"; - MinAmount = aConfigCategory.get("MinAmount").getInt(0); + MinAmount = aConfigCategory.get("MinAmount") + .getInt(0); } if (aConfigCategory.containsKey("Chance")) { aConfigCategory.get( "Chance").comment = "Chance generating (weighted chance!, there will be a fluid in chunk always!)"; - Chance = aConfigCategory.get("Chance").getInt(0); + Chance = aConfigCategory.get("Chance") + .getInt(0); } if (aConfigCategory.containsKey("DecreasePerOperationAmount")) { aConfigCategory.get( "DecreasePerOperationAmount").comment = "Decrease per operation (actual fluid gained works like (Litre)VeinData/5000)"; - DecreasePerOperationAmount = aConfigCategory.get("DecreasePerOperationAmount").getInt(5); + DecreasePerOperationAmount = aConfigCategory.get("DecreasePerOperationAmount") + .getInt(5); } // GT_FML_LOGGER.info("GT UO "+aConfigCategory.getName()+" Fluid:"+Registry+" Max:"+MaxAmount+" // Min:"+MinAmount+" Chance:"+Chance); diff --git a/src/main/java/gregtech/api/objects/ItemData.java b/src/main/java/gregtech/api/objects/ItemData.java index 52abab19cb..72d5cc5900 100644 --- a/src/main/java/gregtech/api/objects/ItemData.java +++ b/src/main/java/gregtech/api/objects/ItemData.java @@ -121,6 +121,8 @@ public class ItemData { @Override public String toString() { if (mPrefix == null || mMaterial == null || mMaterial.mMaterial == null) return ""; - return String.valueOf(new StringBuilder().append(mPrefix.name()).append(mMaterial.mMaterial.mName)); + return String.valueOf( + new StringBuilder().append(mPrefix.name()) + .append(mMaterial.mMaterial.mName)); } } diff --git a/src/main/java/gregtech/api/objects/ReverseShapedRecipe.java b/src/main/java/gregtech/api/objects/ReverseShapedRecipe.java index 5dd14186e1..9b0507402c 100644 --- a/src/main/java/gregtech/api/objects/ReverseShapedRecipe.java +++ b/src/main/java/gregtech/api/objects/ReverseShapedRecipe.java @@ -35,8 +35,10 @@ public class ReverseShapedRecipe { if (!recipeOptional.isPresent()) continue; GT_Recipe recipe = recipeOptional.get(); ItemStack[] replacement = new ItemStack[recipe.mOutputs.length]; - GT_MetaTileEntity_Disassembler - .handleRecipeTransformation(recipe.mOutputs, replacement, Collections.singleton(recipe.mOutputs)); + GT_MetaTileEntity_Disassembler.handleRecipeTransformation( + recipe.mOutputs, + replacement, + Collections.singleton(recipe.mOutputs)); recipe.mOutputs = replacement; sDisassemblerRecipes.add(recipe); diff --git a/src/main/java/gregtech/api/objects/ReverseShapelessRecipe.java b/src/main/java/gregtech/api/objects/ReverseShapelessRecipe.java index 656f7728c5..a872f2a8f0 100644 --- a/src/main/java/gregtech/api/objects/ReverseShapelessRecipe.java +++ b/src/main/java/gregtech/api/objects/ReverseShapelessRecipe.java @@ -35,8 +35,10 @@ public class ReverseShapelessRecipe { if (!recipeOptional.isPresent()) continue; GT_Recipe recipe = recipeOptional.get(); ItemStack[] replacement = new ItemStack[recipe.mOutputs.length]; - GT_MetaTileEntity_Disassembler - .handleRecipeTransformation(recipe.mOutputs, replacement, Collections.singleton(recipe.mOutputs)); + GT_MetaTileEntity_Disassembler.handleRecipeTransformation( + recipe.mOutputs, + replacement, + Collections.singleton(recipe.mOutputs)); recipe.mOutputs = replacement; sDisassemblerRecipes.add(recipe); diff --git a/src/main/java/gregtech/api/objects/XSTR.java b/src/main/java/gregtech/api/objects/XSTR.java index cd4f0e6bb4..d9c0b4bdb1 100644 --- a/src/main/java/gregtech/api/objects/XSTR.java +++ b/src/main/java/gregtech/api/objects/XSTR.java @@ -39,7 +39,9 @@ public class XSTR extends Random { @Override public synchronized void setSeed(long seed) { - if (!Thread.currentThread().getStackTrace()[2].getClassName().equals(Random.class.getName())) + if (!Thread.currentThread() + .getStackTrace()[2].getClassName() + .equals(Random.class.getName())) throw new NoSuchMethodError("This is meant to be shared!, leave seed state alone!"); } }; diff --git a/src/main/java/gregtech/api/render/TextureFactory.java b/src/main/java/gregtech/api/render/TextureFactory.java index 1cc5b51717..06a883bd1c 100644 --- a/src/main/java/gregtech/api/render/TextureFactory.java +++ b/src/main/java/gregtech/api/render/TextureFactory.java @@ -48,7 +48,8 @@ public final class TextureFactory { * @return The instance of an {@link ITexture} implementation */ public static ITexture of(final ITexture... textures) { - return builder().addLayer(textures).build(); + return builder().addLayer(textures) + .build(); } /** @@ -65,7 +66,10 @@ public final class TextureFactory { */ public static ITexture of(final IIconContainer bottom, final IIconContainer top, final IIconContainer north, final IIconContainer south, final IIconContainer west, final IIconContainer east, final short[] rgba) { - return builder().addIcon(bottom, top, north, south, west, east).setRGBA(rgba).setAllowAlpha(true).build(); + return builder().addIcon(bottom, top, north, south, west, east) + .setRGBA(rgba) + .setAllowAlpha(true) + .build(); } /** @@ -79,7 +83,10 @@ public final class TextureFactory { */ public static ITexture of(final IIconContainer bottom, final IIconContainer top, final IIconContainer sides, final short[] rgba) { - return builder().addIcon(bottom, top, sides, sides, sides, sides).setRGBA(rgba).setAllowAlpha(true).build(); + return builder().addIcon(bottom, top, sides, sides, sides, sides) + .setRGBA(rgba) + .setAllowAlpha(true) + .build(); } /** @@ -91,15 +98,21 @@ public final class TextureFactory { * @return The instance of an {@link ITexture} implementation */ public static ITexture of(final IIconContainer iconContainer, final short[] rgba, final boolean allowAlpha) { - return builder().addIcon(iconContainer).setRGBA(rgba).setAllowAlpha(allowAlpha).build(); + return builder().addIcon(iconContainer) + .setRGBA(rgba) + .setAllowAlpha(allowAlpha) + .build(); } public static ITexture of(final IIconContainer iconContainer, final short[] rgba) { - return builder().addIcon(iconContainer).setRGBA(rgba).build(); + return builder().addIcon(iconContainer) + .setRGBA(rgba) + .build(); } public static ITexture of(final IIconContainer iconContainer) { - return builder().addIcon(iconContainer).build(); + return builder().addIcon(iconContainer) + .build(); } /** @@ -112,15 +125,21 @@ public final class TextureFactory { * @return The instance of an {@link ITexture} implementation */ public static ITexture of(final Block block, final int meta, final ForgeDirection side, final short[] rgba) { - return builder().setFromBlock(block, meta).setFromSide(side).setRGBA(rgba).build(); + return builder().setFromBlock(block, meta) + .setFromSide(side) + .setRGBA(rgba) + .build(); } public static ITexture of(final Block block, final int meta, final ForgeDirection side) { - return builder().setFromBlock(block, meta).setFromSide(side).build(); + return builder().setFromBlock(block, meta) + .setFromSide(side) + .build(); } public static ITexture of(final Block block, final int meta) { - return builder().setFromBlock(block, meta).build(); + return builder().setFromBlock(block, meta) + .build(); } public static ITexture of(final Block block) { diff --git a/src/main/java/gregtech/api/threads/GT_Runnable_Cable_Update.java b/src/main/java/gregtech/api/threads/GT_Runnable_Cable_Update.java index ee555c2492..e4febba51f 100644 --- a/src/main/java/gregtech/api/threads/GT_Runnable_Cable_Update.java +++ b/src/main/java/gregtech/api/threads/GT_Runnable_Cable_Update.java @@ -55,8 +55,8 @@ public class GT_Runnable_Cable_Update extends GT_Runnable_MachineBlockUpdate { && ((BaseMetaPipeEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaPipeEntity_Cable) { ChunkCoordinates tCoords; for (byte tSide : ALL_VALID_SIDES) { - if (((GT_MetaPipeEntity_Cable) ((BaseMetaPipeEntity) tTileEntity).getMetaTileEntity()) - .isConnectedAtSide(tSide)) { + if (((GT_MetaPipeEntity_Cable) ((BaseMetaPipeEntity) tTileEntity).getMetaTileEntity()).isConnectedAtSide( + tSide)) { final ForgeDirection offset = ForgeDirection.getOrientation(tSide); if (visited.add( tCoords = new ChunkCoordinates( diff --git a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java index 06553730da..f06c3ac06b 100644 --- a/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java +++ b/src/main/java/gregtech/api/threads/GT_Runnable_MachineBlockUpdate.java @@ -76,8 +76,13 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable { } public static void initExecutorService() { - EXECUTOR_SERVICE = Executors - .newFixedThreadPool(Math.max(1, (Runtime.getRuntime().availableProcessors() * 2 / 3)), THREAD_FACTORY); + EXECUTOR_SERVICE = Executors.newFixedThreadPool( + Math.max( + 1, + (Runtime.getRuntime() + .availableProcessors() * 2 + / 3)), + THREAD_FACTORY); } public static void shutdownExecutorService() { @@ -98,7 +103,8 @@ public class GT_Runnable_MachineBlockUpdate implements Runnable { // (Re-)Cancel if current thread also interrupted EXECUTOR_SERVICE.shutdownNow(); // Preserve interrupt status - Thread.currentThread().interrupt(); + Thread.currentThread() + .interrupt(); } catch (Exception e) { GT_Mod.GT_FML_LOGGER.error("Well this didn't terminated well...", e); // (Re-)Cancel in case diff --git a/src/main/java/gregtech/api/util/ColorsMetadataSection.java b/src/main/java/gregtech/api/util/ColorsMetadataSection.java index d8ce59f42c..05d0bd4059 100644 --- a/src/main/java/gregtech/api/util/ColorsMetadataSection.java +++ b/src/main/java/gregtech/api/util/ColorsMetadataSection.java @@ -53,7 +53,8 @@ public class ColorsMetadataSection implements IMetadataSection { } private boolean isColorInMap(String key, Map<String, String> hexMap) { - return hexMap.containsKey(key) && !hexMap.get(key).isEmpty(); + return hexMap.containsKey(key) && !hexMap.get(key) + .isEmpty(); } public boolean sGuiTintingEnabled() { diff --git a/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java b/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java index cab41e0d3b..41b6e0013e 100644 --- a/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java +++ b/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java @@ -33,8 +33,12 @@ public class ColorsMetadataSectionSerializer extends BaseMetadataSectionSerializ if (jsonObject.has("textColor")) { JsonObject textColors = JsonUtils.func_152754_s(jsonObject, "textColor"); for (Map.Entry<String, JsonElement> entry : textColors.entrySet()) { - if (entry.getValue().isJsonPrimitive()) { - hexTextColorMap.put(entry.getKey(), entry.getValue().getAsString()); + if (entry.getValue() + .isJsonPrimitive()) { + hexTextColorMap.put( + entry.getKey(), + entry.getValue() + .getAsString()); } else { GT_Mod.GT_FML_LOGGER.warn("ColorOverride expects primitive value for key `textColor`"); } @@ -43,8 +47,10 @@ public class ColorsMetadataSectionSerializer extends BaseMetadataSectionSerializ if (jsonObject.has("guiTint")) { JsonObject guiTints = JsonUtils.func_152754_s(jsonObject, "guiTint"); - enableGuiTint = JsonUtils - .getJsonObjectBooleanFieldValueOrDefault(guiTints, "enableGuiTintWhenPainted", true); + enableGuiTint = JsonUtils.getJsonObjectBooleanFieldValueOrDefault( + guiTints, + "enableGuiTintWhenPainted", + true); for (Dyes dye : Dyes.values()) { hexGuiTintMap.put(dye.mName, GT_Util.toHexString(dye.getRGBA())); diff --git a/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java b/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java index f64f7e6a78..71c1e4716b 100644 --- a/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java +++ b/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java @@ -140,7 +140,8 @@ public enum GT_ApiaryUpgrade { SIEVE_UPGRADE,; void apply(Consumer<GT_ApiaryUpgrade> fn) { - UNIQUE_UPGRADE_LIST.get(this).forEach(fn); + UNIQUE_UPGRADE_LIST.get(this) + .forEach(fn); } } @@ -209,7 +210,8 @@ public enum GT_ApiaryUpgrade { private static final HashMap<Integer, GT_ApiaryUpgrade> quickLookup = new HashMap<>(); static { - EnumSet.allOf(GT_ApiaryUpgrade.class).forEach(GT_ApiaryUpgrade::setup_static_variables); + EnumSet.allOf(GT_ApiaryUpgrade.class) + .forEach(GT_ApiaryUpgrade::setup_static_variables); speed8upgraded.blacklistedUpgrades.add(production.id); production.blacklistedUpgrades.add(speed8upgraded.id); } diff --git a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java b/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java index 218e5bffdc..9f648fa7e0 100644 --- a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java +++ b/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java @@ -279,7 +279,8 @@ public class GT_AssemblyLineUtils { */ public static boolean doesDataStickHaveOutput(ItemStack aDataStick) { if (isItemDataStick(aDataStick) && aDataStick.hasTagCompound() - && aDataStick.getTagCompound().hasKey("output")) { + && aDataStick.getTagCompound() + .hasKey("output")) { return true; } return false; @@ -310,7 +311,8 @@ public class GT_AssemblyLineUtils { public static boolean doesDataStickHaveRecipeHash(ItemStack aDataStick) { if (isItemDataStick(aDataStick) && aDataStick.hasTagCompound()) { NBTTagCompound aNBT = aDataStick.getTagCompound(); - if (aNBT.hasKey("Data.Recipe.Hash") && !aNBT.getString("Data.Recipe.Hash").equals("Hash.0")) { + if (aNBT.hasKey("Data.Recipe.Hash") && !aNBT.getString("Data.Recipe.Hash") + .equals("Hash.0")) { return true; } } @@ -375,7 +377,9 @@ public class GT_AssemblyLineUtils { public static boolean setAssemblyLineRecipeOnDataStick(ItemStack aDataStick, GT_Recipe_AssemblyLine aNewRecipe) { if (isItemDataStick(aDataStick)) { String s = aNewRecipe.mOutput.getDisplayName(); - if (FMLCommonHandler.instance().getEffectiveSide().isServer()) { + if (FMLCommonHandler.instance() + .getEffectiveSide() + .isServer()) { s = GT_Assemblyline_Server.lServerNames.get(aNewRecipe.mOutput.getDisplayName()); if (s == null) { s = aNewRecipe.mOutput.getDisplayName(); @@ -440,7 +444,9 @@ public class GT_AssemblyLineUtils { tNBT.setString("author", author); NBTTagList tNBTList = new NBTTagList(); s = aNewRecipe.mOutput.getDisplayName(); - if (FMLCommonHandler.instance().getEffectiveSide().isServer()) { + if (FMLCommonHandler.instance() + .getEffectiveSide() + .isServer()) { s = GT_Assemblyline_Server.lServerNames.get(aNewRecipe.mOutput.getDisplayName()); if (s == null) s = aNewRecipe.mOutput.getDisplayName(); } @@ -460,19 +466,26 @@ public class GT_AssemblyLineUtils { for (ItemStack tStack : aNewRecipe.mOreDictAlt[i]) { if (tStack != null) { s = tStack.getDisplayName(); - if (FMLCommonHandler.instance().getEffectiveSide().isServer()) { + if (FMLCommonHandler.instance() + .getEffectiveSide() + .isServer()) { s = GT_Assemblyline_Server.lServerNames.get(tStack.getDisplayName()); if (s == null) s = tStack.getDisplayName(); } - tBuilder.append(count == 0 ? "" : "\nOr ").append(tStack.stackSize).append(" ").append(s); + tBuilder.append(count == 0 ? "" : "\nOr ") + .append(tStack.stackSize) + .append(" ") + .append(s); count++; } } if (count > 0) tNBTList.appendTag(new NBTTagString(tBuilder.toString())); } else if (aNewRecipe.mInputs[i] != null) { s = aNewRecipe.mInputs[i].getDisplayName(); - if (FMLCommonHandler.instance().getEffectiveSide().isServer()) { + if (FMLCommonHandler.instance() + .getEffectiveSide() + .isServer()) { s = GT_Assemblyline_Server.lServerNames.get(aNewRecipe.mInputs[i].getDisplayName()); if (s == null) s = aNewRecipe.mInputs[i].getDisplayName(); } @@ -484,7 +497,9 @@ public class GT_AssemblyLineUtils { for (int i = 0; i < aNewRecipe.mFluidInputs.length; i++) { if (aNewRecipe.mFluidInputs[i] != null) { s = aNewRecipe.mFluidInputs[i].getLocalizedName(); - if (FMLCommonHandler.instance().getEffectiveSide().isServer()) { + if (FMLCommonHandler.instance() + .getEffectiveSide() + .isServer()) { s = GT_Assemblyline_Server.lServerNames.get(aNewRecipe.mFluidInputs[i].getLocalizedName()); if (s == null) s = aNewRecipe.mFluidInputs[i].getLocalizedName(); } diff --git a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java index a455fcf916..fa58c1d614 100644 --- a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java +++ b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java @@ -23,8 +23,14 @@ public class GT_Assemblyline_Server { public static void fillMap(FMLPreInitializationEvent aEvent) { - String s = new String(aEvent.getModConfigurationDirectory().getAbsolutePath()); - s = s.substring(0, aEvent.getModConfigurationDirectory().getAbsolutePath().length() - 6); + String s = new String( + aEvent.getModConfigurationDirectory() + .getAbsolutePath()); + s = s.substring( + 0, + aEvent.getModConfigurationDirectory() + .getAbsolutePath() + .length() - 6); s = s + "GregTech.lang"; File f = new File(s); s = ""; @@ -34,13 +40,24 @@ public class GT_Assemblyline_Server { internal.putAll(cat.getValues()); for (Map.Entry<String, Property> entry : internal.entrySet()) { try { - s = entry.getValue().getString().replaceAll("%", ""); + s = entry.getValue() + .getString() + .replaceAll("%", ""); - if (entry.getKey().contains("metaitem") && s.contains("material")) internal2.put(entry.getKey(), s); - else if (entry.getKey().contains("blockmachines") && s.contains("material")) + if (entry.getKey() + .contains("metaitem") + && s.contains("material")) + internal2.put(entry.getKey(), s); + else if (entry.getKey() + .contains("blockmachines") + && s.contains("material")) internal3.put(entry.getKey(), s); - else if ((entry.getKey().contains("blockores") - || (entry.getKey().contains("blockmetal") || entry.getKey().contains("blockgem"))) + else if ((entry.getKey() + .contains("blockores") + || (entry.getKey() + .contains("blockmetal") + || entry.getKey() + .contains("blockgem"))) && s.contains("material")) internal4.put(entry.getKey(), s); else lServerNames.put(entry.getKey(), s); @@ -48,195 +65,280 @@ public class GT_Assemblyline_Server { } for (Map.Entry<String, String> entry : internal2.entrySet()) { try { - if (entry.getKey().contains("name")) { + if (entry.getKey() + .contains("name")) { int i = Integer.parseInt( entry.getKey() - .substring("gt.metaitem.01.".length(), entry.getKey().length() - ".name".length())); + .substring( + "gt.metaitem.01.".length(), + entry.getKey() + .length() - ".name".length())); i = i % 1000; if (GregTech_API.sGeneratedMaterials[i] != null) lServerNames.put( entry.getKey(), - entry.getValue().replace("material", GregTech_API.sGeneratedMaterials[i].toString())); + entry.getValue() + .replace("material", GregTech_API.sGeneratedMaterials[i].toString())); else lServerNames.put(entry.getKey(), null); } } catch (Exception ignored) {} } for (Map.Entry<String, String> entry : internal3.entrySet()) { try { - if (entry.getKey().contains("cable")) lServerNames.put( - entry.getKey(), - entry.getValue().replace( - "material", - entry.getKey().substring( - "gt.blockmachines.cable.".length(), - entry.getKey().length() - ".01.name".length()))); - else if (entry.getKey().contains("gt_frame_")) lServerNames.put( - entry.getKey(), - entry.getValue().replace( - "material", - entry.getKey().substring( - "gt.blockmachines.gt_frame_".length(), - entry.getKey().length() - ".name".length()))); - else if (entry.getKey().contains("gt_pipe_")) { - if (!entry.getKey().contains("_huge") && !entry.getKey().contains("_large") - && !entry.getKey().contains("_nonuple") - && !entry.getKey().contains("_quadruple") - && !entry.getKey().contains("_small") - && !entry.getKey().contains("_tiny")) - lServerNames.put( - entry.getKey(), - entry.getValue().replace( - "material", - entry.getKey().substring( - "gt.blockmachines.gt_pipe_".length(), - entry.getKey().length() - ".name".length()))); - else if (entry.getKey().contains("_huge") || entry.getKey().contains("_tiny")) lServerNames.put( - entry.getKey(), - entry.getValue().replace( - "material", - entry.getKey().substring( - "gt.blockmachines.gt_pipe_".length(), - entry.getKey().length() - "_tiny.name".length()))); - else if (entry.getKey().contains("_large") || entry.getKey().contains("_small")) lServerNames.put( + if (entry.getKey() + .contains("cable")) + lServerNames.put( entry.getKey(), - entry.getValue().replace( - "material", - entry.getKey().substring( - "gt.blockmachines.gt_pipe_".length(), - entry.getKey().length() - "_large.name".length()))); - else if (entry.getKey().contains("_nonuple")) lServerNames.put( + entry.getValue() + .replace( + "material", + entry.getKey() + .substring( + "gt.blockmachines.cable.".length(), + entry.getKey() + .length() - ".01.name".length()))); + else if (entry.getKey() + .contains("gt_frame_")) + lServerNames.put( entry.getKey(), - entry.getValue().replace( - "material", - entry.getKey().substring( - "gt.blockmachines.gt_pipe_".length(), - entry.getKey().length() - "_nonuple.name".length()))); - else if (entry.getKey().contains("_quadruple")) lServerNames.put( - entry.getKey(), - entry.getValue().replace( - "material", - entry.getKey().substring( - "gt.blockmachines.gt_pipe_".length(), - entry.getKey().length() - "_quadruple.name".length()))); - } else if (entry.getKey().contains("wire")) lServerNames.put( - entry.getKey(), - entry.getValue().replace( - "material", - entry.getKey().substring( - "gt.blockmachines.wire.".length(), - entry.getKey().length() - ".01.name".length()))); - else lServerNames.put(entry.getKey(), entry.getValue()); + entry.getValue() + .replace( + "material", + entry.getKey() + .substring( + "gt.blockmachines.gt_frame_".length(), + entry.getKey() + .length() - ".name".length()))); + else if (entry.getKey() + .contains("gt_pipe_")) { + if (!entry.getKey() + .contains("_huge") + && !entry.getKey() + .contains("_large") + && !entry.getKey() + .contains("_nonuple") + && !entry.getKey() + .contains("_quadruple") + && !entry.getKey() + .contains("_small") + && !entry.getKey() + .contains("_tiny")) + lServerNames.put( + entry.getKey(), + entry.getValue() + .replace( + "material", + entry.getKey() + .substring( + "gt.blockmachines.gt_pipe_".length(), + entry.getKey() + .length() - ".name".length()))); + else if (entry.getKey() + .contains("_huge") + || entry.getKey() + .contains("_tiny")) + lServerNames.put( + entry.getKey(), + entry.getValue() + .replace( + "material", + entry.getKey() + .substring( + "gt.blockmachines.gt_pipe_".length(), + entry.getKey() + .length() - "_tiny.name".length()))); + else if (entry.getKey() + .contains("_large") + || entry.getKey() + .contains("_small")) + lServerNames.put( + entry.getKey(), + entry.getValue() + .replace( + "material", + entry.getKey() + .substring( + "gt.blockmachines.gt_pipe_".length(), + entry.getKey() + .length() - "_large.name".length()))); + else if (entry.getKey() + .contains("_nonuple")) + lServerNames.put( + entry.getKey(), + entry.getValue() + .replace( + "material", + entry.getKey() + .substring( + "gt.blockmachines.gt_pipe_".length(), + entry.getKey() + .length() - "_nonuple.name".length()))); + else if (entry.getKey() + .contains("_quadruple")) + lServerNames.put( + entry.getKey(), + entry.getValue() + .replace( + "material", + entry.getKey() + .substring( + "gt.blockmachines.gt_pipe_".length(), + entry.getKey() + .length() - "_quadruple.name".length()))); + } else + if (entry.getKey() + .contains("wire")) + lServerNames.put( + entry.getKey(), + entry.getValue() + .replace( + "material", + entry.getKey() + .substring( + "gt.blockmachines.wire.".length(), + entry.getKey() + .length() - ".01.name".length()))); + else lServerNames.put(entry.getKey(), entry.getValue()); } catch (Exception ignored) {} } for (Map.Entry<String, String> entry : internal4.entrySet()) { try { - if (entry.getKey().contains("blockores")) { + if (entry.getKey() + .contains("blockores")) { int i = Integer.parseInt( entry.getKey() - .substring("gt.blockores.".length(), entry.getKey().length() - ".name".length())); + .substring( + "gt.blockores.".length(), + entry.getKey() + .length() - ".name".length())); i = i % 1000; if (GregTech_API.sGeneratedMaterials[i] != null) lServerNames.put( entry.getKey(), - entry.getValue().replace("material", GregTech_API.sGeneratedMaterials[i].toString())); + entry.getValue() + .replace("material", GregTech_API.sGeneratedMaterials[i].toString())); else lServerNames.put(entry.getKey(), null); - } else if (entry.getKey().contains("blockmetal")) { - Materials[] mMats = null; - String t = entry.getKey().substring("gt.blockmetal".length()); - t = t.substring(0, 1); - int i = Integer.parseInt(t); - switch (i) { - case 1: - mMats = new Materials[] { Materials.Adamantium, Materials.Aluminium, Materials.Americium, - Materials.AnnealedCopper, Materials.Antimony, Materials.Arsenic, - Materials.AstralSilver, Materials.BatteryAlloy, Materials.Beryllium, - Materials.Bismuth, Materials.BismuthBronze, Materials.BlackBronze, - Materials.BlackSteel, Materials.BlueAlloy, Materials.BlueSteel, Materials.Brass }; - break; - case 2: - mMats = new Materials[] { Materials.Bronze, Materials.Caesium, Materials.Cerium, - Materials.Chrome, Materials.ChromiumDioxide, Materials.Cobalt, - Materials.CobaltBrass, Materials.Copper, Materials.Cupronickel, - Materials.DamascusSteel, Materials.DarkIron, Materials.DeepIron, Materials.Desh, - Materials.Duranium, Materials.Dysprosium, Materials.Electrum }; - break; - case 3: - mMats = new Materials[] { Materials.ElectrumFlux, Materials.Enderium, Materials.Erbium, - Materials.Europium, Materials.FierySteel, Materials.Gadolinium, Materials.Gallium, - Materials.Holmium, Materials.HSLA, Materials.Indium, Materials.InfusedGold, - Materials.Invar, Materials.Iridium, Materials.IronMagnetic, Materials.IronWood, - Materials.Kanthal }; - break; - case 4: - mMats = new Materials[] { Materials.Knightmetal, Materials.Lanthanum, Materials.Lead, - Materials.Lutetium, Materials.Magnalium, Materials.Magnesium, Materials.Manganese, - Materials.MeteoricIron, Materials.MeteoricSteel, Materials.Trinium, - Materials.Mithril, Materials.Molybdenum, Materials.Naquadah, - Materials.NaquadahAlloy, Materials.NaquadahEnriched, Materials.Naquadria }; - break; - case 5: - mMats = new Materials[] { Materials.Neodymium, Materials.NeodymiumMagnetic, - Materials.Neutronium, Materials.Nichrome, Materials.Nickel, Materials.Niobium, - Materials.NiobiumNitride, Materials.NiobiumTitanium, Materials.Osmiridium, - Materials.Osmium, Materials.Palladium, Materials.PigIron, Materials.Platinum, - Materials.Plutonium, Materials.Plutonium241, Materials.Praseodymium }; - break; - case 6: - mMats = new Materials[] { Materials.Promethium, Materials.RedAlloy, Materials.RedSteel, - Materials.RoseGold, Materials.Rubidium, Materials.Samarium, Materials.Scandium, - Materials.ShadowIron, Materials.ShadowSteel, Materials.Silicon, Materials.Silver, - Materials.SolderingAlloy, Materials.StainlessSteel, Materials.Steel, - Materials.SteelMagnetic, Materials.SterlingSilver }; - break; - case 7: - mMats = new Materials[] { Materials.Sunnarium, Materials.Tantalum, Materials.Tellurium, - Materials.Terbium, Materials.Thaumium, Materials.Thorium, Materials.Thulium, - Materials.Tin, Materials.TinAlloy, Materials.Titanium, Materials.Tritanium, - Materials.Tungsten, Materials.TungstenSteel, Materials.Ultimet, Materials.Uranium, - Materials.Uranium235 }; - break; - case 8: - mMats = new Materials[] { Materials.Vanadium, Materials.VanadiumGallium, - Materials.WroughtIron, Materials.Ytterbium, Materials.Yttrium, - Materials.YttriumBariumCuprate, Materials.Zinc, Materials.TungstenCarbide, - Materials.VanadiumSteel, Materials.HSSG, Materials.HSSE, Materials.HSSS, - Materials.Steeleaf, Materials.Ichorium, Materials.Firestone }; - break; - } - t = entry.getKey() - .substring("gt.blockmetal1.".length(), entry.getKey().length() - ".name".length()); - i = Integer.parseInt(t); - lServerNames.put(entry.getKey(), "Block of " + mMats[i].toString()); - mMats = null; - } else if (entry.getKey().contains("blockgem")) { - Materials[] mMats = null; - String t = entry.getKey().substring("gt.blockgem".length()); - t = t.substring(0, 1); - int i = Integer.parseInt(t); - switch (i) { - case 1: - mMats = new Materials[] { Materials.InfusedAir, Materials.Amber, Materials.Amethyst, - Materials.InfusedWater, Materials.BlueTopaz, Materials.CertusQuartz, - Materials.Dilithium, Materials.EnderEye, Materials.EnderPearl, Materials.FoolsRuby, - Materials.Force, Materials.Forcicium, Materials.Forcillium, Materials.GreenSapphire, - Materials.InfusedFire, Materials.Jasper, MaterialsBotania.ManaDiamond, - MaterialsBotania.BotaniaDragonstone }; - break; - case 2: - mMats = new Materials[] { Materials.Lazurite, Materials.Lignite, Materials.Monazite, - Materials.Niter, Materials.Olivine, Materials.Opal, Materials.InfusedOrder, - Materials.InfusedEntropy, Materials.Phosphorus, Materials.Quartzite, - Materials.GarnetRed, Materials.Ruby, Materials.Sapphire, Materials.Sodalite, - Materials.Tanzanite, Materials.InfusedEarth }; - break; - case 3: - mMats = new Materials[] { Materials.Topaz, Materials.Vinteum, Materials.GarnetYellow, - Materials.NetherStar, Materials.Charcoal, Materials.Blaze }; - break; - } - t = entry.getKey().substring("gt.blockgem1.".length(), entry.getKey().length() - ".name".length()); - i = Integer.parseInt(t); - lServerNames.put(entry.getKey(), "Block of " + mMats[i].toString()); - mMats = null; - } + } else if (entry.getKey() + .contains("blockmetal")) { + Materials[] mMats = null; + String t = entry.getKey() + .substring("gt.blockmetal".length()); + t = t.substring(0, 1); + int i = Integer.parseInt(t); + switch (i) { + case 1: + mMats = new Materials[] { Materials.Adamantium, Materials.Aluminium, + Materials.Americium, Materials.AnnealedCopper, Materials.Antimony, + Materials.Arsenic, Materials.AstralSilver, Materials.BatteryAlloy, + Materials.Beryllium, Materials.Bismuth, Materials.BismuthBronze, + Materials.BlackBronze, Materials.BlackSteel, Materials.BlueAlloy, + Materials.BlueSteel, Materials.Brass }; + break; + case 2: + mMats = new Materials[] { Materials.Bronze, Materials.Caesium, + Materials.Cerium, Materials.Chrome, Materials.ChromiumDioxide, + Materials.Cobalt, Materials.CobaltBrass, Materials.Copper, + Materials.Cupronickel, Materials.DamascusSteel, Materials.DarkIron, + Materials.DeepIron, Materials.Desh, Materials.Duranium, + Materials.Dysprosium, Materials.Electrum }; + break; + case 3: + mMats = new Materials[] { Materials.ElectrumFlux, Materials.Enderium, + Materials.Erbium, Materials.Europium, Materials.FierySteel, + Materials.Gadolinium, Materials.Gallium, Materials.Holmium, + Materials.HSLA, Materials.Indium, Materials.InfusedGold, + Materials.Invar, Materials.Iridium, Materials.IronMagnetic, + Materials.IronWood, Materials.Kanthal }; + break; + case 4: + mMats = new Materials[] { Materials.Knightmetal, Materials.Lanthanum, + Materials.Lead, Materials.Lutetium, Materials.Magnalium, + Materials.Magnesium, Materials.Manganese, Materials.MeteoricIron, + Materials.MeteoricSteel, Materials.Trinium, Materials.Mithril, + Materials.Molybdenum, Materials.Naquadah, Materials.NaquadahAlloy, + Materials.NaquadahEnriched, Materials.Naquadria }; + break; + case 5: + mMats = new Materials[] { Materials.Neodymium, Materials.NeodymiumMagnetic, + Materials.Neutronium, Materials.Nichrome, Materials.Nickel, + Materials.Niobium, Materials.NiobiumNitride, + Materials.NiobiumTitanium, Materials.Osmiridium, Materials.Osmium, + Materials.Palladium, Materials.PigIron, Materials.Platinum, + Materials.Plutonium, Materials.Plutonium241, + Materials.Praseodymium }; + break; + case 6: + mMats = new Materials[] { Materials.Promethium, Materials.RedAlloy, + Materials.RedSteel, Materials.RoseGold, Materials.Rubidium, + Materials.Samarium, Materials.Scandium, Materials.ShadowIron, + Materials.ShadowSteel, Materials.Silicon, Materials.Silver, + Materials.SolderingAlloy, Materials.StainlessSteel, Materials.Steel, + Materials.SteelMagnetic, Materials.SterlingSilver }; + break; + case 7: + mMats = new Materials[] { Materials.Sunnarium, Materials.Tantalum, + Materials.Tellurium, Materials.Terbium, Materials.Thaumium, + Materials.Thorium, Materials.Thulium, Materials.Tin, + Materials.TinAlloy, Materials.Titanium, Materials.Tritanium, + Materials.Tungsten, Materials.TungstenSteel, Materials.Ultimet, + Materials.Uranium, Materials.Uranium235 }; + break; + case 8: + mMats = new Materials[] { Materials.Vanadium, Materials.VanadiumGallium, + Materials.WroughtIron, Materials.Ytterbium, Materials.Yttrium, + Materials.YttriumBariumCuprate, Materials.Zinc, + Materials.TungstenCarbide, Materials.VanadiumSteel, Materials.HSSG, + Materials.HSSE, Materials.HSSS, Materials.Steeleaf, + Materials.Ichorium, Materials.Firestone }; + break; + } + t = entry.getKey() + .substring( + "gt.blockmetal1.".length(), + entry.getKey() + .length() - ".name".length()); + i = Integer.parseInt(t); + lServerNames.put(entry.getKey(), "Block of " + mMats[i].toString()); + mMats = null; + } else + if (entry.getKey() + .contains("blockgem")) { + Materials[] mMats = null; + String t = entry.getKey() + .substring("gt.blockgem".length()); + t = t.substring(0, 1); + int i = Integer.parseInt(t); + switch (i) { + case 1: + mMats = new Materials[] { Materials.InfusedAir, Materials.Amber, + Materials.Amethyst, Materials.InfusedWater, Materials.BlueTopaz, + Materials.CertusQuartz, Materials.Dilithium, Materials.EnderEye, + Materials.EnderPearl, Materials.FoolsRuby, Materials.Force, + Materials.Forcicium, Materials.Forcillium, Materials.GreenSapphire, + Materials.InfusedFire, Materials.Jasper, MaterialsBotania.ManaDiamond, + MaterialsBotania.BotaniaDragonstone }; + break; + case 2: + mMats = new Materials[] { Materials.Lazurite, Materials.Lignite, + Materials.Monazite, Materials.Niter, Materials.Olivine, Materials.Opal, + Materials.InfusedOrder, Materials.InfusedEntropy, Materials.Phosphorus, + Materials.Quartzite, Materials.GarnetRed, Materials.Ruby, + Materials.Sapphire, Materials.Sodalite, Materials.Tanzanite, + Materials.InfusedEarth }; + break; + case 3: + mMats = new Materials[] { Materials.Topaz, Materials.Vinteum, + Materials.GarnetYellow, Materials.NetherStar, Materials.Charcoal, + Materials.Blaze }; + break; + } + t = entry.getKey() + .substring( + "gt.blockgem1.".length(), + entry.getKey() + .length() - ".name".length()); + i = Integer.parseInt(t); + lServerNames.put(entry.getKey(), "Block of " + mMats[i].toString()); + mMats = null; + } } catch (Exception ignored) {} } diff --git a/src/main/java/gregtech/api/util/GT_BaseCrop.java b/src/main/java/gregtech/api/util/GT_BaseCrop.java index bfffbe8572..e66866cd8f 100644 --- a/src/main/java/gregtech/api/util/GT_BaseCrop.java +++ b/src/main/java/gregtech/api/util/GT_BaseCrop.java @@ -118,8 +118,11 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { if (bIc2NeiLoaded) { try { Class.forName("speiger.src.crops.api.CropPluginAPI") - .getMethod("registerCropInfo", Class.forName("speiger.src.crops.api.ICropCardInfo")) - .invoke(Class.forName("speiger.src.crops.api.CropPluginAPI").getField("instance"), this); + .getMethod("registerCropInfo", Class.forName("speiger.src.crops.api.ICropCardInfo")) + .invoke( + Class.forName("speiger.src.crops.api.CropPluginAPI") + .getField("instance"), + this); } catch (IllegalAccessException ex) { bIc2NeiLoaded = false; } catch (IllegalArgumentException ex) { @@ -206,10 +209,12 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { @Override public ItemStack getGain(ICropTile aCrop) { int tDrop = 0; - if (mSpecialDrops != null - && (tDrop = java.util.concurrent.ThreadLocalRandom.current().nextInt(0, (mSpecialDrops.length * 2) + 2)) - < mSpecialDrops.length - && mSpecialDrops[tDrop] != null) { + if (mSpecialDrops != null && (tDrop = java.util.concurrent.ThreadLocalRandom.current() + .nextInt( + 0, + (mSpecialDrops.length * 2) + + 2)) + < mSpecialDrops.length && mSpecialDrops[tDrop] != null) { return GT_Utility.copyOrNull(mSpecialDrops[tDrop]); } return GT_Utility.copyOrNull(mDrop); @@ -232,12 +237,16 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { } for (int i = 1; i < this.getrootslength(aCrop); i++) { Block tBlock = aCrop.getWorld() - .getBlock(aCrop.getLocation().posX, aCrop.getLocation().posY - i, aCrop.getLocation().posZ); + .getBlock( + aCrop.getLocation().posX, + aCrop.getLocation().posY - i, + aCrop.getLocation().posZ); if ((tBlock instanceof GT_Block_Ores_Abstract)) { - TileEntity tTileEntity = aCrop.getWorld().getTileEntity( - aCrop.getLocation().posX, - aCrop.getLocation().posY - i, - aCrop.getLocation().posZ); + TileEntity tTileEntity = aCrop.getWorld() + .getTileEntity( + aCrop.getLocation().posX, + aCrop.getLocation().posY - i, + aCrop.getLocation().posZ); if ((tTileEntity instanceof GT_TileEntity_Ores)) { Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData % 1000)]; @@ -250,12 +259,14 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { } } } else { - int tMetaID = aCrop.getWorld().getBlockMetadata( - aCrop.getLocation().posX, - aCrop.getLocation().posY - i, - aCrop.getLocation().posZ); + int tMetaID = aCrop.getWorld() + .getBlockMetadata( + aCrop.getLocation().posX, + aCrop.getLocation().posY - i, + aCrop.getLocation().posZ); ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); - if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore")) + if ((tAssotiation != null) && (tAssotiation.mPrefix.toString() + .startsWith("ore")) && (tAssotiation.mMaterial.mMaterial == mBlock)) { return true; } diff --git a/src/main/java/gregtech/api/util/GT_CLS_Compat.java b/src/main/java/gregtech/api/util/GT_CLS_Compat.java index 7e3b7c424c..a7cae35d59 100644 --- a/src/main/java/gregtech/api/util/GT_CLS_Compat.java +++ b/src/main/java/gregtech/api/util/GT_CLS_Compat.java @@ -44,23 +44,25 @@ public class GT_CLS_Compat { GT_Mod.GT_FML_LOGGER.catching(ex); } - Optional.ofNullable(alexiilMinecraftDisplayer).ifPresent(e -> { - try { - getLastPercent = e.getMethod("getLastPercent"); - isReplacingVanillaMaterials = e.getField("isReplacingVanillaMaterials"); - isRegisteringGTmaterials = e.getField("isRegisteringGTmaterials"); - } catch (NoSuchMethodException | NoSuchFieldException ex) { - GT_Mod.GT_FML_LOGGER.catching(ex); - } - }); - - Optional.ofNullable(alexiilProgressDisplayer).ifPresent(e -> { - try { - displayProgress = e.getMethod("displayProgress", String.class, float.class); - } catch (NoSuchMethodException ex) { - GT_Mod.GT_FML_LOGGER.catching(ex); - } - }); + Optional.ofNullable(alexiilMinecraftDisplayer) + .ifPresent(e -> { + try { + getLastPercent = e.getMethod("getLastPercent"); + isReplacingVanillaMaterials = e.getField("isReplacingVanillaMaterials"); + isRegisteringGTmaterials = e.getField("isRegisteringGTmaterials"); + } catch (NoSuchMethodException | NoSuchFieldException ex) { + GT_Mod.GT_FML_LOGGER.catching(ex); + } + }); + + Optional.ofNullable(alexiilProgressDisplayer) + .ifPresent(e -> { + try { + displayProgress = e.getMethod("displayProgress", String.class, float.class); + } catch (NoSuchMethodException ex) { + GT_Mod.GT_FML_LOGGER.catching(ex); + } + }); try { progressBarStep = cpwProgressBar.getDeclaredField("step"); @@ -86,7 +88,8 @@ public class GT_CLS_Compat { if (nextProgressionReportAt < now) { nextProgressionReportAt = now + progressionReportsEvery; - String materialName = getName.apply(m).toString(); + String materialName = getName.apply(m) + .toString(); try { displayProgress.invoke(null, materialName, (float) currentStep / sizeStep); } catch (IllegalAccessException | InvocationTargetException iae) { diff --git a/src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java b/src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java index ea1ac73621..113d8cc420 100644 --- a/src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java +++ b/src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java @@ -64,8 +64,13 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.IData> { private static final Map<String, GT_ChunkAssociatedData<?>> instances = new ConcurrentHashMap<>(); - private static final int IO_PARALLELISM = Math - .min(8, Math.max(1, Runtime.getRuntime().availableProcessors() * 2 / 3)); + private static final int IO_PARALLELISM = Math.min( + 8, + Math.max( + 1, + Runtime.getRuntime() + .availableProcessors() * 2 + / 3)); private static final ExecutorService IO_WORKERS = Executors.newWorkStealingPool(IO_PARALLELISM); private static final Pattern FILE_PATTERN = Pattern.compile("(.+)\\.(-?\\d+)\\.(-?\\d+)\\.dat"); @@ -131,13 +136,13 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID public final T get(World world, int chunkX, int chunkZ) { SuperRegion region = masterMap.computeIfAbsent(world.provider.dimensionId, ignored -> new ConcurrentHashMap<>()) - .computeIfAbsent(getRegionID(chunkX, chunkZ), c -> new SuperRegion(world, c)); + .computeIfAbsent(getRegionID(chunkX, chunkZ), c -> new SuperRegion(world, c)); return region.get(Math.floorMod(chunkX, regionLength), Math.floorMod(chunkZ, regionLength)); } protected final void set(World world, int chunkX, int chunkZ, T data) { SuperRegion region = masterMap.computeIfAbsent(world.provider.dimensionId, ignored -> new ConcurrentHashMap<>()) - .computeIfAbsent(getRegionID(chunkX, chunkZ), c -> new SuperRegion(world, c)); + .computeIfAbsent(getRegionID(chunkX, chunkZ), c -> new SuperRegion(world, c)); region.set(Math.floorMod(chunkX, regionLength), Math.floorMod(chunkZ, regionLength), data); } @@ -153,8 +158,13 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID public void clear() { if (GT_Values.debugWorldData) { - long dirtyRegionCount = masterMap.values().stream().flatMap(m -> m.values().stream()) - .filter(SuperRegion::isDirty).count(); + long dirtyRegionCount = masterMap.values() + .stream() + .flatMap( + m -> m.values() + .stream()) + .filter(SuperRegion::isDirty) + .count(); if (dirtyRegionCount > 0) GT_Log.out.println( "Clearing ChunkAssociatedData with " + dirtyRegionCount + " regions dirty. Data might have been lost!"); @@ -163,24 +173,34 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID } public void save() { - saveRegions(masterMap.values().stream().flatMap(m -> m.values().stream())); + saveRegions( + masterMap.values() + .stream() + .flatMap( + m -> m.values() + .stream())); } public void save(World world) { Map<ChunkCoordIntPair, SuperRegion> map = masterMap.get(world.provider.dimensionId); - if (map != null) saveRegions(map.values().stream()); + if (map != null) saveRegions( + map.values() + .stream()); } private void saveRegions(Stream<SuperRegion> stream) { - stream.filter(r -> r.isDirty()).map(c -> (Runnable) c::save).map(r -> CompletableFuture.runAsync(r, IO_WORKERS)) - .reduce(CompletableFuture::allOf).ifPresent(f -> { - try { - f.get(); - } catch (Exception e) { - GT_Log.err.println("Data save error: " + mId); - e.printStackTrace(GT_Log.err); - } - }); + stream.filter(r -> r.isDirty()) + .map(c -> (Runnable) c::save) + .map(r -> CompletableFuture.runAsync(r, IO_WORKERS)) + .reduce(CompletableFuture::allOf) + .ifPresent(f -> { + try { + f.get(); + } catch (Exception e) { + GT_Log.err.println("Data save error: " + mId); + e.printStackTrace(GT_Log.err); + } + }); } protected abstract void writeElement(DataOutput output, T element, World world, int chunkX, int chunkZ) @@ -222,21 +242,34 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID return; try (Stream<Path> stream = Files.list(getSaveDirectory(w).toPath())) { Map<ChunkCoordIntPair, SuperRegion> worldData = stream.map(f -> { - Matcher matcher = FILE_PATTERN.matcher(f.getFileName().toString()); + Matcher matcher = FILE_PATTERN.matcher( + f.getFileName() + .toString()); return matcher.matches() ? matcher : null; - }).filter(Objects::nonNull).filter(m -> mId.equals(m.group(1))).map( - m -> CompletableFuture.supplyAsync( - () -> new SuperRegion(w, Integer.parseInt(m.group(2)), Integer.parseInt(m.group(3))), - IO_WORKERS)) - .map(f -> { - try { - return f.get(); - } catch (Exception e) { - GT_Log.err.println("Error loading region"); - e.printStackTrace(GT_Log.err); - return null; - } - }).filter(Objects::nonNull).collect(Collectors.toMap(SuperRegion::getCoord, Function.identity())); + }) + .filter(Objects::nonNull) + .filter(m -> mId.equals(m.group(1))) + .map( + m -> CompletableFuture.supplyAsync( + () -> new SuperRegion( + w, + Integer.parseInt(m.group(2)), + Integer.parseInt(m.group(3))), + IO_WORKERS)) + .map(f -> { + try { + return f.get(); + } catch (Exception e) { + GT_Log.err.println("Error loading region"); + e.printStackTrace(GT_Log.err); + return null; + } + }) + .filter(Objects::nonNull) + .collect( + Collectors.toMap( + SuperRegion::getCoord, + Function.identity())); masterMap.put(w.provider.dimensionId, worldData); } catch (IOException | UncheckedIOException e) { GT_Log.err.println("Error loading all region"); @@ -246,8 +279,12 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID protected File getSaveDirectory(World w) { File base; - if (w.provider.getSaveFolder() == null) base = w.getSaveHandler().getWorldDirectory(); - else base = new File(w.getSaveHandler().getWorldDirectory(), w.provider.getSaveFolder()); + if (w.provider.getSaveFolder() == null) base = w.getSaveHandler() + .getWorldDirectory(); + else base = new File( + w.getSaveHandler() + .getWorldDirectory(), + w.provider.getSaveFolder()); return new File(base, "gregtech"); } @@ -347,7 +384,8 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID private void save0() throws IOException { // noinspection ResultOfMethodCallIgnored - backingStorage.getParentFile().mkdirs(); + backingStorage.getParentFile() + .mkdirs(); File tmpFile = getTmpFile(); World world = Objects.requireNonNull(this.world.get(), "Attempting to save region of another world!"); try (DataOutputStream output = new DataOutputStream(new FileOutputStream(tmpFile))) { diff --git a/src/main/java/gregtech/api/util/GT_CircuitryBehavior.java b/src/main/java/gregtech/api/util/GT_CircuitryBehavior.java index 809c66d5d0..a8a39e341c 100644 --- a/src/main/java/gregtech/api/util/GT_CircuitryBehavior.java +++ b/src/main/java/gregtech/api/util/GT_CircuitryBehavior.java @@ -36,12 +36,14 @@ public abstract class GT_CircuitryBehavior { */ public static boolean getAnyRedstone(IRedstoneCircuitBlock aRedstoneCircuitBlock) { for (byte side : ALL_VALID_SIDES) { - if (side != aRedstoneCircuitBlock.getOutputFacing() - && aRedstoneCircuitBlock.getCover(side).letsRedstoneGoIn( - side, - aRedstoneCircuitBlock.getCoverID(side), - aRedstoneCircuitBlock.getCoverVariable(side), - aRedstoneCircuitBlock.getOwnTileEntity())) { + if (side != aRedstoneCircuitBlock.getOutputFacing() && aRedstoneCircuitBlock.getCover(side) + .letsRedstoneGoIn( + side, + aRedstoneCircuitBlock.getCoverID( + side), + aRedstoneCircuitBlock.getCoverVariable( + side), + aRedstoneCircuitBlock.getOwnTileEntity())) { if (aRedstoneCircuitBlock.getInputRedstone(side) > 0) { return true; } @@ -55,12 +57,14 @@ public abstract class GT_CircuitryBehavior { */ public static boolean getAllRedstone(IRedstoneCircuitBlock aRedstoneCircuitBlock) { for (byte side : ALL_VALID_SIDES) { - if (side != aRedstoneCircuitBlock.getOutputFacing() - && aRedstoneCircuitBlock.getCover(side).letsRedstoneGoIn( - side, - aRedstoneCircuitBlock.getCoverID(side), - aRedstoneCircuitBlock.getCoverVariable(side), - aRedstoneCircuitBlock.getOwnTileEntity())) { + if (side != aRedstoneCircuitBlock.getOutputFacing() && aRedstoneCircuitBlock.getCover(side) + .letsRedstoneGoIn( + side, + aRedstoneCircuitBlock.getCoverID( + side), + aRedstoneCircuitBlock.getCoverVariable( + side), + aRedstoneCircuitBlock.getOwnTileEntity())) { if (aRedstoneCircuitBlock.getInputRedstone(side) == 0) { return false; } @@ -75,12 +79,14 @@ public abstract class GT_CircuitryBehavior { public static boolean getOneRedstone(IRedstoneCircuitBlock aRedstoneCircuitBlock) { int tRedstoneAmount = 0; for (byte side : ALL_VALID_SIDES) { - if (side != aRedstoneCircuitBlock.getOutputFacing() - && aRedstoneCircuitBlock.getCover(side).letsRedstoneGoIn( - side, - aRedstoneCircuitBlock.getCoverID(side), - aRedstoneCircuitBlock.getCoverVariable(side), - aRedstoneCircuitBlock.getOwnTileEntity())) { + if (side != aRedstoneCircuitBlock.getOutputFacing() && aRedstoneCircuitBlock.getCover(side) + .letsRedstoneGoIn( + side, + aRedstoneCircuitBlock.getCoverID( + side), + aRedstoneCircuitBlock.getCoverVariable( + side), + aRedstoneCircuitBlock.getOwnTileEntity())) { if (aRedstoneCircuitBlock.getInputRedstone(side) > 0) { tRedstoneAmount++; } @@ -95,12 +101,14 @@ public abstract class GT_CircuitryBehavior { public static byte getStrongestRedstone(IRedstoneCircuitBlock aRedstoneCircuitBlock) { byte tRedstoneAmount = 0; for (byte side : ALL_VALID_SIDES) { - if (side != aRedstoneCircuitBlock.getOutputFacing() - && aRedstoneCircuitBlock.getCover(side).letsRedstoneGoIn( - side, - aRedstoneCircuitBlock.getCoverID(side), - aRedstoneCircuitBlock.getCoverVariable(side), - aRedstoneCircuitBlock.getOwnTileEntity())) { + if (side != aRedstoneCircuitBlock.getOutputFacing() && aRedstoneCircuitBlock.getCover(side) + .letsRedstoneGoIn( + side, + aRedstoneCircuitBlock.getCoverID( + side), + aRedstoneCircuitBlock.getCoverVariable( + side), + aRedstoneCircuitBlock.getOwnTileEntity())) { tRedstoneAmount = (byte) Math.max(tRedstoneAmount, aRedstoneCircuitBlock.getInputRedstone(side)); } } @@ -118,12 +126,14 @@ public abstract class GT_CircuitryBehavior { if (!getAnyRedstone(aRedstoneCircuitBlock)) return 0; byte tRedstoneAmount = 15; for (byte side : ALL_VALID_SIDES) { - if (side != aRedstoneCircuitBlock.getOutputFacing() - && aRedstoneCircuitBlock.getCover(side).letsRedstoneGoIn( - side, - aRedstoneCircuitBlock.getCoverID(side), - aRedstoneCircuitBlock.getCoverVariable(side), - aRedstoneCircuitBlock.getOwnTileEntity())) { + if (side != aRedstoneCircuitBlock.getOutputFacing() && aRedstoneCircuitBlock.getCover(side) + .letsRedstoneGoIn( + side, + aRedstoneCircuitBlock.getCoverID( + side), + aRedstoneCircuitBlock.getCoverVariable( + side), + aRedstoneCircuitBlock.getOwnTileEntity())) { if (aRedstoneCircuitBlock.getInputRedstone(side) > 0) tRedstoneAmount = (byte) Math.min(tRedstoneAmount, aRedstoneCircuitBlock.getInputRedstone(side)); } @@ -138,12 +148,14 @@ public abstract class GT_CircuitryBehavior { if (!getAnyRedstone(aRedstoneCircuitBlock)) return 0; byte tRedstoneAmount = 15; for (byte side : ALL_VALID_SIDES) { - if (side != aRedstoneCircuitBlock.getOutputFacing() - && aRedstoneCircuitBlock.getCover(side).letsRedstoneGoIn( - side, - aRedstoneCircuitBlock.getCoverID(side), - aRedstoneCircuitBlock.getCoverVariable(side), - aRedstoneCircuitBlock.getOwnTileEntity())) { + if (side != aRedstoneCircuitBlock.getOutputFacing() && aRedstoneCircuitBlock.getCover(side) + .letsRedstoneGoIn( + side, + aRedstoneCircuitBlock.getCoverID( + side), + aRedstoneCircuitBlock.getCoverVariable( + side), + aRedstoneCircuitBlock.getOwnTileEntity())) { tRedstoneAmount = (byte) Math.min(tRedstoneAmount, aRedstoneCircuitBlock.getInputRedstone(side)); } } diff --git a/src/main/java/gregtech/api/util/GT_ClientPreference.java b/src/main/java/gregtech/api/util/GT_ClientPreference.java index 34db521bd4..0d5e39c1a8 100644 --- a/src/main/java/gregtech/api/util/GT_ClientPreference.java +++ b/src/main/java/gregtech/api/util/GT_ClientPreference.java @@ -15,8 +15,10 @@ public class GT_ClientPreference { public GT_ClientPreference(GT_Config aClientDataFile) { this.mSingleBlockInitialFilter = aClientDataFile.get("preference", "mSingleBlockInitialFilter", false); - this.mSingleBlockInitialMultiStack = aClientDataFile - .get("preference", "mSingleBlockInitialAllowMultiStack", false); + this.mSingleBlockInitialMultiStack = aClientDataFile.get( + "preference", + "mSingleBlockInitialAllowMultiStack", + false); this.mInputBusInitialFilter = aClientDataFile.get("preference", "mInputBusInitialFilter", true); } diff --git a/src/main/java/gregtech/api/util/GT_Config.java b/src/main/java/gregtech/api/util/GT_Config.java index 337b3b7f68..40bff73ac7 100644 --- a/src/main/java/gregtech/api/util/GT_Config.java +++ b/src/main/java/gregtech/api/util/GT_Config.java @@ -32,8 +32,11 @@ public class GT_Config implements Runnable { public static int addIDConfig(Object aCategory, String aName, int aDefault) { if (GT_Utility.isStringInvalid(aName)) return aDefault; - Property tProperty = sConfigFileIDs - .get(aCategory.toString().replaceAll("\\|", "."), aName.replaceAll("\\|", "."), aDefault); + Property tProperty = sConfigFileIDs.get( + aCategory.toString() + .replaceAll("\\|", "."), + aName.replaceAll("\\|", "."), + aDefault); int rResult = tProperty.getInt(aDefault); if (!tProperty.wasRead() && shouldSave()) sConfigFileIDs.save(); return rResult; @@ -48,7 +51,8 @@ public class GT_Config implements Runnable { } catch (Throwable e) { /* Do nothing */ } - String sName = aStack.getItem().toString(); + String sName = aStack.getItem() + .toString(); String[] tmp = sName.split("@"); if (tmp.length > 0) sName = tmp[0]; return sName + "." + aStack.getItemDamage(); @@ -62,7 +66,8 @@ public class GT_Config implements Runnable { public boolean get(Object aCategory, String aName, boolean aDefault) { if (GT_Utility.isStringInvalid(aName)) return aDefault; Property tProperty = mConfig.get( - aCategory.toString().replaceAll("\\|", "_"), + aCategory.toString() + .replaceAll("\\|", "_"), (aName + "_" + aDefault).replaceAll("\\|", "_"), aDefault); boolean rResult = tProperty.getBoolean(aDefault); @@ -77,7 +82,8 @@ public class GT_Config implements Runnable { public int get(Object aCategory, String aName, int aDefault) { if (GT_Utility.isStringInvalid(aName)) return aDefault; Property tProperty = mConfig.get( - aCategory.toString().replaceAll("\\|", "_"), + aCategory.toString() + .replaceAll("\\|", "_"), (aName + "_" + aDefault).replaceAll("\\|", "_"), aDefault); int rResult = tProperty.getInt(aDefault); @@ -92,7 +98,8 @@ public class GT_Config implements Runnable { public double get(Object aCategory, String aName, double aDefault) { if (GT_Utility.isStringInvalid(aName)) return aDefault; Property tProperty = mConfig.get( - aCategory.toString().replaceAll("\\|", "_"), + aCategory.toString() + .replaceAll("\\|", "_"), (aName + "_" + aDefault).replaceAll("\\|", "_"), aDefault); double rResult = tProperty.getDouble(aDefault); @@ -107,7 +114,8 @@ public class GT_Config implements Runnable { public String get(Object aCategory, String aName, String aDefault) { if (GT_Utility.isStringInvalid(aName)) return aDefault; Property tProperty = mConfig.get( - aCategory.toString().replaceAll("\\|", "_"), + aCategory.toString() + .replaceAll("\\|", "_"), (aName + "_" + aDefault).replaceAll("\\|", "_"), aDefault); String rResult = tProperty.getString(); @@ -121,8 +129,11 @@ public class GT_Config implements Runnable { public String[] get(Object aCategory, String aName, String... aDefault) { if (GT_Utility.isStringInvalid(aName)) return aDefault; - Property tProperty = mConfig - .get(aCategory.toString().replaceAll("\\|", "_"), aName.replaceAll("\\|", "_"), aDefault); + Property tProperty = mConfig.get( + aCategory.toString() + .replaceAll("\\|", "_"), + aName.replaceAll("\\|", "_"), + aDefault); String[] rResult = tProperty.getStringList(); if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) mConfig.save(); return rResult; diff --git a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java index fed28825f3..33e8c9b1ce 100644 --- a/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java +++ b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java @@ -449,7 +449,9 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> { addTitleToUI(builder); addUIWidgets(builder); if (getUIBuildContext().isAnotherWindow()) { - builder.widget(ButtonWidget.closeWindowButton(true).setPos(getGUIWidth() - 15, 3)); + builder.widget( + ButtonWidget.closeWindowButton(true) + .setPos(getGUIWidth() - 15, 3)); } return builder.build(); } @@ -470,7 +472,8 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> { public T getCoverData() { if (isCoverValid()) { return forceCast( - getUIBuildContext().getTile().getComplexCoverDataAtSide(getUIBuildContext().getCoverSide())); + getUIBuildContext().getTile() + .getComplexCoverDataAtSide(getUIBuildContext().getCoverSide())); } else { return null; } @@ -478,13 +481,14 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> { public boolean setCoverData(T data) { if (isCoverValid()) { - getUIBuildContext().getTile().receiveCoverData( - getUIBuildContext().getCoverSide(), - getUIBuildContext().getCoverID(), - data, - getUIBuildContext().getPlayer() instanceof EntityPlayerMP - ? (EntityPlayerMP) getUIBuildContext().getPlayer() - : null); + getUIBuildContext().getTile() + .receiveCoverData( + getUIBuildContext().getCoverSide(), + getUIBuildContext().getCoverID(), + data, + getUIBuildContext().getPlayer() instanceof EntityPlayerMP + ? (EntityPlayerMP) getUIBuildContext().getPlayer() + : null); return true; } else { return false; @@ -492,16 +496,23 @@ public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> { } public boolean isCoverValid() { - return !getUIBuildContext().getTile().isDead() - && getUIBuildContext().getTile().getCoverBehaviorAtSideNew(getUIBuildContext().getCoverSide()) + return !getUIBuildContext().getTile() + .isDead() + && getUIBuildContext().getTile() + .getCoverBehaviorAtSideNew(getUIBuildContext().getCoverSide()) != GregTech_API.sNoBehavior; } protected void addTitleToUI(ModularWindow.Builder builder) { ItemStack coverItem = GT_Utility.intToStack(getUIBuildContext().getCoverID()); if (coverItem != null) { - builder.widget(new ItemDrawable(coverItem).asWidget().setPos(5, 5).setSize(16, 16)).widget( - new TextWidget(coverItem.getDisplayName()).setDefaultColor(COLOR_TITLE.get()).setPos(25, 9)); + builder.widget( + new ItemDrawable(coverItem).asWidget() + .setPos(5, 5) + .setSize(16, 16)) + .widget( + new TextWidget(coverItem.getDisplayName()).setDefaultColor(COLOR_TITLE.get()) + .setPos(25, 9)); } } diff --git a/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java b/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java index 90430c9bcb..9ca7a16031 100644 --- a/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java +++ b/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java @@ -43,8 +43,12 @@ public class GT_ExoticEnergyInputHelper { public static boolean drainEnergy(long aEU, Collection<? extends GT_MetaTileEntity_Hatch> hatches) { for (GT_MetaTileEntity_Hatch tHatch : hatches) { - long tDrain = Math.min(tHatch.getBaseMetaTileEntity().getStoredEU(), aEU); - tHatch.getBaseMetaTileEntity().decreaseStoredEnergyUnits(tDrain, false); + long tDrain = Math.min( + tHatch.getBaseMetaTileEntity() + .getStoredEU(), + aEU); + tHatch.getBaseMetaTileEntity() + .decreaseStoredEnergyUnits(tDrain, false); aEU -= tDrain; } return aEU <= 0; @@ -59,15 +63,18 @@ public class GT_ExoticEnergyInputHelper { public static long getTotalEuMulti(Collection<? extends GT_MetaTileEntity_Hatch> hatches) { long rEU = 0L; - for (GT_MetaTileEntity_Hatch tHatch : hatches) if (isValidMetaTileEntity(tHatch)) - rEU += tHatch.getBaseMetaTileEntity().getInputVoltage() * tHatch.maxWorkingAmperesIn(); + for (GT_MetaTileEntity_Hatch tHatch : hatches) + if (isValidMetaTileEntity(tHatch)) rEU += tHatch.getBaseMetaTileEntity() + .getInputVoltage() + * tHatch.maxWorkingAmperesIn(); return rEU; } public static long getMaxInputVoltageMulti(Collection<? extends GT_MetaTileEntity_Hatch> hatches) { long rVoltage = 0; for (GT_MetaTileEntity_Hatch tHatch : hatches) - if (isValidMetaTileEntity(tHatch)) rVoltage += tHatch.getBaseMetaTileEntity().getInputVoltage(); + if (isValidMetaTileEntity(tHatch)) rVoltage += tHatch.getBaseMetaTileEntity() + .getInputVoltage(); return rVoltage; } @@ -77,14 +84,16 @@ public class GT_ExoticEnergyInputHelper { return rVoltage; } for (GT_MetaTileEntity_Hatch tHatch : hatches) - if (isValidMetaTileEntity(tHatch)) rVoltage += tHatch.getBaseMetaTileEntity().getInputVoltage(); + if (isValidMetaTileEntity(tHatch)) rVoltage += tHatch.getBaseMetaTileEntity() + .getInputVoltage(); return rVoltage / hatches.size(); } public static long getMaxInputAmpsMulti(Collection<? extends GT_MetaTileEntity_Hatch> hatches) { long rAmp = 0; for (GT_MetaTileEntity_Hatch tHatch : hatches) - if (isValidMetaTileEntity(tHatch)) rAmp += tHatch.getBaseMetaTileEntity().getInputAmperage(); + if (isValidMetaTileEntity(tHatch)) rAmp += tHatch.getBaseMetaTileEntity() + .getInputAmperage(); return rAmp; } diff --git a/src/main/java/gregtech/api/util/GT_FoodStat.java b/src/main/java/gregtech/api/util/GT_FoodStat.java index cc1616f866..b658f3abe5 100644 --- a/src/main/java/gregtech/api/util/GT_FoodStat.java +++ b/src/main/java/gregtech/api/util/GT_FoodStat.java @@ -72,8 +72,12 @@ public class GT_FoodStat implements IFoodStat { aPlayer.dropPlayerItemWithRandomChoice(tStack, true); new WorldSpawnedEventBuilder.SoundAtEntityEventBuilder().setIdentifier(SoundResource.RANDOM_BURP) - .setVolume(0.5F).setPitch(aPlayer.worldObj.rand.nextFloat() * 0.1F + 0.9F).setEntity(aPlayer) - .setWorld(aPlayer.worldObj).run(); + .setVolume(0.5F) + .setPitch( + aPlayer.worldObj.rand.nextFloat() * 0.1F + 0.9F) + .setEntity(aPlayer) + .setWorld(aPlayer.worldObj) + .run(); if (!aPlayer.worldObj.isRemote) { if (mMilk) { @@ -90,9 +94,16 @@ public class GT_FoodStat implements IFoodStat { } } if (mExplosive) { - new WorldSpawnedEventBuilder.ExplosionEffectEventBuilder().setSmoking(true).setFlaming(true) - .setStrength(4f).setPosition(aPlayer.posX, aPlayer.posY, aPlayer.posZ).setEntity(aPlayer) - .setWorld(aPlayer.worldObj).run(); + new WorldSpawnedEventBuilder.ExplosionEffectEventBuilder().setSmoking(true) + .setFlaming(true) + .setStrength(4f) + .setPosition( + aPlayer.posX, + aPlayer.posY, + aPlayer.posZ) + .setEntity(aPlayer) + .setWorld(aPlayer.worldObj) + .run(); aPlayer.attackEntityFrom(GT_DamageSources.getExplodingDamage(), Float.MAX_VALUE); } } diff --git a/src/main/java/gregtech/api/util/GT_Forestry_Compat.java b/src/main/java/gregtech/api/util/GT_Forestry_Compat.java index 68c20f7fa1..95efdf40f0 100644 --- a/src/main/java/gregtech/api/util/GT_Forestry_Compat.java +++ b/src/main/java/gregtech/api/util/GT_Forestry_Compat.java @@ -134,7 +134,8 @@ public class GT_Forestry_Compat { int i = 0; for (Map.Entry<ItemStack, Float> entry : outputs.entrySet()) { tChances[i] = (int) (entry.getValue() * 10000); - tOutputs[i] = entry.getKey().copy(); + tOutputs[i] = entry.getKey() + .copy(); i++; } GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.addRecipe( diff --git a/src/main/java/gregtech/api/util/GT_GC_Compat.java b/src/main/java/gregtech/api/util/GT_GC_Compat.java index 93c7f35746..23b4a42930 100644 --- a/src/main/java/gregtech/api/util/GT_GC_Compat.java +++ b/src/main/java/gregtech/api/util/GT_GC_Compat.java @@ -29,8 +29,10 @@ public class GT_GC_Compat { if (tReceived > 0) { tSizeToReceive -= tReceived; while (tSizeToReceive > 0) { - tReceived = ((IEnergyHandlerGC) tTileEntity) - .receiveEnergyGC(eSource, tSizeToReceive, false); + tReceived = ((IEnergyHandlerGC) tTileEntity).receiveEnergyGC( + eSource, + tSizeToReceive, + false); if (tReceived < 1) break; tSizeToReceive -= tReceived; } diff --git a/src/main/java/gregtech/api/util/GT_HatchElementBuilder.java b/src/main/java/gregtech/api/util/GT_HatchElementBuilder.java index 96e721e9be..6c6ac4bc62 100644 --- a/src/main/java/gregtech/api/util/GT_HatchElementBuilder.java +++ b/src/main/java/gregtech/api/util/GT_HatchElementBuilder.java @@ -57,13 +57,22 @@ public class GT_HatchElementBuilder<T> { @SafeVarargs public final GT_HatchElementBuilder<T> anyOf(IHatchElement<? super T>... elements) { if (elements == null || elements.length == 0) throw new IllegalArgumentException(); - return adder(Arrays.stream(elements).map(e -> e.adder().rebrand()).reduce(IGT_HatchAdder::orElse).get()) - .hatchClasses( - Arrays.stream(elements).map(IHatchElement::mteClasses).flatMap(Collection::stream) - .collect(Collectors.toList())) - .cacheHint( - () -> Arrays.stream(elements).map(IHatchElement::name).sorted() - .collect(Collectors.joining(" or ", "of type ", ""))); + return adder( + Arrays.stream(elements) + .map( + e -> e.adder() + .rebrand()) + .reduce(IGT_HatchAdder::orElse) + .get()).hatchClasses( + Arrays.stream(elements) + .map(IHatchElement::mteClasses) + .flatMap(Collection::stream) + .collect(Collectors.toList())) + .cacheHint( + () -> Arrays.stream(elements) + .map(IHatchElement::name) + .sorted() + .collect(Collectors.joining(" or ", "of type ", ""))); } /** @@ -75,8 +84,8 @@ public class GT_HatchElementBuilder<T> { public final GT_HatchElementBuilder<T> atLeast(IHatchElement<? super T>... elements) { if (elements == null || elements.length == 0) throw new IllegalArgumentException(); return atLeast( - Arrays.stream(elements).collect( - Collectors.groupingBy(Function.identity(), LinkedHashMap::new, Collectors.counting()))); + Arrays.stream(elements) + .collect(Collectors.groupingBy(Function.identity(), LinkedHashMap::new, Collectors.counting()))); } /** @@ -87,8 +96,9 @@ public class GT_HatchElementBuilder<T> { public final GT_HatchElementBuilder<T> atLeastList(List<IHatchElement<? super T>> elements) { if (elements == null || elements.isEmpty()) throw new IllegalArgumentException(); return atLeast( - elements.stream().collect( - Collectors.groupingBy(Function.identity(), LinkedHashMap::new, Collectors.counting()))); + elements.stream() + .collect( + Collectors.groupingBy(Function.identity(), LinkedHashMap::new, Collectors.counting()))); } /** @@ -97,27 +107,58 @@ public class GT_HatchElementBuilder<T> { public final GT_HatchElementBuilder<T> atLeast(Map<IHatchElement<? super T>, ? extends Number> elements) { if (elements == null || elements.isEmpty() || elements.containsKey(null) || elements.containsValue(null)) throw new IllegalArgumentException(); - List<Class<? extends IMetaTileEntity>> list = elements.keySet().stream().map(IHatchElement::mteClasses) - .flatMap(Collection::stream).collect(Collectors.toList()); + List<Class<? extends IMetaTileEntity>> list = elements.keySet() + .stream() + .map(IHatchElement::mteClasses) + .flatMap(Collection::stream) + .collect(Collectors.toList()); // map cannot be null or empty, so assert Optional isPresent return adder( - elements.keySet().stream().map(e -> e.adder().rebrand()).reduce(IGT_HatchAdder::orElse) - .orElseThrow(AssertionError::new)).hatchItemFilter( - obj -> GT_StructureUtility.filterByMTEClass( - elements.entrySet().stream().filter( - entry -> entry.getKey().count(obj) < entry.getValue().longValue()) - .flatMap(entry -> entry.getKey().mteClasses().stream()) - .collect(Collectors.toList()))) - .shouldReject( - obj -> elements.entrySet().stream() - .allMatch(e -> e.getKey().count(obj) >= e.getValue().longValue())) - .shouldSkip( - (BiPredicate<? super T, ? super IGregTechTileEntity> & Builtin) (c, - t) -> t != null && list.stream() - .anyMatch(clazz -> clazz.isInstance(t.getMetaTileEntity()))) - .cacheHint( - () -> elements.keySet().stream().map(IHatchElement::name).sorted() - .collect(Collectors.joining(" or ", "of type ", ""))); + elements.keySet() + .stream() + .map( + e -> e.adder() + .rebrand()) + .reduce(IGT_HatchAdder::orElse) + .orElseThrow(AssertionError::new)) + .hatchItemFilter( + obj -> GT_StructureUtility.filterByMTEClass( + elements.entrySet() + .stream() + .filter( + entry -> entry.getKey() + .count(obj) + < entry.getValue() + .longValue()) + .flatMap( + entry -> entry.getKey() + .mteClasses() + .stream()) + .collect(Collectors.toList()))) + .shouldReject( + obj -> elements.entrySet() + .stream() + .allMatch( + e -> e.getKey() + .count(obj) + >= e.getValue() + .longValue())) + .shouldSkip( + (BiPredicate<? super T, ? super IGregTechTileEntity> & Builtin) ( + c, t) -> t != null && list.stream() + .anyMatch( + clazz -> clazz.isInstance( + t.getMetaTileEntity()))) + .cacheHint( + () -> elements.keySet() + .stream() + .map(IHatchElement::name) + .sorted() + .collect( + Collectors.joining( + " or ", + "of type ", + ""))); } // endregion @@ -167,7 +208,8 @@ public class GT_HatchElementBuilder<T> { Function<? super T, ? extends Predicate<ItemStack>> aHatchItemFilter) { if (aHatchItemFilter == null) throw new IllegalArgumentException(); BiFunction<? super T, ItemStack, ? extends Predicate<ItemStack>> tOldFilter = mHatchItemFilter; - mHatchItemFilter = (t, s) -> tOldFilter.apply(t, s).and(aHatchItemFilter.apply(t)); + mHatchItemFilter = (t, s) -> tOldFilter.apply(t, s) + .and(aHatchItemFilter.apply(t)); return this; } @@ -182,7 +224,8 @@ public class GT_HatchElementBuilder<T> { BiFunction<? super T, ItemStack, ? extends Predicate<ItemStack>> aHatchItemFilter) { if (aHatchItemFilter == null) throw new IllegalArgumentException(); BiFunction<? super T, ItemStack, ? extends Predicate<ItemStack>> tOldFilter = mHatchItemFilter; - mHatchItemFilter = (t, s) -> tOldFilter.apply(t, s).and(aHatchItemFilter.apply(t, s)); + mHatchItemFilter = (t, s) -> tOldFilter.apply(t, s) + .and(aHatchItemFilter.apply(t, s)); return this; } @@ -254,10 +297,14 @@ public class GT_HatchElementBuilder<T> { // region intermediate public GT_HatchElementBuilder<T> hatchClass(Class<? extends IMetaTileEntity> clazz) { - return hatchItemFilter(c -> is -> clazz.isInstance(GT_Item_Machines.getMetaTileEntity(is))) - .cacheHint(() -> "of class " + clazz.getSimpleName()).shouldSkip( - (BiPredicate<? super T, ? super IGregTechTileEntity> & Builtin) (c, t) -> clazz - .isInstance(t.getMetaTileEntity())); + return hatchItemFilter( + c -> is -> clazz.isInstance(GT_Item_Machines.getMetaTileEntity(is))).cacheHint( + () -> "of class " + clazz.getSimpleName()) + .shouldSkip( + (BiPredicate<? super T, ? super IGregTechTileEntity> & Builtin) ( + c, + t) -> clazz.isInstance( + t.getMetaTileEntity())); } @SafeVarargs @@ -267,21 +314,27 @@ public class GT_HatchElementBuilder<T> { public final GT_HatchElementBuilder<T> hatchClasses(List<? extends Class<? extends IMetaTileEntity>> classes) { List<? extends Class<? extends IMetaTileEntity>> list = new ArrayList<>(classes); - return hatchItemFilter(obj -> GT_StructureUtility.filterByMTEClass(list)) - .cacheHint( - () -> list.stream().map(Class::getSimpleName).sorted() - .collect(Collectors.joining(" or ", "of class ", ""))) - .shouldSkip( - (BiPredicate<? super T, ? super IGregTechTileEntity> & Builtin) (c, t) -> t != null - && list.stream().anyMatch(clazz -> clazz.isInstance(t.getMetaTileEntity()))); + return hatchItemFilter(obj -> GT_StructureUtility.filterByMTEClass(list)).cacheHint( + () -> list.stream() + .map(Class::getSimpleName) + .sorted() + .collect(Collectors.joining(" or ", "of class ", ""))) + .shouldSkip( + (BiPredicate<? super T, ? super IGregTechTileEntity> & Builtin) ( + c, t) -> t != null + && list.stream() + .anyMatch( + clazz -> clazz.isInstance( + t.getMetaTileEntity()))); } public GT_HatchElementBuilder<T> hatchId(int aId) { return hatchItemFilter( c -> is -> GT_Utility.isStackValid(is) && is.getItem() instanceof GT_Item_Machines - && is.getItemDamage() == aId).cacheHint(() -> "of id " + aId).shouldSkip( - (BiPredicate<? super T, ? super IGregTechTileEntity> & Builtin) (c, t) -> t != null - && t.getMetaTileID() == aId); + && is.getItemDamage() == aId).cacheHint(() -> "of id " + aId) + .shouldSkip( + (BiPredicate<? super T, ? super IGregTechTileEntity> & Builtin) ( + c, t) -> t != null && t.getMetaTileID() == aId); } public GT_HatchElementBuilder<T> hatchIds(int... aIds) { @@ -290,13 +343,15 @@ public class GT_HatchElementBuilder<T> { TIntCollection coll = aIds.length < 16 ? new TIntArrayList(aIds) : new TIntHashSet(aIds); return hatchItemFilter( c -> is -> GT_Utility.isStackValid(is) && is.getItem() instanceof GT_Item_Machines - && coll.contains(is.getItemDamage())) - .cacheHint( - () -> Arrays.stream(coll.toArray()).sorted().mapToObj(String::valueOf) - .collect(Collectors.joining(" or ", "of id ", ""))) - .shouldSkip( - (BiPredicate<? super T, ? super IGregTechTileEntity> & Builtin) (c, - t) -> t != null && coll.contains(t.getMetaTileID())); + && coll.contains(is.getItemDamage())).cacheHint( + () -> Arrays.stream(coll.toArray()) + .sorted() + .mapToObj(String::valueOf) + .collect(Collectors.joining(" or ", "of id ", ""))) + .shouldSkip( + (BiPredicate<? super T, ? super IGregTechTileEntity> & Builtin) ( + c, t) -> t != null && coll.contains( + t.getMetaTileID())); } // endregion @@ -407,10 +462,12 @@ public class GT_HatchElementBuilder<T> { if (!StructureLibAPI.isBlockTriviallyReplaceable(world, x, y, z, env.getActor())) return PlaceResult.REJECT; if (mReject != null && mReject.test(t)) return PlaceResult.REJECT; - ItemStack taken = env.getSource().takeOne(mHatchItemFilter.apply(t, trigger), true); + ItemStack taken = env.getSource() + .takeOne(mHatchItemFilter.apply(t, trigger), true); if (GT_Utility.isStackInvalid(taken)) { String type = getHint(); - env.getChatter().accept(new ChatComponentTranslation("GT5U.autoplace.error.no_hatch", type)); + env.getChatter() + .accept(new ChatComponentTranslation("GT5U.autoplace.error.no_hatch", type)); return PlaceResult.REJECT; } if (StructureUtility.survivalPlaceBlock( @@ -440,7 +497,9 @@ public class GT_HatchElementBuilder<T> { // explicitly rejected, probably obstructed by another slice if (mDisallowedDirection.contains(direction)) continue; ForgeDirection rotated = env.getFacing() - .getWorldDirection(direction.offsetY != 0 ? direction.getOpposite() : direction); + .getWorldDirection( + direction.offsetY != 0 ? direction.getOpposite() + : direction); allowed.add(rotated); } } diff --git a/src/main/java/gregtech/api/util/GT_LanguageManager.java b/src/main/java/gregtech/api/util/GT_LanguageManager.java index ab077ff946..26651b42a3 100644 --- a/src/main/java/gregtech/api/util/GT_LanguageManager.java +++ b/src/main/java/gregtech/api/util/GT_LanguageManager.java @@ -36,13 +36,17 @@ public class GT_LanguageManager { static { try { - Field fieldStringTranslateLanguageList = ReflectionHelper - .findField(net.minecraft.util.StringTranslate.class, "languageList", "field_74816_c"); - Field fieldStringTranslateInstance = ReflectionHelper - .findField(net.minecraft.util.StringTranslate.class, "instance", "field_74817_a"); + Field fieldStringTranslateLanguageList = ReflectionHelper.findField( + net.minecraft.util.StringTranslate.class, + "languageList", + "field_74816_c"); + Field fieldStringTranslateInstance = ReflectionHelper.findField( + net.minecraft.util.StringTranslate.class, + "instance", + "field_74817_a"); // noinspection unchecked - stringTranslateLanguageList = (Map<String, String>) fieldStringTranslateLanguageList - .get(fieldStringTranslateInstance.get(null)); + stringTranslateLanguageList = (Map<String, String>) fieldStringTranslateLanguageList.get( + fieldStringTranslateInstance.get(null)); } catch (Exception e) { e.printStackTrace(); } @@ -62,7 +66,8 @@ public class GT_LanguageManager { } } TEMPMAP.put(aKey.trim(), aEnglish); - LanguageRegistry.instance().injectLanguage(sLanguage, TEMPMAP); + LanguageRegistry.instance() + .injectLanguage(sLanguage, TEMPMAP); TEMPMAP.clear(); if (sUseEnglishFile && !aWriteIntoLangFile) { if (!LANGMAP.containsKey(aKey)) { @@ -89,7 +94,8 @@ public class GT_LanguageManager { } Property tProperty = sEnglishFile.get("LanguageFile", aKey.trim(), aEnglish); if (!tProperty.wasRead() && GregTech_API.sPostloadFinished) sEnglishFile.save(); - if (sEnglishFile.get("EnableLangFile", "UseThisFileAsLanguageFile", false).getBoolean(false)) { + if (sEnglishFile.get("EnableLangFile", "UseThisFileAsLanguageFile", false) + .getBoolean(false)) { aEnglish = tProperty.getString(); sUseEnglishFile = true; } @@ -101,7 +107,8 @@ public class GT_LanguageManager { if (aKey == null) return E; String tTrimmedKey = aKey.trim(), rTranslation; if (sUseEnglishFile) { - rTranslation = LanguageRegistry.instance().getStringLocalization(tTrimmedKey); + rTranslation = LanguageRegistry.instance() + .getStringLocalization(tTrimmedKey); } else { rTranslation = StatCollector.translateToLocal(tTrimmedKey); } @@ -140,7 +147,8 @@ public class GT_LanguageManager { if (GT_Utility.isStackInvalid(aStack)) return "null"; NBTTagCompound tNBT = aStack.getTagCompound(); if (tNBT != null && tNBT.hasKey("display")) { - String tName = tNBT.getCompoundTag("display").getString("Name"); + String tName = tNBT.getCompoundTag("display") + .getString("Name"); if (GT_Utility.isStringValid(tName)) { return tName; } diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index c5060ff93f..ec3f8a2b70 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -445,8 +445,9 @@ public class GT_ModHandler { public static boolean addValuableOre(Block aBlock, int aMeta, int aValue) { if (aValue <= 0) return false; try { - Class.forName("ic2.core.IC2").getMethod("addValuableOre", IRecipeInput.class, int.class) - .invoke(null, new RecipeInputItemStack(new ItemStack(aBlock, 1, aMeta)), aValue); + Class.forName("ic2.core.IC2") + .getMethod("addValuableOre", IRecipeInput.class, int.class) + .invoke(null, new RecipeInputItemStack(new ItemStack(aBlock, 1, aMeta)), aValue); } catch (Throwable e) { /* Do nothing */ } @@ -506,7 +507,8 @@ public class GT_ModHandler { aOutput = GT_OreDictUnificator.get(true, aOutput); if (aInput == null || aOutput == null || GT_Utility.getContainerItem(aInput, false) != null) return false; if (!GregTech_API.sRecipeFile.get(ConfigCategories.Machines.smelting, aInput, true)) return false; - FurnaceRecipes.smelting().func_151394_a(aInput, GT_Utility.copyOrNull(aOutput), 0.0F); + FurnaceRecipes.smelting() + .func_151394_a(aInput, GT_Utility.copyOrNull(aOutput), 0.0F); return true; } @@ -675,7 +677,8 @@ public class GT_ModHandler { public static boolean addOreToIngotSmeltingRecipe(ItemStack aInput, ItemStack aOutput) { aOutput = GT_OreDictUnificator.get(true, aOutput); if (aInput == null || aOutput == null) return false; - FurnaceRecipes.smelting().func_151394_a(aInput, GT_Utility.copyOrNull(aOutput), 0.0F); + FurnaceRecipes.smelting() + .func_151394_a(aInput, GT_Utility.copyOrNull(aOutput), 0.0F); return true; } @@ -693,10 +696,14 @@ public class GT_ModHandler { if (aAddGTRecipe && (aGTRecipeMap.findRecipe(null, false, Long.MAX_VALUE, null, tStack) == null)) { try { - if (aExcludeGTIC2Items && ((tStack.getUnlocalizedName().contains("gt.metaitem.01") - || tStack.getUnlocalizedName().contains("gt.blockores") - || tStack.getUnlocalizedName().contains("ic2.itemCrushed") - || tStack.getUnlocalizedName().contains("ic2.itemPurifiedCrushed")))) + if (aExcludeGTIC2Items && ((tStack.getUnlocalizedName() + .contains("gt.metaitem.01") + || tStack.getUnlocalizedName() + .contains("gt.blockores") + || tStack.getUnlocalizedName() + .contains("ic2.itemCrushed") + || tStack.getUnlocalizedName() + .contains("ic2.itemPurifiedCrushed")))) continue; switch (aGTRecipeMap.mUnlocalizedName) { case "gt.recipe.macerator": @@ -705,10 +712,11 @@ public class GT_ModHandler { aGTRecipeMap.addRecipe( true, new ItemStack[] { GT_Utility.copyAmount( - iRecipeInputRecipeOutputEntry.getKey().getAmount(), + iRecipeInputRecipeOutputEntry.getKey() + .getAmount(), tStack) }, - iRecipeInputRecipeOutputEntry.getValue().items - .toArray(new ItemStack[0]), + iRecipeInputRecipeOutputEntry.getValue().items.toArray( + new ItemStack[0]), null, null, null, @@ -721,10 +729,11 @@ public class GT_ModHandler { aGTRecipeMap.addRecipe( true, new ItemStack[] { GT_Utility.copyAmount( - iRecipeInputRecipeOutputEntry.getKey().getAmount(), + iRecipeInputRecipeOutputEntry.getKey() + .getAmount(), tStack) }, - iRecipeInputRecipeOutputEntry.getValue().items - .toArray(new ItemStack[0]), + iRecipeInputRecipeOutputEntry.getValue().items.toArray( + new ItemStack[0]), null, null, null, @@ -929,7 +938,11 @@ public class GT_ModHandler { if (aResult == null || aRecipe == null || aResult.stackSize <= 0) return false; try { mods.railcraft.api.crafting.RailcraftCraftingManager.rollingMachine.getRecipeList() - .add(new ShapedOreRecipe(GT_Utility.copyOrNull(aResult), aRecipe)); + .add( + new ShapedOreRecipe( + GT_Utility.copyOrNull( + aResult), + aRecipe)); } catch (Throwable e) { return addCraftingRecipe(GT_Utility.copyOrNull(aResult), aRecipe); } @@ -1076,7 +1089,8 @@ public class GT_ModHandler { 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); @@ -1212,7 +1226,9 @@ public class GT_ModHandler { if (aReversible && aResult != null) { ItemData[] tData = new ItemData[9]; int x = -1; - for (char chr : shape.toString().toCharArray()) tData[++x] = tItemDataMap.get(chr); + for (char chr : shape.toString() + .toCharArray()) + tData[++x] = tItemDataMap.get(chr); if (GT_Utility.arrayContainsNonNull(tData)) GT_OreDictUnificator.addItemData(aResult, new ItemData(tData)); } @@ -1220,7 +1236,8 @@ public class GT_ModHandler { if (aCheckForCollisions && tRemoveRecipe) { ItemStack[] tRecipe = new ItemStack[9]; int x = -1; - for (char chr : shape.toString().toCharArray()) { + for (char chr : shape.toString() + .toCharArray()) { tRecipe[++x] = tItemStackMap.get(chr); if (tRecipe[x] != null && Items.feather.getDamage(tRecipe[x]) == W) Items.feather.setDamage(tRecipe[x], 0); @@ -1247,11 +1264,15 @@ public class GT_ModHandler { } if (aOnlyAddIfThereIsAnyRecipeOutputtingThis && !tDoWeCareIfThereWasARecipe && !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 (sSpecialRecipeClasses.contains(tRecipe.getClass().getName())) continue; + if (sSpecialRecipeClasses.contains( + tRecipe.getClass() + .getName())) + continue; if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(tRecipe.getRecipeOutput()), aResult, true)) { tList.remove(i--); tList_sS = tList.size(); @@ -1403,9 +1424,13 @@ public class GT_ModHandler { */ public static boolean removeFurnaceSmelting(ItemStack aInput) { if (aInput != null) { - for (Object tInput : FurnaceRecipes.smelting().getSmeltingList().keySet()) { + for (Object tInput : FurnaceRecipes.smelting() + .getSmeltingList() + .keySet()) { if (GT_Utility.isStackValid(tInput) && GT_Utility.areStacksEqual(aInput, (ItemStack) tInput, true)) { - FurnaceRecipes.smelting().getSmeltingList().remove(tInput); + FurnaceRecipes.smelting() + .getSmeltingList() + .remove(tInput); return true; } } @@ -1418,9 +1443,12 @@ public class GT_ModHandler { */ public static boolean removeFurnaceSmeltingByOutput(ItemStack aOutput) { if (aOutput != null) { - return FurnaceRecipes.smelting().getSmeltingList().values().removeIf( - tOutput -> GT_Utility.isStackValid(tOutput) - && GT_Utility.areStacksEqual(aOutput, (ItemStack) tOutput, true)); + return FurnaceRecipes.smelting() + .getSmeltingList() + .values() + .removeIf( + tOutput -> GT_Utility.isStackValid(tOutput) + && GT_Utility.areStacksEqual(aOutput, (ItemStack) tOutput, true)); } return false; } @@ -1433,7 +1461,9 @@ public class GT_ModHandler { */ public static ItemStack removeRecipe(ItemStack... aRecipe) { if (aRecipe == null) return null; - if (Arrays.stream(aRecipe).noneMatch(Objects::nonNull)) return null; + if (Arrays.stream(aRecipe) + .noneMatch(Objects::nonNull)) + return null; ItemStack rReturn = null; InventoryCrafting aCrafting = new InventoryCrafting(new Container() { @@ -1444,15 +1474,17 @@ public class GT_ModHandler { } }, 3, 3); for (int i = 0; i < aRecipe.length && i < 9; i++) aCrafting.setInventorySlotContents(i, aRecipe[i]); - ArrayList<IRecipe> tList = (ArrayList<IRecipe>) CraftingManager.getInstance().getRecipeList(); + ArrayList<IRecipe> tList = (ArrayList<IRecipe>) CraftingManager.getInstance() + .getRecipeList(); int tList_sS = tList.size(); try { for (int i = 0; i < tList_sS; i++) { for (; i < tList_sS; i++) { if ((!(tList.get(i) instanceof IGT_CraftingRecipe) - || ((IGT_CraftingRecipe) tList.get(i)).isRemovable()) - && tList.get(i).matches(aCrafting, DW)) { - rReturn = tList.get(i).getCraftingResult(aCrafting); + || ((IGT_CraftingRecipe) tList.get(i)).isRemovable()) && tList.get(i) + .matches(aCrafting, DW)) { + rReturn = tList.get(i) + .getCraftingResult(aCrafting); if (rReturn != null) tList.remove(i--); tList_sS = tList.size(); } @@ -1471,7 +1503,9 @@ public class GT_ModHandler { } if (aRecipe == null) return; - if (Arrays.stream(aRecipe).noneMatch(Objects::nonNull)) return; + if (Arrays.stream(aRecipe) + .noneMatch(Objects::nonNull)) + return; InventoryCrafting aCrafting = new InventoryCrafting(new Container() { @@ -1486,13 +1520,19 @@ public class GT_ModHandler { @SuppressWarnings("unchecked") public static void bulkRemoveByRecipe(List<InventoryCrafting> toRemove) { - ArrayList<IRecipe> tList = (ArrayList<IRecipe>) CraftingManager.getInstance().getRecipeList(); + ArrayList<IRecipe> tList = (ArrayList<IRecipe>) CraftingManager.getInstance() + .getRecipeList(); GT_FML_LOGGER.info("BulkRemoveByRecipe: tList: " + tList.size() + " toRemove: " + toRemove.size()); - Set<IRecipe> tListToRemove = tList.parallelStream().filter(tRecipe -> { - if ((tRecipe instanceof IGT_CraftingRecipe) && !((IGT_CraftingRecipe) tRecipe).isRemovable()) return false; - return toRemove.stream().anyMatch(aCrafting -> tRecipe.matches(aCrafting, DW)); - }).collect(Collectors.toSet()); + Set<IRecipe> tListToRemove = tList.parallelStream() + .filter(tRecipe -> { + if ((tRecipe instanceof IGT_CraftingRecipe) + && !((IGT_CraftingRecipe) tRecipe).isRemovable()) + return false; + return toRemove.stream() + .anyMatch(aCrafting -> tRecipe.matches(aCrafting, DW)); + }) + .collect(Collectors.toSet()); tList.removeIf(tListToRemove::contains); } @@ -1524,7 +1564,8 @@ public class GT_ModHandler { boolean aNotRemoveShapelessRecipes, boolean aOnlyRemoveNativeHandlers) { if (aOutput == null) return false; boolean rReturn = false; - ArrayList<IRecipe> tList = (ArrayList<IRecipe>) CraftingManager.getInstance().getRecipeList(); + ArrayList<IRecipe> tList = (ArrayList<IRecipe>) CraftingManager.getInstance() + .getRecipeList(); aOutput = GT_OreDictUnificator.get(aOutput); int tList_sS = tList.size(); for (int i = 0; i < tList_sS; i++) { @@ -1533,9 +1574,15 @@ public class GT_ModHandler { && (tRecipe instanceof ShapelessRecipes || tRecipe instanceof ShapelessOreRecipe)) continue; if (aOnlyRemoveNativeHandlers) { - if (!sNativeRecipeClasses.contains(tRecipe.getClass().getName())) continue; + if (!sNativeRecipeClasses.contains( + tRecipe.getClass() + .getName())) + continue; } else { - if (sSpecialRecipeClasses.contains(tRecipe.getClass().getName())) continue; + if (sSpecialRecipeClasses.contains( + tRecipe.getClass() + .getName())) + continue; } ItemStack tStack = tRecipe.getRecipeOutput(); if ((!(tRecipe instanceof IGT_CraftingRecipe) || ((IGT_CraftingRecipe) tRecipe).isRemovable()) @@ -1549,19 +1596,34 @@ public class GT_ModHandler { } public static boolean bulkRemoveRecipeByOutput(List<ItemStack> toRemove) { - ArrayList<IRecipe> tList = (ArrayList<IRecipe>) CraftingManager.getInstance().getRecipeList(); + ArrayList<IRecipe> tList = (ArrayList<IRecipe>) CraftingManager.getInstance() + .getRecipeList(); - Set<ItemStack> setToRemove = toRemove.parallelStream().map(GT_OreDictUnificator::get_nocopy) - .collect(Collectors.toSet()); + Set<ItemStack> setToRemove = toRemove.parallelStream() + .map(GT_OreDictUnificator::get_nocopy) + .collect(Collectors.toSet()); GT_FML_LOGGER.info("BulkRemoveRecipeByOutput: tList: " + tList.size() + " setToRemove: " + setToRemove.size()); - Set<IRecipe> tListToRemove = tList.parallelStream().filter(tRecipe -> { - if ((tRecipe instanceof IGT_CraftingRecipe) && !((IGT_CraftingRecipe) tRecipe).isRemovable()) return false; - if (sSpecialRecipeClasses.contains(tRecipe.getClass().getName())) return false; - final ItemStack tStack = GT_OreDictUnificator.get_nocopy(tRecipe.getRecipeOutput()); - return setToRemove.stream().anyMatch(aOutput -> GT_Utility.areStacksEqual(tStack, aOutput, true)); - }).collect(Collectors.toSet()); + Set<IRecipe> tListToRemove = tList.parallelStream() + .filter(tRecipe -> { + if ((tRecipe instanceof IGT_CraftingRecipe) + && !((IGT_CraftingRecipe) tRecipe).isRemovable()) + return false; + if (sSpecialRecipeClasses.contains( + tRecipe.getClass() + .getName())) + return false; + final ItemStack tStack = GT_OreDictUnificator.get_nocopy( + tRecipe.getRecipeOutput()); + return setToRemove.stream() + .anyMatch( + aOutput -> GT_Utility.areStacksEqual( + tStack, + aOutput, + true)); + }) + .collect(Collectors.toSet()); tList.removeIf(tListToRemove::contains); return true; @@ -1591,7 +1653,8 @@ public class GT_ModHandler { } }, 3, 3); for (int i = 0; i < 9 && i < aRecipe.length; i++) aCrafting.setInventorySlotContents(i, aRecipe[i]); - List<IRecipe> tList = CraftingManager.getInstance().getRecipeList(); + List<IRecipe> tList = CraftingManager.getInstance() + .getRecipeList(); synchronized (sAllRecipeList) { if (sAllRecipeList.size() != tList.size()) { sAllRecipeList.clear(); @@ -1624,7 +1687,8 @@ public class GT_ModHandler { assert tStack1 != null && tStack2 != null; if (tStack1.getItem() == tStack2.getItem() && tStack1.stackSize == 1 && tStack2.stackSize == 1 - && tStack1.getItem().isRepairable()) { + && tStack1.getItem() + .isRepairable()) { int tNewDamage = tStack1.getMaxDamage() + tStack1.getItemDamage() - tStack2.getItemDamage() + tStack1.getMaxDamage() / 20; @@ -1655,7 +1719,9 @@ public class GT_ModHandler { */ @SuppressWarnings("unchecked") public static ItemStack getRecipeOutput(boolean aUncopiedStack, boolean allowOreDict, ItemStack... aRecipe) { - if (aRecipe == null || Arrays.stream(aRecipe).noneMatch(Objects::nonNull)) return null; + if (aRecipe == null || Arrays.stream(aRecipe) + .noneMatch(Objects::nonNull)) + return null; InventoryCrafting aCrafting = new InventoryCrafting(new Container() { @@ -1665,7 +1731,8 @@ public class GT_ModHandler { } }, 3, 3); for (int i = 0; i < 9 && i < aRecipe.length; i++) aCrafting.setInventorySlotContents(i, aRecipe[i]); - ArrayList<IRecipe> tList = (ArrayList<IRecipe>) CraftingManager.getInstance().getRecipeList(); + ArrayList<IRecipe> tList = (ArrayList<IRecipe>) CraftingManager.getInstance() + .getRecipeList(); boolean found = false; for (IRecipe iRecipe : tList) { @@ -1700,7 +1767,8 @@ public class GT_ModHandler { if (!GregTech_API.sPostloadStarted || GregTech_API.sPostloadFinished) sSingleNonBlockDamagableRecipeList.clear(); if (sSingleNonBlockDamagableRecipeList.isEmpty()) { - for (IRecipe tRecipe : (ArrayList<IRecipe>) CraftingManager.getInstance().getRecipeList()) { + for (IRecipe tRecipe : (ArrayList<IRecipe>) CraftingManager.getInstance() + .getRecipeList()) { ItemStack tStack = tRecipe.getRecipeOutput(); if (GT_Utility.isStackValid(tStack) && tStack.getMaxStackSize() == 1 && tStack.getMaxDamage() > 0 @@ -1760,7 +1828,11 @@ public class GT_ModHandler { * example */ public static List<ItemStack> getRecipeOutputs(ItemStack... aRecipe) { - return getRecipeOutputs(CraftingManager.getInstance().getRecipeList(), false, aRecipe); + return getRecipeOutputs( + CraftingManager.getInstance() + .getRecipeList(), + false, + aRecipe); } private static List<IRecipe> bufferedRecipes = null; @@ -1771,20 +1843,27 @@ public class GT_ModHandler { */ public static List<ItemStack> getRecipeOutputsBuffered(ItemStack... aRecipe) { - if (bufferedRecipes == null) bufferedRecipes = (List<IRecipe>) CraftingManager.getInstance().getRecipeList() - .stream() - .filter( - tRecipe -> !(tRecipe instanceof ShapelessRecipes) && !(tRecipe instanceof ShapelessOreRecipe) - && !(tRecipe instanceof IGT_CraftingRecipe)) - .filter(tRecipe -> { - try { - ItemStack tOutput = ((IRecipe) tRecipe).getRecipeOutput(); - if (tOutput.stackSize == 1 && tOutput.getMaxDamage() > 0 && tOutput.getMaxStackSize() == 1) { - return true; - } - } catch (Exception ignored) {} - return false; - }).collect(Collectors.toList()); + if (bufferedRecipes == null) bufferedRecipes = (List<IRecipe>) CraftingManager.getInstance() + .getRecipeList() + .stream() + .filter( + tRecipe -> !(tRecipe instanceof ShapelessRecipes) + && !(tRecipe instanceof ShapelessOreRecipe) + && !(tRecipe instanceof IGT_CraftingRecipe)) + .filter(tRecipe -> { + try { + ItemStack tOutput = ((IRecipe) tRecipe).getRecipeOutput(); + if (tOutput.stackSize == 1 + && tOutput.getMaxDamage() + > 0 + && tOutput.getMaxStackSize() + == 1) { + return true; + } + } catch (Exception ignored) {} + return false; + }) + .collect(Collectors.toList()); return getRecipeOutputs(bufferedRecipes, false, aRecipe); } @@ -1794,7 +1873,9 @@ public class GT_ModHandler { */ public static List<ItemStack> getRecipeOutputs(List<IRecipe> aList, boolean aDeleteFromList, ItemStack... aRecipe) { List<ItemStack> rList = new ArrayList<>(); - if (aRecipe == null || Arrays.stream(aRecipe).noneMatch(Objects::nonNull)) return rList; + if (aRecipe == null || Arrays.stream(aRecipe) + .noneMatch(Objects::nonNull)) + return rList; InventoryCrafting aCrafting = new InventoryCrafting(new Container() { @Override @@ -1805,20 +1886,24 @@ public class GT_ModHandler { for (int i = 0; i < 9 && i < aRecipe.length; i++) aCrafting.setInventorySlotContents(i, aRecipe[i]); if (!aDeleteFromList) { HashSet<ItemStack> stacks = new HashSet<>(); - aList.stream().filter(tRecipe -> { - if (tRecipe instanceof ShapelessRecipes || tRecipe instanceof ShapelessOreRecipe - || tRecipe instanceof IGT_CraftingRecipe) - return false; - try { - return tRecipe.matches(aCrafting, DW); - } catch (Throwable e) { - e.printStackTrace(GT_Log.err); - return false; - } - }).forEach(tRecipe -> stacks.add(tRecipe.getCraftingResult(aCrafting))); - rList = stacks.stream().filter( - tOutput -> tOutput.stackSize == 1 && tOutput.getMaxDamage() > 0 && tOutput.getMaxStackSize() == 1) - .collect(Collectors.toList()); + aList.stream() + .filter(tRecipe -> { + if (tRecipe instanceof ShapelessRecipes || tRecipe instanceof ShapelessOreRecipe + || tRecipe instanceof IGT_CraftingRecipe) + return false; + try { + return tRecipe.matches(aCrafting, DW); + } catch (Throwable e) { + e.printStackTrace(GT_Log.err); + return false; + } + }) + .forEach(tRecipe -> stacks.add(tRecipe.getCraftingResult(aCrafting))); + rList = stacks.stream() + .filter( + tOutput -> tOutput.stackSize == 1 && tOutput.getMaxDamage() > 0 + && tOutput.getMaxStackSize() == 1) + .collect(Collectors.toList()); } else for (Iterator<IRecipe> iterator = aList.iterator(); iterator.hasNext();) { IRecipe tRecipe = iterator.next(); boolean matched = false; @@ -1887,7 +1972,9 @@ public class GT_ModHandler { */ public static ItemStack getSmeltingOutput(ItemStack aInput, boolean aRemoveInput, ItemStack aOutputSlot) { if (aInput == null || aInput.stackSize < 1) return null; - ItemStack rStack = GT_OreDictUnificator.get(FurnaceRecipes.smelting().getSmeltingResult(aInput)); + ItemStack rStack = GT_OreDictUnificator.get( + FurnaceRecipes.smelting() + .getSmeltingResult(aInput)); if (rStack != null && (aOutputSlot == null || (GT_Utility.areStacksEqual(rStack, aOutputSlot) && rStack.stackSize + aOutputSlot.stackSize <= aOutputSlot.getMaxStackSize()))) { @@ -1908,8 +1995,11 @@ public class GT_ModHandler { if (aInput == null) return new ItemStack[aOutputSlots.length]; try { for (Entry<IRecipeInput, RecipeOutput> tEntry : aRecipeList.entrySet()) { - if (tEntry.getKey().matches(aInput)) { - if (tEntry.getKey().getAmount() <= aInput.stackSize) { + if (tEntry.getKey() + .matches(aInput)) { + if (tEntry.getKey() + .getAmount() + <= aInput.stackSize) { ItemStack[] tList = tEntry.getValue().items.toArray(new ItemStack[0]); if (tList.length == 0) break; ItemStack[] rList = new ItemStack[aOutputSlots.length]; @@ -1926,7 +2016,8 @@ public class GT_ModHandler { } } - if (aRemoveInput) aInput.stackSize -= tEntry.getKey().getAmount(); + if (aRemoveInput) aInput.stackSize -= tEntry.getKey() + .getAmount(); return rList; } break; @@ -2090,24 +2181,25 @@ public class GT_ModHandler { return GT_ModHandler.dischargeElectricItem(aStack, aDecharge, Integer.MAX_VALUE, true, false, true) >= aDecharge; } - } else if (aStack.getItem().isDamageable()) { - if (aPlayer == null) { - aStack.setItemDamage(aStack.getItemDamage() + aDamage); - } else { - aStack.damageItem(aDamage, aPlayer); - } - if (aStack.getItemDamage() >= aStack.getMaxDamage()) { - aStack.setItemDamage(aStack.getMaxDamage() + 1); - ItemStack tStack = GT_Utility.getContainerItem(aStack, true); - if (tStack != null) { - aStack.func_150996_a(tStack.getItem()); - aStack.setItemDamage(tStack.getItemDamage()); - aStack.stackSize = tStack.stackSize; - aStack.setTagCompound(tStack.getTagCompound()); - } - } - return true; - } + } else if (aStack.getItem() + .isDamageable()) { + if (aPlayer == null) { + aStack.setItemDamage(aStack.getItemDamage() + aDamage); + } else { + aStack.damageItem(aDamage, aPlayer); + } + if (aStack.getItemDamage() >= aStack.getMaxDamage()) { + aStack.setItemDamage(aStack.getMaxDamage() + 1); + ItemStack tStack = GT_Utility.getContainerItem(aStack, true); + if (tStack != null) { + aStack.func_150996_a(tStack.getItem()); + aStack.setItemDamage(tStack.getItemDamage()); + aStack.stackSize = tStack.stackSize; + aStack.setTagCompound(tStack.getTagCompound()); + } + } + return true; + } return false; } diff --git a/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java b/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java index abbe441a25..db997c3640 100644 --- a/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java +++ b/src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java @@ -75,8 +75,10 @@ public class GT_Multiblock_Tooltip_Builder { private static final String TT_mod = StatCollector.translateToLocal("GT5U.MBTT.Mod"); private static final String TT_air = StatCollector.translateToLocal("GT5U.MBTT.Air"); private static final String[] TT_dots = IntStream.range(0, 16) - .mapToObj(i -> StatCollector.translateToLocal("structurelib.blockhint." + i + ".name")) - .toArray(String[]::new); + .mapToObj( + i -> StatCollector.translateToLocal( + "structurelib.blockhint." + i + ".name")) + .toArray(String[]::new); public GT_Multiblock_Tooltip_Builder() { iLines = new LinkedList<>(); @@ -567,12 +569,13 @@ public class GT_Multiblock_Tooltip_Builder { iArray = iLines.toArray(new String[0]); sArray = sLines.toArray(new String[0]); // e.getKey() - 1 because 1 dot is meta 0. - hArray = Stream - .concat( - hLines.stream(), - hBlocks.asMap().entrySet().stream() - .map(e -> TT_dots[e.getKey() - 1] + COLON + String.join(SEPARATOR, e.getValue()))) - .toArray(String[]::new); + hArray = Stream.concat( + hLines.stream(), + hBlocks.asMap() + .entrySet() + .stream() + .map(e -> TT_dots[e.getKey() - 1] + COLON + String.join(SEPARATOR, e.getValue()))) + .toArray(String[]::new); } public String[] getInformation() { diff --git a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java index 47f70a9c35..6670b86363 100644 --- a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java +++ b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java @@ -84,8 +84,14 @@ public class GT_OreDictUnificator { aStack = GT_Utility.copyAmount(1, aStack); if (!aAlreadyRegistered) registerOre(aPrefix.get(aMaterial), aStack); addAssociation(aPrefix, aMaterial, aStack, isBlacklisted(aStack)); - if (aOverwrite || GT_Utility.isStackInvalid(sName2StackMap.get(aPrefix.get(aMaterial).toString()))) - sName2StackMap.put(aPrefix.get(aMaterial).toString(), aStack); + if (aOverwrite || GT_Utility.isStackInvalid( + sName2StackMap.get( + aPrefix.get(aMaterial) + .toString()))) + sName2StackMap.put( + aPrefix.get(aMaterial) + .toString(), + aStack); isAddingOre--; } @@ -342,10 +348,13 @@ public class GT_OreDictUnificator { if (mRunThroughTheList) { if (GregTech_API.sLoadStarted) { mRunThroughTheList = false; - for (Entry<GT_ItemStack2, ItemData> tEntry : sItemStack2DataMap.entrySet()) - if (!tEntry.getValue().hasValidPrefixData() || tEntry.getValue().mPrefix.mAllowNormalRecycling) - GT_RecipeRegistrator - .registerMaterialRecycling(tEntry.getKey().toStack(), tEntry.getValue()); + for (Entry<GT_ItemStack2, ItemData> tEntry : sItemStack2DataMap.entrySet()) if (!tEntry.getValue() + .hasValidPrefixData() + || tEntry.getValue().mPrefix.mAllowNormalRecycling) + GT_RecipeRegistrator.registerMaterialRecycling( + tEntry.getKey() + .toStack(), + tEntry.getValue()); } } else { if (!aData.hasValidPrefixData() || aData.mPrefix.mAllowNormalRecycling) diff --git a/src/main/java/gregtech/api/util/GT_PCBFactoryManager.java b/src/main/java/gregtech/api/util/GT_PCBFactoryManager.java index dfc2af49ff..52561a063d 100644 --- a/src/main/java/gregtech/api/util/GT_PCBFactoryManager.java +++ b/src/main/java/gregtech/api/util/GT_PCBFactoryManager.java @@ -18,6 +18,7 @@ public class GT_PCBFactoryManager { } public static Materials getPlasticMaterialFromTier(int aTier) { - return mPlasticTiers.inverse().get(aTier); + return mPlasticTiers.inverse() + .get(aTier); } } diff --git a/src/main/java/gregtech/api/util/GT_ParallelHelper.java b/src/main/java/gregtech/api/util/GT_ParallelHelper.java index df2d26fc04..c12f8ec378 100644 --- a/src/main/java/gregtech/api/util/GT_ParallelHelper.java +++ b/src/main/java/gregtech/api/util/GT_ParallelHelper.java @@ -319,7 +319,8 @@ public class GT_ParallelHelper { if (mRecipe.getOutput(i) == null) { mItemOutputs[i] = null; } else { - ItemStack tItem = mRecipe.getOutput(i).copy(); + ItemStack tItem = mRecipe.getOutput(i) + .copy(); tItem.stackSize *= mCurrentParallel; mItemOutputs[i] = tItem; } @@ -332,7 +333,8 @@ public class GT_ParallelHelper { if (mRecipe.getFluidOutput(i) == null) { mFluidOutputs[i] = null; } else { - FluidStack tFluid = mRecipe.getFluidOutput(i).copy(); + FluidStack tFluid = mRecipe.getFluidOutput(i) + .copy(); tFluid.amount *= mCurrentParallel; mFluidOutputs[i] = tFluid; } @@ -392,7 +394,9 @@ public class GT_ParallelHelper { continue; } if (tHatch.isFluidLocked() && tLockedFluidName != null - && !tLockedFluidName.equals(tFluidOutput.getFluid().getName())) { + && !tLockedFluidName.equals( + tFluidOutput.getFluid() + .getName())) { continue; } } diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index e7443a63b5..7f39ef694d 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -698,10 +698,14 @@ public class GT_Recipe implements Comparable<GT_Recipe> { if (GT_OreDictUnificator.isInputStackEqual(providedItem, unifiedItemCost)) { if (GTppRecipeHelper) { // Please see JavaDoc on GTppRecipeHelper for why this is here. if (GT_Utility.areStacksEqual(providedItem, Ic2Items.FluidCell.copy(), true) - || GT_Utility - .areStacksEqual(providedItem, ItemList.Tool_DataStick.get(1L), true) - || GT_Utility - .areStacksEqual(providedItem, ItemList.Tool_DataOrb.get(1L), true)) { + || GT_Utility.areStacksEqual( + providedItem, + ItemList.Tool_DataStick.get(1L), + true) + || GT_Utility.areStacksEqual( + providedItem, + ItemList.Tool_DataOrb.get(1L), + true)) { if (!GT_Utility.areStacksEqual(providedItem, recipeItemCost, false)) continue; } } @@ -806,7 +810,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { } public void reloadOwner() { - setOwner(Loader.instance().activeModContainer()); + setOwner( + Loader.instance() + .activeModContainer()); final List<String> excludedClasses = Arrays.asList( "java.lang.Thread", @@ -816,8 +822,12 @@ public class GT_Recipe implements Comparable<GT_Recipe> { "gregtech.common.GT_RecipeAdder"); if (GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace) { List<StackTraceElement> toAdd = new ArrayList<>(); - for (StackTraceElement stackTrace : Thread.currentThread().getStackTrace()) { - if (excludedClasses.stream().noneMatch(c -> stackTrace.getClassName().equals(c))) { + for (StackTraceElement stackTrace : Thread.currentThread() + .getStackTrace()) { + if (excludedClasses.stream() + .noneMatch( + c -> stackTrace.getClassName() + .equals(c))) { toAdd.add(stackTrace); } } @@ -836,8 +846,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> { * Use in case {@link Loader#activeModContainer()} isn't helpful */ public void setOwner(String modId) { - for (ModContainer mod : Loader.instance().getModList()) { - if (mod.getModId().equals(modId)) { + for (ModContainer mod : Loader.instance() + .getModList()) { + if (mod.getModId() + .equals(modId)) { setOwner(mod); return; } @@ -1094,9 +1106,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE) - .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_DUST) - .setRecipeConfigFile("orewasher", FIRST_ITEM_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_BATH, ProgressBar.Direction.CIRCULAR_CW); + .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_DUST) + .setRecipeConfigFile("orewasher", FIRST_ITEM_INPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_BATH, ProgressBar.Direction.CIRCULAR_CW); public static final GT_Recipe_Map sThermalCentrifugeRecipes = new GT_Recipe_Map( new HashSet<>(1000), "gt.recipe.thermalcentrifuge", @@ -1113,9 +1125,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE) - .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_DUST) - .setRecipeConfigFile("thermalcentrifuge", FIRST_ITEM_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); + .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_DUST) + .setRecipeConfigFile("thermalcentrifuge", FIRST_ITEM_INPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sCompressorRecipes = new GT_Recipe_Map( new HashSet<>(750), "gt.recipe.compressor", @@ -1132,10 +1144,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_COMPRESSOR) - .setRecipeConfigFile("compressor", FIRST_ITEM_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_COMPRESS, ProgressBar.Direction.RIGHT) - .setSlotOverlaySteam(false, GT_UITextures.OVERLAY_SLOT_COMPRESSOR_STEAM) - .setProgressBarSteam(GT_UITextures.PROGRESSBAR_COMPRESS_STEAM); + .setRecipeConfigFile("compressor", FIRST_ITEM_INPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_COMPRESS, ProgressBar.Direction.RIGHT) + .setSlotOverlaySteam(false, GT_UITextures.OVERLAY_SLOT_COMPRESSOR_STEAM) + .setProgressBarSteam(GT_UITextures.PROGRESSBAR_COMPRESS_STEAM); public static final GT_Recipe_Map sExtractorRecipes = new GT_Recipe_Map( new HashSet<>(250), "gt.recipe.extractor", @@ -1152,10 +1164,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CENTRIFUGE) - .setRecipeConfigFile("extractor", FIRST_ITEM_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT, ProgressBar.Direction.RIGHT) - .setSlotOverlaySteam(false, GT_UITextures.OVERLAY_SLOT_CENTRIFUGE_STEAM) - .setProgressBarSteam(GT_UITextures.PROGRESSBAR_EXTRACT_STEAM); + .setRecipeConfigFile("extractor", FIRST_ITEM_INPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT, ProgressBar.Direction.RIGHT) + .setSlotOverlaySteam(false, GT_UITextures.OVERLAY_SLOT_CENTRIFUGE_STEAM) + .setProgressBarSteam(GT_UITextures.PROGRESSBAR_EXTRACT_STEAM); public static final GT_Recipe_Map sRecyclerRecipes = new GT_Recipe_Map_Recycler( new HashSet<>(0), "ic.recipe.recycler", @@ -1172,7 +1184,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, false).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_RECYCLE) - .setProgressBar(GT_UITextures.PROGRESSBAR_RECYCLE, ProgressBar.Direction.CIRCULAR_CW); + .setProgressBar(GT_UITextures.PROGRESSBAR_RECYCLE, ProgressBar.Direction.CIRCULAR_CW); public static final GT_Recipe_Map sFurnaceRecipes = new GT_Recipe_Map_Furnace( new HashSet<>(0), "mc.recipe.furnace", @@ -1189,9 +1201,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, false).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_FURNACE) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) - .setSlotOverlaySteam(false, GT_UITextures.OVERLAY_SLOT_FURNACE_STEAM) - .setProgressBarSteam(GT_UITextures.PROGRESSBAR_ARROW_STEAM); + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) + .setSlotOverlaySteam(false, GT_UITextures.OVERLAY_SLOT_FURNACE_STEAM) + .setProgressBarSteam(GT_UITextures.PROGRESSBAR_ARROW_STEAM); public static final GT_Recipe_Map sMicrowaveRecipes = new GT_Recipe_Map_Microwave( new HashSet<>(0), "gt.recipe.microwave", @@ -1208,7 +1220,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, false).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_FURNACE) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); /** Set {@code aSpecialValue = -100} to bypass the disassembler tier check and default recipe duration. */ public static final GT_Recipe_Map sDisassemblerRecipes = new GT_Recipe_Map( @@ -1244,7 +1256,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { return super.getOverlayForSlot(isFluid, isOutput, index, isSpecial); } }.setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_WRENCH) - .setProgressBar(GT_UITextures.PROGRESSBAR_ASSEMBLE, ProgressBar.Direction.RIGHT); + .setProgressBar(GT_UITextures.PROGRESSBAR_ASSEMBLE, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sScannerFakeRecipes = new GT_Recipe_Map( new HashSet<>(300), @@ -1262,8 +1274,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_MICROSCOPE) - .setSlotOverlay(false, false, true, true, GT_UITextures.OVERLAY_SLOT_DATA_ORB) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); + .setSlotOverlay(false, false, true, true, GT_UITextures.OVERLAY_SLOT_DATA_ORB) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sRockBreakerFakeRecipes = new GT_Recipe_Map( new HashSet<>(200), "gt.recipe.rockbreaker", @@ -1280,8 +1292,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_DUST) - .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE) - .setProgressBar(GT_UITextures.PROGRESSBAR_MACERATE, ProgressBar.Direction.RIGHT); + .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE) + .setProgressBar(GT_UITextures.PROGRESSBAR_MACERATE, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sByProductList = new GT_Recipe_Map( new HashSet<>(1000), "gt.recipe.byproductlist", @@ -1314,9 +1326,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CANISTER) - .setSlotOverlay(true, false, GT_UITextures.OVERLAY_SLOT_UUM) - .setSlotOverlay(false, false, true, true, GT_UITextures.OVERLAY_SLOT_DATA_ORB) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); + .setSlotOverlay(true, false, GT_UITextures.OVERLAY_SLOT_UUM) + .setSlotOverlay(false, false, true, true, GT_UITextures.OVERLAY_SLOT_DATA_ORB) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); // public static final GT_Recipe_Map sAssemblylineFakeRecipes = new GT_Recipe_Map(new HashSet<>(30), // "gt.recipe.scanner", "Scanner", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 1, 0, 1, E, 1, E, true, // true); @@ -1336,7 +1348,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, true, true, GT_UITextures.OVERLAY_SLOT_DATA_ORB) - .setUsualFluidInputCount(4).setDisableOptimize(true); + .setUsualFluidInputCount(4) + .setDisableOptimize(true); public static final GT_Recipe_Map sPlasmaArcFurnaceRecipes = new GT_Recipe_Map( new HashSet<>(20000), "gt.recipe.plasmaarcfurnace", @@ -1353,7 +1366,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) - .setRecipeConfigFile("arcfurnace", FIRST_ITEM_INPUT); + .setRecipeConfigFile("arcfurnace", FIRST_ITEM_INPUT); public static final GT_Recipe_Map sArcFurnaceRecipes = new GT_Recipe_Map( new HashSet<>(20000), "gt.recipe.arcfurnace", @@ -1370,7 +1383,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) - .setRecipeConfigFile("arcfurnace", FIRST_ITEM_INPUT); + .setRecipeConfigFile("arcfurnace", FIRST_ITEM_INPUT); public static final GT_Recipe_Map sPrinterRecipes = new GT_Recipe_Map_Printer( new HashSet<>(5), "gt.recipe.printer", @@ -1387,10 +1400,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_PAGE_BLANK) - .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_PAGE_PRINTED) - .setSlotOverlay(false, false, true, true, GT_UITextures.OVERLAY_SLOT_DATA_STICK) - .setRecipeConfigFile("printer", FIRST_ITEM_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); + .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_PAGE_PRINTED) + .setSlotOverlay(false, false, true, true, GT_UITextures.OVERLAY_SLOT_DATA_STICK) + .setRecipeConfigFile("printer", FIRST_ITEM_INPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sSifterRecipes = new GT_Recipe_Map( new HashSet<>(105), "gt.recipe.sifter", @@ -1407,7 +1420,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setProgressBar(GT_UITextures.PROGRESSBAR_SIFT, ProgressBar.Direction.DOWN) - .setRecipeConfigFile("sifter", FIRST_ITEM_INPUT); + .setRecipeConfigFile("sifter", FIRST_ITEM_INPUT); public static final GT_Recipe_Map sPressRecipes = new GT_Recipe_Map_FormingPress( new HashSet<>(300), "gt.recipe.press", @@ -1424,10 +1437,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, true, GT_UITextures.OVERLAY_SLOT_PRESS_1) - .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_PRESS_2) - .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_PRESS_3) - .setRecipeConfigFile("press", FIRST_ITEM_OUTPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_COMPRESS, ProgressBar.Direction.RIGHT); + .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_PRESS_2) + .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_PRESS_3) + .setRecipeConfigFile("press", FIRST_ITEM_OUTPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_COMPRESS, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sLaserEngraverRecipes = new GT_Recipe_Map( new HashSet<>(810), "gt.recipe.laserengraver", @@ -1444,9 +1457,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_LENS) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) - .setRecipeConfigFile("laserengraving", FIRST_ITEM_OUTPUT).setUsualFluidInputCount(2) - .setUsualFluidOutputCount(2); + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) + .setRecipeConfigFile("laserengraving", FIRST_ITEM_OUTPUT) + .setUsualFluidInputCount(2) + .setUsualFluidOutputCount(2); public static final GT_Recipe_Map sMixerRecipes = new GT_Recipe_Map( new HashSet<>(900), "gt.recipe.mixer", @@ -1463,9 +1477,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_DUST) - .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_DUST) - .setRecipeConfigFile("mixer", FIRST_ITEM_OR_FLUID_OUTPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_MIXER, ProgressBar.Direction.CIRCULAR_CW); + .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_DUST) + .setRecipeConfigFile("mixer", FIRST_ITEM_OR_FLUID_OUTPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_MIXER, ProgressBar.Direction.CIRCULAR_CW); public static final GT_Recipe_Map sAutoclaveRecipes = new GT_Recipe_Map( new HashSet<>(300), "gt.recipe.autoclave", @@ -1482,10 +1496,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_DUST) - .setSlotOverlay(false, true, true, GT_UITextures.OVERLAY_SLOT_GEM) - .setSlotOverlay(false, true, false, GT_UITextures.OVERLAY_SLOT_DUST) - .setRecipeConfigFile("autoclave", FIRST_ITEM_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); + .setSlotOverlay(false, true, true, GT_UITextures.OVERLAY_SLOT_GEM) + .setSlotOverlay(false, true, false, GT_UITextures.OVERLAY_SLOT_DUST) + .setRecipeConfigFile("autoclave", FIRST_ITEM_INPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sElectroMagneticSeparatorRecipes = new GT_Recipe_Map( new HashSet<>(50), "gt.recipe.electromagneticseparator", @@ -1502,9 +1516,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE) - .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_DUST) - .setRecipeConfigFile("electromagneticseparator", FIRST_ITEM_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_MAGNET, ProgressBar.Direction.RIGHT); + .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_DUST) + .setRecipeConfigFile("electromagneticseparator", FIRST_ITEM_INPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_MAGNET, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sPolarizerRecipes = new GT_Recipe_Map( new HashSet<>(300), "gt.recipe.polarizer", @@ -1521,7 +1535,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setProgressBar(GT_UITextures.PROGRESSBAR_MAGNET, ProgressBar.Direction.RIGHT) - .setRecipeConfigFile("polarizer", FIRST_ITEM_INPUT); + .setRecipeConfigFile("polarizer", FIRST_ITEM_INPUT); public static final GT_Recipe_Map sMaceratorRecipes = new GT_Recipe_Map_Macerator( new HashSet<>(16600), "gt.recipe.macerator", @@ -1538,12 +1552,12 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE) - .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_DUST) - .setProgressBar(GT_UITextures.PROGRESSBAR_MACERATE, ProgressBar.Direction.RIGHT) - .setRecipeConfigFile("pulveriser", FIRST_ITEM_INPUT) - .setSlotOverlaySteam(false, GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE_STEAM) - .setSlotOverlaySteam(true, GT_UITextures.OVERLAY_SLOT_DUST_STEAM) - .setProgressBarSteam(GT_UITextures.PROGRESSBAR_MACERATE_STEAM); + .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_DUST) + .setProgressBar(GT_UITextures.PROGRESSBAR_MACERATE, ProgressBar.Direction.RIGHT) + .setRecipeConfigFile("pulveriser", FIRST_ITEM_INPUT) + .setSlotOverlaySteam(false, GT_UITextures.OVERLAY_SLOT_CRUSHED_ORE_STEAM) + .setSlotOverlaySteam(true, GT_UITextures.OVERLAY_SLOT_DUST_STEAM) + .setProgressBarSteam(GT_UITextures.PROGRESSBAR_MACERATE_STEAM); public static final GT_Recipe_Map sChemicalBathRecipes = new GT_Recipe_Map( new HashSet<>(2550), "gt.recipe.chemicalbath", @@ -1560,7 +1574,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setProgressBar(GT_UITextures.PROGRESSBAR_BATH, ProgressBar.Direction.CIRCULAR_CW) - .setRecipeConfigFile("chemicalbath", FIRST_ITEM_INPUT); + .setRecipeConfigFile("chemicalbath", FIRST_ITEM_INPUT); public static final GT_Recipe_Map sFluidCannerRecipes = new GT_Recipe_Map_FluidCanner( new HashSet<>(2100), "gt.recipe.fluidcanner", @@ -1577,9 +1591,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CANISTER) - .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_CANISTER) - .setRecipeConfigFile("canning", FIRST_ITEM_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_CANNER, ProgressBar.Direction.RIGHT); + .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_CANISTER) + .setRecipeConfigFile("canning", FIRST_ITEM_INPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_CANNER, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sBrewingRecipes = new GT_Recipe_Map( new HashSet<>(450), "gt.recipe.brewer", @@ -1596,8 +1610,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CAULDRON) - .setRecipeConfigFile("brewing", FIRST_FLUIDSTACK_OUTPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, ProgressBar.Direction.RIGHT); + .setRecipeConfigFile("brewing", FIRST_FLUIDSTACK_OUTPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sFluidHeaterRecipes = new GT_Recipe_Map( new HashSet<>(10), "gt.recipe.fluidheater", @@ -1614,9 +1628,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(true, false, GT_UITextures.OVERLAY_SLOT_HEATER_1) - .setSlotOverlay(true, true, GT_UITextures.OVERLAY_SLOT_HEATER_2) - .setRecipeConfigFile("fluidheater", FIRST_FLUIDSTACK_OUTPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, ProgressBar.Direction.RIGHT); + .setSlotOverlay(true, true, GT_UITextures.OVERLAY_SLOT_HEATER_2) + .setRecipeConfigFile("fluidheater", FIRST_FLUIDSTACK_OUTPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sDistilleryRecipes = new GT_Recipe_Map( new HashSet<>(400), "gt.recipe.distillery", @@ -1633,49 +1647,52 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(true, false, GT_UITextures.OVERLAY_SLOT_BEAKER_1) - .setSlotOverlay(true, true, GT_UITextures.OVERLAY_SLOT_BEAKER_2) - .setRecipeConfigFile("distillery", FIRST_FLUIDSTACK_OUTPUT).setRecipeSpecialHandler(r -> { - int aInput = r.mFluidInputs[0].amount, aOutput = r.mFluidOutputs[0].amount, - aDuration = r.mDuration; - - // reduce the batch size if fluid amount is exceeding - int tScale = (Math.max(aInput, aOutput) + 999) / 1000; - if (tScale <= 0) tScale = 1; - if (tScale > 1) { - // trying to find whether there is a better factor - for (int i = tScale; i <= 5; i++) { - if (aInput % i == 0 && aDuration % i == 0) { - tScale = i; - break; - } - } - for (int i = tScale; i <= 5; i++) { - if (aInput % i == 0 && aDuration % i == 0 && aOutput % i == 0) { - tScale = i; - break; - } - } - aInput = (aInput + tScale - 1) / tScale; - aOutput = aOutput / tScale; - if (!isArrayEmptyOrNull(r.mOutputs)) { - ItemData tData = GT_OreDictUnificator.getItemData(r.mOutputs[0]); - if (tData != null && (tData.mPrefix == OrePrefixes.dust - || OrePrefixes.dust.mFamiliarPrefixes.contains(tData.mPrefix))) { - r.mOutputs[0] = GT_OreDictUnificator.getDust( - tData.mMaterial.mMaterial, - tData.mMaterial.mAmount * r.mOutputs[0].stackSize / tScale); - } else { - if (r.mOutputs[0].stackSize / tScale == 0) r.mOutputs[0] = GT_Values.NI; - else r.mOutputs[0] = GT_Utility - .copyAmount(r.mOutputs[0].stackSize / tScale, r.mOutputs[0]); - } - } - aDuration = (aDuration + tScale - 1) / tScale; - r.mFluidInputs[0] = GT_Utility.copyAmount(aInput, r.mFluidInputs[0]); - r.mFluidOutputs[0] = GT_Utility.copyAmount(aOutput, r.mFluidOutputs[0]); - r.mDuration = aDuration; - } - }).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, ProgressBar.Direction.RIGHT); + .setSlotOverlay(true, true, GT_UITextures.OVERLAY_SLOT_BEAKER_2) + .setRecipeConfigFile("distillery", FIRST_FLUIDSTACK_OUTPUT) + .setRecipeSpecialHandler(r -> { + int aInput = r.mFluidInputs[0].amount, aOutput = r.mFluidOutputs[0].amount, + aDuration = r.mDuration; + + // reduce the batch size if fluid amount is exceeding + int tScale = (Math.max(aInput, aOutput) + 999) / 1000; + if (tScale <= 0) tScale = 1; + if (tScale > 1) { + // trying to find whether there is a better factor + for (int i = tScale; i <= 5; i++) { + if (aInput % i == 0 && aDuration % i == 0) { + tScale = i; + break; + } + } + for (int i = tScale; i <= 5; i++) { + if (aInput % i == 0 && aDuration % i == 0 && aOutput % i == 0) { + tScale = i; + break; + } + } + aInput = (aInput + tScale - 1) / tScale; + aOutput = aOutput / tScale; + if (!isArrayEmptyOrNull(r.mOutputs)) { + ItemData tData = GT_OreDictUnificator.getItemData(r.mOutputs[0]); + if (tData != null && (tData.mPrefix == OrePrefixes.dust + || OrePrefixes.dust.mFamiliarPrefixes.contains(tData.mPrefix))) { + r.mOutputs[0] = GT_OreDictUnificator.getDust( + tData.mMaterial.mMaterial, + tData.mMaterial.mAmount * r.mOutputs[0].stackSize / tScale); + } else { + if (r.mOutputs[0].stackSize / tScale == 0) r.mOutputs[0] = GT_Values.NI; + else r.mOutputs[0] = GT_Utility.copyAmount( + r.mOutputs[0].stackSize / tScale, + r.mOutputs[0]); + } + } + aDuration = (aDuration + tScale - 1) / tScale; + r.mFluidInputs[0] = GT_Utility.copyAmount(aInput, r.mFluidInputs[0]); + r.mFluidOutputs[0] = GT_Utility.copyAmount(aOutput, r.mFluidOutputs[0]); + r.mDuration = aDuration; + } + }) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sFermentingRecipes = new GT_Recipe_Map( new HashSet<>(50), "gt.recipe.fermenter", @@ -1692,7 +1709,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, ProgressBar.Direction.RIGHT) - .setRecipeConfigFile("fermenting", FIRST_FLUIDSTACK_OUTPUT); + .setRecipeConfigFile("fermenting", FIRST_FLUIDSTACK_OUTPUT); public static final GT_Recipe_Map sFluidSolidficationRecipes = new GT_Recipe_Map( new HashSet<>(35000), "gt.recipe.fluidsolidifier", @@ -1709,16 +1726,20 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_MOLD) - .setRecipeConfigFile("fluidsolidifier", FIRST_ITEM_OUTPUT).setRecipeSpecialHandler(r -> { - if (ArrayUtils.isNotEmpty(r.mFluidInputs)) { - if (Materials.PhasedGold.getMolten(1).isFluidEqual(r.mFluidInputs[0])) - r.mFluidInputs = new FluidStack[] { - Materials.VibrantAlloy.getMolten(r.mFluidInputs[0].amount) }; - else if (Materials.PhasedIron.getMolten(1).isFluidEqual(r.mFluidInputs[0])) - r.mFluidInputs = new FluidStack[] { - Materials.PulsatingIron.getMolten(r.mFluidInputs[0].amount) }; - } - }).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); + .setRecipeConfigFile("fluidsolidifier", FIRST_ITEM_OUTPUT) + .setRecipeSpecialHandler(r -> { + if (ArrayUtils.isNotEmpty(r.mFluidInputs)) { + if (Materials.PhasedGold.getMolten(1) + .isFluidEqual(r.mFluidInputs[0])) + r.mFluidInputs = new FluidStack[] { + Materials.VibrantAlloy.getMolten(r.mFluidInputs[0].amount) }; + else if (Materials.PhasedIron.getMolten(1) + .isFluidEqual(r.mFluidInputs[0])) + r.mFluidInputs = new FluidStack[] { + Materials.PulsatingIron.getMolten(r.mFluidInputs[0].amount) }; + } + }) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sFluidExtractionRecipes = new GT_Recipe_Map( new HashSet<>(15000), "gt.recipe.fluidextractor", @@ -1735,16 +1756,20 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CENTRIFUGE) - .setRecipeConfigFile("fluidextractor", FIRST_ITEM_INPUT).setRecipeSpecialHandler(r -> { - if (ArrayUtils.isNotEmpty(r.mFluidInputs)) { - if (Materials.PhasedGold.getMolten(1).isFluidEqual(r.mFluidInputs[0])) - r.mFluidInputs = new FluidStack[] { - Materials.VibrantAlloy.getMolten(r.mFluidInputs[0].amount) }; - else if (Materials.PhasedIron.getMolten(1).isFluidEqual(r.mFluidInputs[0])) - r.mFluidInputs = new FluidStack[] { - Materials.PulsatingIron.getMolten(r.mFluidInputs[0].amount) }; - } - }).setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT, ProgressBar.Direction.RIGHT); + .setRecipeConfigFile("fluidextractor", FIRST_ITEM_INPUT) + .setRecipeSpecialHandler(r -> { + if (ArrayUtils.isNotEmpty(r.mFluidInputs)) { + if (Materials.PhasedGold.getMolten(1) + .isFluidEqual(r.mFluidInputs[0])) + r.mFluidInputs = new FluidStack[] { + Materials.VibrantAlloy.getMolten(r.mFluidInputs[0].amount) }; + else if (Materials.PhasedIron.getMolten(1) + .isFluidEqual(r.mFluidInputs[0])) + r.mFluidInputs = new FluidStack[] { + Materials.PulsatingIron.getMolten(r.mFluidInputs[0].amount) }; + } + }) + .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sBoxinatorRecipes = new GT_Recipe_Map( new HashSet<>(2500), "gt.recipe.packager", @@ -1761,9 +1786,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_BOX) - .setRecipeConfigFile("boxing", FIRST_ITEM_OUTPUT) - .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_BOXED) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); + .setRecipeConfigFile("boxing", FIRST_ITEM_OUTPUT) + .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_BOXED) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sUnboxinatorRecipes = new GT_Recipe_Map_Unboxinator( new HashSet<>(2500), "gt.recipe.unpackager", @@ -1780,8 +1805,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_BOXED) - .setRecipeConfigFile("unboxing", FIRST_ITEM_OUTPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); + .setRecipeConfigFile("unboxing", FIRST_ITEM_OUTPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sFusionRecipes = new GT_Recipe_Map_FluidOnly( new HashSet<>(50), "gt.recipe.fusionreactor", @@ -1798,9 +1823,11 @@ public class GT_Recipe implements Comparable<GT_Recipe> { " EU", true, true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) - .useComparatorForNEI(true).setUsualFluidInputCount(2) - .setRecipeConfigFile("fusion", FIRST_FLUID_OUTPUT).setDisableOptimize(true) - .setNEISpecialInfoFormatter(FusionSpecialValueFormatter.INSTANCE); + .useComparatorForNEI(true) + .setUsualFluidInputCount(2) + .setRecipeConfigFile("fusion", FIRST_FLUID_OUTPUT) + .setDisableOptimize(true) + .setNEISpecialInfoFormatter(FusionSpecialValueFormatter.INSTANCE); public static final GT_Recipe_Map sComplexFusionRecipes = new GT_Recipe_Map_ComplexFusion( new HashSet<>(50), "gt.recipe.complexfusionreactor", @@ -1817,9 +1844,12 @@ public class GT_Recipe implements Comparable<GT_Recipe> { " EU", true, true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) - .setUsualFluidInputCount(16).setUsualFluidOutputCount(16) - .setNEITransferRect(new Rectangle(79, 34, 18, 18)).setLogoPos(80, 61) - .setNEISpecialInfoFormatter(FusionSpecialValueFormatter.INSTANCE).setDisableOptimize(true); + .setUsualFluidInputCount(16) + .setUsualFluidOutputCount(16) + .setNEITransferRect(new Rectangle(79, 34, 18, 18)) + .setLogoPos(80, 61) + .setNEISpecialInfoFormatter(FusionSpecialValueFormatter.INSTANCE) + .setDisableOptimize(true); public static final GT_Recipe_Map sCentrifugeRecipes = new GT_Recipe_Map( new HashSet<>(1200), "gt.recipe.centrifuge", @@ -1836,10 +1866,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, true, GT_UITextures.OVERLAY_SLOT_CENTRIFUGE) - .setRecipeConfigFile("centrifuge", FIRST_ITEM_OR_FLUID_INPUT) - .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_CANISTER) - .setSlotOverlay(true, false, GT_UITextures.OVERLAY_SLOT_CENTRIFUGE_FLUID) - .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT, ProgressBar.Direction.RIGHT); + .setRecipeConfigFile("centrifuge", FIRST_ITEM_OR_FLUID_INPUT) + .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_CANISTER) + .setSlotOverlay(true, false, GT_UITextures.OVERLAY_SLOT_CENTRIFUGE_FLUID) + .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sElectrolyzerRecipes = new GT_Recipe_Map( new HashSet<>(300), "gt.recipe.electrolyzer", @@ -1856,10 +1886,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, true, GT_UITextures.OVERLAY_SLOT_CHARGER) - .setRecipeConfigFile("electrolyzer", FIRST_ITEM_OR_FLUID_INPUT) - .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_CANISTER) - .setSlotOverlay(true, false, GT_UITextures.OVERLAY_SLOT_CHARGER_FLUID) - .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT, ProgressBar.Direction.RIGHT); + .setRecipeConfigFile("electrolyzer", FIRST_ITEM_OR_FLUID_INPUT) + .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_CANISTER) + .setSlotOverlay(true, false, GT_UITextures.OVERLAY_SLOT_CHARGER_FLUID) + .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT, ProgressBar.Direction.RIGHT); /** * Use special value as coil heat level. */ @@ -1879,8 +1909,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { " K", false, true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) - .setRecipeConfigFile("blastfurnace", FIRST_ITEM_INPUT) - .setNEISpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE); + .setRecipeConfigFile("blastfurnace", FIRST_ITEM_INPUT) + .setNEISpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE); /** * Use special value as coil heat level. */ @@ -1900,8 +1930,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> { " K", false, true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) - .setUsualFluidInputCount(9).setUsualFluidOutputCount(9).setDisableOptimize(true) - .setNEISpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE); + .setUsualFluidInputCount(9) + .setUsualFluidOutputCount(9) + .setDisableOptimize(true) + .setNEISpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE); public static final GT_Recipe_Map sTranscendentPlasmaMixerRecipes = new TranscendentPlasmaMixerRecipeMap( new HashSet<>(20), @@ -2007,8 +2039,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { } } if (neiCachedRecipe.mRecipe instanceof GT_FakeSpaceProjectRecipe) { - ISpaceProject project = SpaceProjectManager - .getProject(((GT_FakeSpaceProjectRecipe) neiCachedRecipe.mRecipe).projectName); + ISpaceProject project = SpaceProjectManager.getProject( + ((GT_FakeSpaceProjectRecipe) neiCachedRecipe.mRecipe).projectName); if (project != null) { projectTexture = project.getTexture(); GuiDraw.drawStringC( @@ -2028,22 +2060,30 @@ public class GT_Recipe implements Comparable<GT_Recipe> { int bar2Width = 18; builder.widget( new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ASSEMBLY_LINE_1, 17) - .setDirection(ProgressBar.Direction.RIGHT) - .setProgress( - () -> progressSupplier.get() * ((float) (bar1Width + bar2Width) / bar1Width)) - .setSynced(false, false).setPos(new Pos2d(70, 28).add(windowOffset)) - .setSize(bar1Width, 72)); + .setDirection(ProgressBar.Direction.RIGHT) + .setProgress( + () -> progressSupplier.get() + * ((float) (bar1Width + bar2Width) / bar1Width)) + .setSynced(false, false) + .setPos(new Pos2d(70, 28).add(windowOffset)) + .setSize(bar1Width, 72)); builder.widget( new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ASSEMBLY_LINE_2, 18) - .setDirection(ProgressBar.Direction.RIGHT) - .setProgress( - () -> (progressSupplier.get() - ((float) bar1Width / (bar1Width + bar2Width))) - * ((float) (bar1Width + bar2Width) / bar2Width)) - .setSynced(false, false).setPos(new Pos2d(106, 28).add(windowOffset)) - .setSize(bar2Width, 72)); + .setDirection(ProgressBar.Direction.RIGHT) + .setProgress( + () -> (progressSupplier.get() + - ((float) bar1Width / (bar1Width + bar2Width))) + * ((float) (bar1Width + bar2Width) / bar2Width)) + .setSynced(false, false) + .setPos(new Pos2d(106, 28).add(windowOffset)) + .setSize(bar2Width, 72)); } - }.useModularUI(true).setRenderRealStackSizes(false).setUsualFluidInputCount(4).setNEIBackgroundOffset(2, 23) - .setLogoPos(152, 83).setDisableOptimize(true); + }.useModularUI(true) + .setRenderRealStackSizes(false) + .setUsualFluidInputCount(4) + .setNEIBackgroundOffset(2, 23) + .setLogoPos(152, 83) + .setDisableOptimize(true); public static class TranscendentPlasmaMixerRecipeMap extends GT_Recipe_Map { @@ -2119,70 +2159,84 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, false, true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) - .setRecipeEmitter(builder -> { - Optional<GT_Recipe> rr = builder.validateInputCount(1, 2).validateOutputCount(1, 2) - .validateNoInputFluid().validateNoOutputFluid().noOptimize().build(); - if (!rr.isPresent()) return Collections.emptyList(); - ItemStack aInput1 = builder.getItemInputBasic(0); - ItemStack aInput2 = builder.getItemInputBasic(1); - ItemStack aOutput1 = builder.getItemOutput(0); - ItemStack aOutput2 = builder.getItemOutput(1); - if ((aInput1 == null && aInput2 == null) || (aOutput1 == null && aOutput2 == null)) - return Collections.emptyList(); - int aCoalAmount = builder.getMetadata(ADDITIVE_AMOUNT); - if (aCoalAmount <= 0) return Collections.emptyList(); - GT_RecipeTemplate coll = asTemplate(rr.get()); - for (Materials coal : new Materials[] { Materials.Coal, Materials.Charcoal }) { - coll.derive().setInputs(aInput1, aInput2, coal.getGems(aCoalAmount)) - .setOutputs(aOutput1, aOutput2, Materials.DarkAsh.getDustTiny(aCoalAmount)); - coll.derive().setInputs(aInput1, aInput2, coal.getDust(aCoalAmount)) - .setOutputs(aOutput1, aOutput2, Materials.DarkAsh.getDustTiny(aCoalAmount)); - } - int aDuration = builder.duration; - if (Railcraft.isModLoaded()) { - coll.derive() - .setInputs(aInput1, aInput2, RailcraftToolItems.getCoalCoke(aCoalAmount / 2)) - .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount / 2)) - .setDuration(aDuration * 2 / 3); - } - if (GTPlusPlus.isModLoaded()) { - ItemStack cactusCoke = GT_ModHandler - .getModItem(GTPlusPlus.modID, "itemCactusCoke", aCoalAmount * 2L); - ItemStack sugarCoke = GT_ModHandler - .getModItem(GTPlusPlus.modID, "itemSugarCoke", aCoalAmount * 2L); - coll.derive().setInputs(aInput1, aInput2, cactusCoke) - .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)) - .setDuration(aDuration * 2 / 3); - coll.derive().setInputs(aInput1, aInput2, sugarCoke) - .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)) - .setDuration(aDuration * 2 / 3); - } - if ((aInput1 == null || aInput1.stackSize <= 6) - && (aInput2 == null || aInput2.stackSize <= 6) - && (aOutput1 == null || aOutput1.stackSize <= 6) - && (aOutput2 == null || aOutput2.stackSize <= 6)) { - // we don't use GT_Utility.mul() here. It does not have the truncating we need here. - aInput1 = GT_Utility.multiplyStack(10L, aInput1); - aInput2 = GT_Utility.multiplyStack(10L, aInput2); - aOutput1 = GT_Utility.multiplyStack(10L, aOutput1); - aOutput2 = GT_Utility.multiplyStack(10L, aOutput2); - for (Materials coal : new Materials[] { Materials.Coal, Materials.Charcoal }) { - coll.derive().setInputs(aInput1, aInput2, coal.getBlocks(aCoalAmount)) - .setOutputs(aOutput1, aOutput2, Materials.DarkAsh.getDust(aCoalAmount)) - .setDuration(aDuration * 10); - coll.derive().setInputs(aInput1, aInput2, coal.getBlocks(aCoalAmount)) - .setOutputs(aOutput1, aOutput2, Materials.DarkAsh.getDust(aCoalAmount)) - .setDuration(aDuration * 10); - } - if (Railcraft.isModLoaded()) { - coll.derive() - .setInputs(aInput1, aInput2, EnumCube.COKE_BLOCK.getItem(aCoalAmount / 2)) - .setOutputs(aOutput1, aOutput2, Materials.Ash.getDust(aCoalAmount / 2)) - .setDuration(aDuration * 20 / 3); - } - } - return coll.getAll(); - }).setRecipeConfigFile("primitiveblastfurnace", FIRST_ITEM_INPUT); + .setRecipeEmitter(builder -> { + Optional<GT_Recipe> rr = builder.validateInputCount(1, 2) + .validateOutputCount(1, 2) + .validateNoInputFluid() + .validateNoOutputFluid() + .noOptimize() + .build(); + if (!rr.isPresent()) return Collections.emptyList(); + ItemStack aInput1 = builder.getItemInputBasic(0); + ItemStack aInput2 = builder.getItemInputBasic(1); + ItemStack aOutput1 = builder.getItemOutput(0); + ItemStack aOutput2 = builder.getItemOutput(1); + if ((aInput1 == null && aInput2 == null) || (aOutput1 == null && aOutput2 == null)) + return Collections.emptyList(); + int aCoalAmount = builder.getMetadata(ADDITIVE_AMOUNT); + if (aCoalAmount <= 0) return Collections.emptyList(); + GT_RecipeTemplate coll = asTemplate(rr.get()); + for (Materials coal : new Materials[] { Materials.Coal, Materials.Charcoal }) { + coll.derive() + .setInputs(aInput1, aInput2, coal.getGems(aCoalAmount)) + .setOutputs(aOutput1, aOutput2, Materials.DarkAsh.getDustTiny(aCoalAmount)); + coll.derive() + .setInputs(aInput1, aInput2, coal.getDust(aCoalAmount)) + .setOutputs(aOutput1, aOutput2, Materials.DarkAsh.getDustTiny(aCoalAmount)); + } + int aDuration = builder.duration; + if (Railcraft.isModLoaded()) { + coll.derive() + .setInputs(aInput1, aInput2, RailcraftToolItems.getCoalCoke(aCoalAmount / 2)) + .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount / 2)) + .setDuration(aDuration * 2 / 3); + } + if (GTPlusPlus.isModLoaded()) { + ItemStack cactusCoke = GT_ModHandler.getModItem( + GTPlusPlus.modID, + "itemCactusCoke", + aCoalAmount * 2L); + ItemStack sugarCoke = GT_ModHandler.getModItem( + GTPlusPlus.modID, + "itemSugarCoke", + aCoalAmount * 2L); + coll.derive() + .setInputs(aInput1, aInput2, cactusCoke) + .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)) + .setDuration(aDuration * 2 / 3); + coll.derive() + .setInputs(aInput1, aInput2, sugarCoke) + .setOutputs(aOutput1, aOutput2, Materials.Ash.getDustTiny(aCoalAmount * 2)) + .setDuration(aDuration * 2 / 3); + } + if ((aInput1 == null || aInput1.stackSize <= 6) && (aInput2 == null || aInput2.stackSize <= 6) + && (aOutput1 == null || aOutput1.stackSize <= 6) + && (aOutput2 == null || aOutput2.stackSize <= 6)) { + // we don't use GT_Utility.mul() here. It does not have the truncating we need here. + aInput1 = GT_Utility.multiplyStack(10L, aInput1); + aInput2 = GT_Utility.multiplyStack(10L, aInput2); + aOutput1 = GT_Utility.multiplyStack(10L, aOutput1); + aOutput2 = GT_Utility.multiplyStack(10L, aOutput2); + for (Materials coal : new Materials[] { Materials.Coal, Materials.Charcoal }) { + coll.derive() + .setInputs(aInput1, aInput2, coal.getBlocks(aCoalAmount)) + .setOutputs(aOutput1, aOutput2, Materials.DarkAsh.getDust(aCoalAmount)) + .setDuration(aDuration * 10); + coll.derive() + .setInputs(aInput1, aInput2, coal.getBlocks(aCoalAmount)) + .setOutputs(aOutput1, aOutput2, Materials.DarkAsh.getDust(aCoalAmount)) + .setDuration(aDuration * 10); + } + if (Railcraft.isModLoaded()) { + coll.derive() + .setInputs(aInput1, aInput2, EnumCube.COKE_BLOCK.getItem(aCoalAmount / 2)) + .setOutputs(aOutput1, aOutput2, Materials.Ash.getDust(aCoalAmount / 2)) + .setDuration(aDuration * 20 / 3); + } + } + return coll.getAll(); + }) + .setRecipeConfigFile("primitiveblastfurnace", FIRST_ITEM_INPUT); public static final GT_Recipe_Map sImplosionRecipes = new GT_Recipe_Map( new HashSet<>(900), "gt.recipe.implosioncompressor", @@ -2199,35 +2253,47 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, true, GT_UITextures.OVERLAY_SLOT_IMPLOSION) - .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_EXPLOSIVE) - .setRecipeConfigFile("implosion", FIRST_ITEM_INPUT).setRecipeEmitter(b -> { - switch (b.getItemInputsBasic().length) { - case 0: - return Collections.emptyList(); - case 1: - break; - default: - return b.build().map(Collections::singletonList).orElse(Collections.emptyList()); - } - Optional<GT_Recipe> t = b.noOptimize().duration(20).eut(30).validateInputCount(1, 1) - .validateOutputCount(1, 1).build(); - if (!t.isPresent()) return Collections.emptyList(); - ItemStack input = b.getItemInputBasic(0); - GT_RecipeTemplate coll = asTemplate(t.get()); - int tExplosives = Math.min(b.getMetadata(ADDITIVE_AMOUNT), 64); - int tGunpowder = tExplosives << 1; // Worst - int tDynamite = Math.max(1, tExplosives >> 1); // good - int tTNT = tExplosives; // Slightly better - int tITNT = Math.max(1, tExplosives >> 2); // the best - if (tGunpowder < 65) - coll.derive().setInputs(input, ItemList.Block_Powderbarrel.get(tGunpowder)); - if (tDynamite < 17) - coll.derive().setInputs(input, GT_ModHandler.getIC2Item("dynamite", tDynamite, null)); - coll.derive().setInputs(input, new ItemStack(Blocks.tnt, tTNT)); - coll.derive().setInputs(input, GT_ModHandler.getIC2Item("industrialTnt", tITNT, null)); - return coll.getAll(); - }).setDisableOptimize(true) - .setProgressBar(GT_UITextures.PROGRESSBAR_COMPRESS, ProgressBar.Direction.RIGHT); + .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_EXPLOSIVE) + .setRecipeConfigFile("implosion", FIRST_ITEM_INPUT) + .setRecipeEmitter(b -> { + switch (b.getItemInputsBasic().length) { + case 0: + return Collections.emptyList(); + case 1: + break; + default: + return b.build() + .map(Collections::singletonList) + .orElse(Collections.emptyList()); + } + Optional<GT_Recipe> t = b.noOptimize() + .duration(20) + .eut(30) + .validateInputCount(1, 1) + .validateOutputCount(1, 1) + .build(); + if (!t.isPresent()) return Collections.emptyList(); + ItemStack input = b.getItemInputBasic(0); + GT_RecipeTemplate coll = asTemplate(t.get()); + int tExplosives = Math.min(b.getMetadata(ADDITIVE_AMOUNT), 64); + int tGunpowder = tExplosives << 1; // Worst + int tDynamite = Math.max(1, tExplosives >> 1); // good + int tTNT = tExplosives; // Slightly better + int tITNT = Math.max(1, tExplosives >> 2); // the best + if (tGunpowder < 65) coll.derive() + .setInputs(input, ItemList.Block_Powderbarrel.get(tGunpowder)); + if (tDynamite < 17) coll.derive() + .setInputs( + input, + GT_ModHandler.getIC2Item("dynamite", tDynamite, null)); + coll.derive() + .setInputs(input, new ItemStack(Blocks.tnt, tTNT)); + coll.derive() + .setInputs(input, GT_ModHandler.getIC2Item("industrialTnt", tITNT, null)); + return coll.getAll(); + }) + .setDisableOptimize(true) + .setProgressBar(GT_UITextures.PROGRESSBAR_COMPRESS, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sVacuumRecipes = new GT_Recipe_Map( new HashSet<>(305), "gt.recipe.vacuumfreezer", @@ -2244,21 +2310,28 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, false, true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) - .setRecipeConfigFile("vacuumfreezer", FIRST_ITEM_INPUT).setRecipeEmitter(b -> { - b.noOptimize(); - FluidStack in, out; - if (isArrayOfLength(b.getItemInputsBasic(), 1) && isArrayOfLength(b.getItemOutputs(), 1) - && isArrayEmptyOrNull(b.getFluidInputs()) - && isArrayEmptyOrNull(b.getFluidOutputs()) - && (in = GT_Utility.getFluidForFilledItem(b.getItemInputBasic(0), true)) != null - && (out = GT_Utility.getFluidForFilledItem(b.getItemOutput(0), true)) != null) { - return Arrays.asList( - b.build().get(), - b.fluidInputs(in).fluidOutputs(out).noItemInputs().noItemOutputs().build() - .get()); - } - return buildOrEmpty(b); - }).setUsualFluidInputCount(2); + .setRecipeConfigFile("vacuumfreezer", FIRST_ITEM_INPUT) + .setRecipeEmitter(b -> { + b.noOptimize(); + FluidStack in, out; + if (isArrayOfLength(b.getItemInputsBasic(), 1) && isArrayOfLength(b.getItemOutputs(), 1) + && isArrayEmptyOrNull(b.getFluidInputs()) + && isArrayEmptyOrNull(b.getFluidOutputs()) + && (in = GT_Utility.getFluidForFilledItem(b.getItemInputBasic(0), true)) != null + && (out = GT_Utility.getFluidForFilledItem(b.getItemOutput(0), true)) != null) { + return Arrays.asList( + b.build() + .get(), + b.fluidInputs(in) + .fluidOutputs(out) + .noItemInputs() + .noItemOutputs() + .build() + .get()); + } + return buildOrEmpty(b); + }) + .setUsualFluidInputCount(2); public static final GT_Recipe_Map sChemicalRecipes = new GT_Recipe_Map( new HashSet<>(1170), "gt.recipe.chemicalreactor", @@ -2275,23 +2348,37 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, true, GT_UITextures.OVERLAY_SLOT_MOLECULAR_1) - .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_MOLECULAR_2) - .setSlotOverlay(true, false, GT_UITextures.OVERLAY_SLOT_MOLECULAR_3) - .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_VIAL_1) - .setSlotOverlay(true, true, GT_UITextures.OVERLAY_SLOT_VIAL_2) - .setRecipeConfigFile("chemicalreactor", FIRST_ITEM_OR_FLUID_OUTPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, ProgressBar.Direction.RIGHT); - public static final GT_Recipe_Map sMultiblockChemicalRecipes = new GT_Recipe_Map_LargeChemicalReactor() - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, ProgressBar.Direction.RIGHT) - .setUsualFluidInputCount(6).setUsualFluidOutputCount(6); - public static final GT_Recipe_Map sDistillationRecipes = new GT_Recipe_Map_DistillationTower() - .setRecipeConfigFile("distillation", FIRST_FLUIDSTACK_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, ProgressBar.Direction.RIGHT) - .setUsualFluidOutputCount(11).setDisableOptimize(true); - public static final GT_Recipe_Map_OilCracker sCrackingRecipes = (GT_Recipe_Map_OilCracker) new GT_Recipe_Map_OilCracker() - .setRecipeConfigFile("cracking", FIRST_FLUIDSTACK_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, ProgressBar.Direction.RIGHT) - .setUsualFluidInputCount(2); + .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_MOLECULAR_2) + .setSlotOverlay(true, false, GT_UITextures.OVERLAY_SLOT_MOLECULAR_3) + .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_VIAL_1) + .setSlotOverlay(true, true, GT_UITextures.OVERLAY_SLOT_VIAL_2) + .setRecipeConfigFile("chemicalreactor", FIRST_ITEM_OR_FLUID_OUTPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, ProgressBar.Direction.RIGHT); + public static final GT_Recipe_Map sMultiblockChemicalRecipes = new GT_Recipe_Map_LargeChemicalReactor().setProgressBar( + GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, + ProgressBar.Direction.RIGHT) + .setUsualFluidInputCount( + 6) + .setUsualFluidOutputCount( + 6); + public static final GT_Recipe_Map sDistillationRecipes = new GT_Recipe_Map_DistillationTower().setRecipeConfigFile( + "distillation", + FIRST_FLUIDSTACK_INPUT) + .setProgressBar( + GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, + ProgressBar.Direction.RIGHT) + .setUsualFluidOutputCount( + 11) + .setDisableOptimize( + true); + public static final GT_Recipe_Map_OilCracker sCrackingRecipes = (GT_Recipe_Map_OilCracker) new GT_Recipe_Map_OilCracker().setRecipeConfigFile( + "cracking", + FIRST_FLUIDSTACK_INPUT) + .setProgressBar( + GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE, + ProgressBar.Direction.RIGHT) + .setUsualFluidInputCount( + 2); /** * @deprecated Use sCrackingRecipes instead */ @@ -2314,7 +2401,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) - .setDisableOptimize(true).setRecipeConfigFile("pyrolyse", FIRST_ITEM_INPUT); + .setDisableOptimize(true) + .setRecipeConfigFile("pyrolyse", FIRST_ITEM_INPUT); public static final GT_Recipe_Map sWiremillRecipes = new GT_Recipe_Map( new HashSet<>(450), "gt.recipe.wiremill", @@ -2331,8 +2419,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_WIREMILL) - .setRecipeConfigFile("wiremill", FIRST_ITEM_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_WIREMILL, ProgressBar.Direction.RIGHT); + .setRecipeConfigFile("wiremill", FIRST_ITEM_INPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_WIREMILL, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sBenderRecipes = new GT_Recipe_Map( new HashSet<>(5000), "gt.recipe.metalbender", @@ -2349,8 +2437,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_BENDER) - .setRecipeConfigFile("bender", FIRST_ITEM_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_BENDING, ProgressBar.Direction.RIGHT); + .setRecipeConfigFile("bender", FIRST_ITEM_INPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_BENDING, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sAlloySmelterRecipes = new GT_Recipe_Map( new HashSet<>(12000), "gt.recipe.alloysmelter", @@ -2366,24 +2454,28 @@ public class GT_Recipe implements Comparable<GT_Recipe> { 1, E, true, - true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_FURNACE).setRecipeEmitter(b -> { - if (Materials.Graphite.contains(b.getItemInputBasic(0))) return Collections.emptyList(); - if (GT_Utility.isArrayOfLength(b.getItemInputsBasic(), 1)) { - ItemStack aInput1 = b.getItemInputBasic(0); - if (((OrePrefixes.ingot.contains(aInput1)) || (OrePrefixes.dust.contains(aInput1)) - || (OrePrefixes.gem.contains(aInput1)))) - return Collections.emptyList(); - } - return buildOrEmpty( - b.validateNoInputFluid().validateNoOutputFluid().validateInputCount(1, 2) - .validateOutputCount(1, 1)); - }).setRecipeConfigFile( - "alloysmelting", - r -> GT_Config.getStackConfigName( - GT_Utility.isArrayOfLength(r.mInputs, 1) ? r.mInputs[0] : r.mOutputs[0])) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) - .setSlotOverlaySteam(false, GT_UITextures.OVERLAY_SLOT_FURNACE_STEAM) - .setProgressBarSteam(GT_UITextures.PROGRESSBAR_ARROW_STEAM); + true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_FURNACE) + .setRecipeEmitter(b -> { + if (Materials.Graphite.contains(b.getItemInputBasic(0))) return Collections.emptyList(); + if (GT_Utility.isArrayOfLength(b.getItemInputsBasic(), 1)) { + ItemStack aInput1 = b.getItemInputBasic(0); + if (((OrePrefixes.ingot.contains(aInput1)) || (OrePrefixes.dust.contains(aInput1)) + || (OrePrefixes.gem.contains(aInput1)))) + return Collections.emptyList(); + } + return buildOrEmpty( + b.validateNoInputFluid() + .validateNoOutputFluid() + .validateInputCount(1, 2) + .validateOutputCount(1, 1)); + }) + .setRecipeConfigFile( + "alloysmelting", + r -> GT_Config.getStackConfigName( + GT_Utility.isArrayOfLength(r.mInputs, 1) ? r.mInputs[0] : r.mOutputs[0])) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT) + .setSlotOverlaySteam(false, GT_UITextures.OVERLAY_SLOT_FURNACE_STEAM) + .setProgressBarSteam(GT_UITextures.PROGRESSBAR_ARROW_STEAM); public static final GT_Recipe_Map sAssemblerRecipes = new GT_Recipe_Map_Assembler( new HashSet<>(8200), "gt.recipe.assembler", @@ -2400,8 +2492,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CIRCUIT) - .setRecipeConfigFile("assembling", FIRST_ITEM_OUTPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_ASSEMBLE, ProgressBar.Direction.RIGHT); + .setRecipeConfigFile("assembling", FIRST_ITEM_OUTPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_ASSEMBLE, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sCircuitAssemblerRecipes = new GT_Recipe_Map_Assembler( new HashSet<>(605), "gt.recipe.circuitassembler", @@ -2418,9 +2510,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setNEIUnificateOutput(!NEICustomDiagrams.isModLoaded()) - .setRecipeConfigFile("circuitassembler", FIRST_ITEM_OUTPUT) - .setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CIRCUIT) - .setProgressBar(GT_UITextures.PROGRESSBAR_CIRCUIT_ASSEMBLER, ProgressBar.Direction.RIGHT); + .setRecipeConfigFile("circuitassembler", FIRST_ITEM_OUTPUT) + .setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CIRCUIT) + .setProgressBar(GT_UITextures.PROGRESSBAR_CIRCUIT_ASSEMBLER, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sCannerRecipes = new GT_Recipe_Map( new HashSet<>(900), "gt.recipe.canner", @@ -2437,9 +2529,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, true, GT_UITextures.OVERLAY_SLOT_CANNER) - .setRecipeConfigFile("canning", FIRST_ITEM_INPUT) - .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_CANISTER) - .setProgressBar(GT_UITextures.PROGRESSBAR_CANNER, ProgressBar.Direction.RIGHT); + .setRecipeConfigFile("canning", FIRST_ITEM_INPUT) + .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_CANISTER) + .setProgressBar(GT_UITextures.PROGRESSBAR_CANNER, ProgressBar.Direction.RIGHT); @Deprecated public static final GT_Recipe_Map sCNCRecipes = new GT_Recipe_Map( new HashSet<>(100), @@ -2473,11 +2565,11 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_ROD_1) - .setSlotOverlay(false, true, true, GT_UITextures.OVERLAY_SLOT_ROD_2) - .setSlotOverlay(false, true, false, GT_UITextures.OVERLAY_SLOT_DUST) - .setRecipeConfigFile("lathe", FIRST_ITEM_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_LATHE, ProgressBar.Direction.RIGHT) - .addSpecialTexture(5, 18, 98, 24, GT_UITextures.PROGRESSBAR_LATHE_BASE); + .setSlotOverlay(false, true, true, GT_UITextures.OVERLAY_SLOT_ROD_2) + .setSlotOverlay(false, true, false, GT_UITextures.OVERLAY_SLOT_DUST) + .setRecipeConfigFile("lathe", FIRST_ITEM_INPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_LATHE, ProgressBar.Direction.RIGHT) + .addSpecialTexture(5, 18, 98, 24, GT_UITextures.PROGRESSBAR_LATHE_BASE); public static final GT_Recipe_Map sCutterRecipes = new GT_Recipe_Map( new HashSet<>(5125), "gt.recipe.cuttingsaw", @@ -2494,25 +2586,35 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_BOX) - .setSlotOverlay(false, true, true, GT_UITextures.OVERLAY_SLOT_CUTTER_SLICED) - .setSlotOverlay(false, true, false, GT_UITextures.OVERLAY_SLOT_DUST).setRecipeEmitter(b -> { - b.validateInputCount(1, 2).validateOutputCount(1, 4).validateNoOutputFluid(); - if (b.getFluidInputs() != null || !b.isValid()) - return buildOrEmpty(b.validateInputFluidCount(1, 1)); - int aDuration = b.getDuration(), aEUt = b.getEUt(); - Collection<GT_Recipe> ret = new ArrayList<>(); - b.copy().fluidInputs( - Materials.Water.getFluid(GT_Utility.clamp(aDuration * aEUt / 320, 4, 1000))) - .duration(aDuration * 2).build().ifPresent(ret::add); - b.copy().fluidInputs( - GT_ModHandler.getDistilledWater(GT_Utility.clamp(aDuration * aEUt / 426, 3, 750))) - .duration(aDuration * 2).build().ifPresent(ret::add); - b.fluidInputs( - Materials.Lubricant.getFluid(GT_Utility.clamp(aDuration * aEUt / 1280, 1, 250))) - .duration(aDuration).build().ifPresent(ret::add); - return ret; - }).setRecipeConfigFile("cutting", FIRST_ITEM_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_CUT, ProgressBar.Direction.RIGHT); + .setSlotOverlay(false, true, true, GT_UITextures.OVERLAY_SLOT_CUTTER_SLICED) + .setSlotOverlay(false, true, false, GT_UITextures.OVERLAY_SLOT_DUST) + .setRecipeEmitter(b -> { + b.validateInputCount(1, 2) + .validateOutputCount(1, 4) + .validateNoOutputFluid(); + if (b.getFluidInputs() != null || !b.isValid()) + return buildOrEmpty(b.validateInputFluidCount(1, 1)); + int aDuration = b.getDuration(), aEUt = b.getEUt(); + Collection<GT_Recipe> ret = new ArrayList<>(); + b.copy() + .fluidInputs(Materials.Water.getFluid(GT_Utility.clamp(aDuration * aEUt / 320, 4, 1000))) + .duration(aDuration * 2) + .build() + .ifPresent(ret::add); + b.copy() + .fluidInputs( + GT_ModHandler.getDistilledWater(GT_Utility.clamp(aDuration * aEUt / 426, 3, 750))) + .duration(aDuration * 2) + .build() + .ifPresent(ret::add); + b.fluidInputs(Materials.Lubricant.getFluid(GT_Utility.clamp(aDuration * aEUt / 1280, 1, 250))) + .duration(aDuration) + .build() + .ifPresent(ret::add); + return ret; + }) + .setRecipeConfigFile("cutting", FIRST_ITEM_INPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_CUT, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sSlicerRecipes = new GT_Recipe_Map( new HashSet<>(20), "gt.recipe.slicer", @@ -2529,10 +2631,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, true, GT_UITextures.OVERLAY_SLOT_SQUARE) - .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_SLICE_SHAPE) - .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_SLICER_SLICED) - .setRecipeConfigFile("slicer", FIRST_ITEM_OUTPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_SLICE, ProgressBar.Direction.RIGHT); + .setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_SLICE_SHAPE) + .setSlotOverlay(false, true, GT_UITextures.OVERLAY_SLOT_SLICER_SLICED) + .setRecipeConfigFile("slicer", FIRST_ITEM_OUTPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_SLICE, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sExtruderRecipes = new GT_Recipe_Map( new HashSet<>(13000), "gt.recipe.extruder", @@ -2549,8 +2651,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, false, GT_UITextures.OVERLAY_SLOT_EXTRUDER_SHAPE) - .setRecipeConfigFile("extruder", FIRST_ITEM_OUTPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRUDE, ProgressBar.Direction.RIGHT); + .setRecipeConfigFile("extruder", FIRST_ITEM_OUTPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRUDE, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sHammerRecipes = new GT_Recipe_Map( new HashSet<>(3800), @@ -2567,14 +2669,15 @@ public class GT_Recipe implements Comparable<GT_Recipe> { 1, E, true, - true).setUsualFluidInputCount(2).setUsualFluidOutputCount(2) - .setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_HAMMER) - .setRecipeConfigFile("forgehammer", FIRST_ITEM_OUTPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_HAMMER, ProgressBar.Direction.DOWN) - .addSpecialTexture(20, 6, 78, 42, GT_UITextures.PROGRESSBAR_HAMMER_BASE) - .setSlotOverlaySteam(false, GT_UITextures.OVERLAY_SLOT_HAMMER_STEAM) - .setProgressBarSteam(GT_UITextures.PROGRESSBAR_HAMMER_STEAM) - .addSpecialTextureSteam(20, 6, 78, 42, GT_UITextures.PROGRESSBAR_HAMMER_BASE_STEAM); + true).setUsualFluidInputCount(2) + .setUsualFluidOutputCount(2) + .setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_HAMMER) + .setRecipeConfigFile("forgehammer", FIRST_ITEM_OUTPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_HAMMER, ProgressBar.Direction.DOWN) + .addSpecialTexture(20, 6, 78, 42, GT_UITextures.PROGRESSBAR_HAMMER_BASE) + .setSlotOverlaySteam(false, GT_UITextures.OVERLAY_SLOT_HAMMER_STEAM) + .setProgressBarSteam(GT_UITextures.PROGRESSBAR_HAMMER_STEAM) + .addSpecialTextureSteam(20, 6, 78, 42, GT_UITextures.PROGRESSBAR_HAMMER_BASE_STEAM); public static final GT_Recipe_Map sAmplifiers = new GT_Recipe_Map( new HashSet<>(2), "gt.recipe.uuamplifier", @@ -2591,9 +2694,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(false, false, GT_UITextures.OVERLAY_SLOT_CENTRIFUGE) - .setSlotOverlay(true, true, GT_UITextures.OVERLAY_SLOT_UUA) - .setRecipeConfigFile("amplifier", FIRST_ITEM_INPUT) - .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT, ProgressBar.Direction.RIGHT); + .setSlotOverlay(true, true, GT_UITextures.OVERLAY_SLOT_UUA) + .setRecipeConfigFile("amplifier", FIRST_ITEM_INPUT) + .setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sMassFabFakeRecipes = new GT_Recipe_Map( new HashSet<>(2), "gt.recipe.massfab", @@ -2610,8 +2713,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { E, true, true).setSlotOverlay(true, false, GT_UITextures.OVERLAY_SLOT_UUA) - .setSlotOverlay(true, true, GT_UITextures.OVERLAY_SLOT_UUM) - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); + .setSlotOverlay(true, true, GT_UITextures.OVERLAY_SLOT_UUM) + .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map_Fuel sDieselFuels = (GT_Recipe_Map_Fuel) new GT_Recipe_Map_Fuel( new HashSet<>(20), "gt.recipe.dieselgeneratorfuel", @@ -2852,7 +2955,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> { 0, "", true, - false).setRecipeEmitter(GT_RecipeMapUtil::buildRecipeForMultiblock).setDisableOptimize(true); + false).setRecipeEmitter(GT_RecipeMapUtil::buildRecipeForMultiblock) + .setDisableOptimize(true); public static final GT_Recipe_Map sMultiblockMixerRecipes = new GT_Recipe_Map( new HashSet<>(900), "gt.recipe.largemixer", @@ -2868,9 +2972,13 @@ public class GT_Recipe implements Comparable<GT_Recipe> { 0, "", true, - false).setRecipeEmitter(GT_RecipeMapUtil::buildRecipeForMultiblock).setDisableOptimize(true); - public static final GT_Recipe_Map_LargeBoilerFakeFuels sLargeBoilerFakeFuels = (GT_Recipe_Map_LargeBoilerFakeFuels) new GT_Recipe_Map_LargeBoilerFakeFuels() - .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW, ProgressBar.Direction.RIGHT).setDisableOptimize(true); + false).setRecipeEmitter(GT_RecipeMapUtil::buildRecipeForMultiblock) + .setDisableOptimize(true); + public static final GT_Recipe_Map_LargeBoilerFakeFuels sLargeBoilerFakeFuels = (GT_Recipe_Map_LargeBoilerFakeFuels) new GT_Recipe_Map_LargeBoilerFakeFuels().setProgressBar( + GT_UITextures.PROGRESSBAR_ARROW, + ProgressBar.Direction.RIGHT) + .setDisableOptimize( + true); public static final GT_Recipe_Map sNanoForge = new GT_Recipe_Map( new HashSet<>(10), @@ -2887,9 +2995,11 @@ public class GT_Recipe implements Comparable<GT_Recipe> { 1, "", false, - true).useModularUI(true).setUsualFluidInputCount(3).setDisableOptimize(true) - .setSlotOverlay(false, false, true, GT_UITextures.OVERLAY_SLOT_LENS) - .setProgressBar(GT_UITextures.PROGRESSBAR_ASSEMBLE, ProgressBar.Direction.RIGHT); + true).useModularUI(true) + .setUsualFluidInputCount(3) + .setDisableOptimize(true) + .setSlotOverlay(false, false, true, GT_UITextures.OVERLAY_SLOT_LENS) + .setProgressBar(GT_UITextures.PROGRESSBAR_ASSEMBLE, ProgressBar.Direction.RIGHT); public static final GT_Recipe_Map sPCBFactory = new GT_Recipe_Map( new HashSet<>(10), @@ -2906,27 +3016,29 @@ public class GT_Recipe implements Comparable<GT_Recipe> { 0, E, true, - true).useModularUI(true).setUsualFluidInputCount(3).setUsualFluidOutputCount(0).setDisableOptimize(true) - .setProgressBar(GT_UITextures.PROGRESSBAR_ASSEMBLE, ProgressBar.Direction.RIGHT) - .setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> { - List<String> result = new ArrayList<>(); - int bitmap = recipeInfo.recipe.mSpecialValue; - if ((bitmap & 0b1) > 0) { - result.add(GT_Utility.trans("336", "PCB Factory Tier: ") + 1); - } else if ((bitmap & 0b10) > 0) { - result.add(GT_Utility.trans("336", "PCB Factory Tier: ") + 2); - } else if ((bitmap & 0b100) > 0) { - result.add(GT_Utility.trans("336", "PCB Factory Tier: ") + 3); - } - if ((bitmap & 0b1000) > 0) { - result.add( - GT_Utility.trans("337", "Upgrade Required: ") + GT_Utility.trans("338", "Bio")); - } - return result; - }); - - public static final GT_Recipe_Map_IC2NuclearFake sIC2NuclearFakeRecipe = (GT_Recipe_Map_IC2NuclearFake) new GT_Recipe_Map_IC2NuclearFake() - .setDisableOptimize(true); + true).useModularUI(true) + .setUsualFluidInputCount(3) + .setUsualFluidOutputCount(0) + .setDisableOptimize(true) + .setProgressBar(GT_UITextures.PROGRESSBAR_ASSEMBLE, ProgressBar.Direction.RIGHT) + .setNEISpecialInfoFormatter((recipeInfo, applyPrefixAndSuffix) -> { + List<String> result = new ArrayList<>(); + int bitmap = recipeInfo.recipe.mSpecialValue; + if ((bitmap & 0b1) > 0) { + result.add(GT_Utility.trans("336", "PCB Factory Tier: ") + 1); + } else if ((bitmap & 0b10) > 0) { + result.add(GT_Utility.trans("336", "PCB Factory Tier: ") + 2); + } else if ((bitmap & 0b100) > 0) { + result.add(GT_Utility.trans("336", "PCB Factory Tier: ") + 3); + } + if ((bitmap & 0b1000) > 0) { + result.add(GT_Utility.trans("337", "Upgrade Required: ") + GT_Utility.trans("338", "Bio")); + } + return result; + }); + + public static final GT_Recipe_Map_IC2NuclearFake sIC2NuclearFakeRecipe = (GT_Recipe_Map_IC2NuclearFake) new GT_Recipe_Map_IC2NuclearFake().setDisableOptimize( + true); static { sCentrifugeRecipes.addDownstream(sMultiblockCentrifugeRecipes.deepCopyInput()); @@ -2934,12 +3046,16 @@ public class GT_Recipe implements Comparable<GT_Recipe> { sElectrolyzerRecipes.addDownstream(sMultiblockElectrolyzerRecipes.deepCopyInput()); sDieselFuels.addDownstream( IGT_RecipeMap.newRecipeMap( - b -> b.build().map(sLargeBoilerFakeFuels::addDieselRecipe).map(Collections::singletonList) - .orElse(Collections.emptyList()))); + b -> b.build() + .map(sLargeBoilerFakeFuels::addDieselRecipe) + .map(Collections::singletonList) + .orElse(Collections.emptyList()))); sDenseLiquidFuels.addDownstream( IGT_RecipeMap.newRecipeMap( - b -> b.build().map(sLargeBoilerFakeFuels::addDenseLiquidRecipe) - .map(Collections::singletonList).orElse(Collections.emptyList()))); + b -> b.build() + .map(sLargeBoilerFakeFuels::addDenseLiquidRecipe) + .map(Collections::singletonList) + .orElse(Collections.emptyList()))); } /** @@ -3216,8 +3332,11 @@ public class GT_Recipe implements Comparable<GT_Recipe> { } public GT_Recipe_Map setSlotOverlay(boolean isFluid, boolean isOutput, IDrawable slotOverlay) { - return setSlotOverlay(isFluid, isOutput, true, slotOverlay) - .setSlotOverlay(isFluid, isOutput, false, slotOverlay); + return setSlotOverlay(isFluid, isOutput, true, slotOverlay).setSlotOverlay( + isFluid, + isOutput, + false, + slotOverlay); } public GT_Recipe_Map setSlotOverlaySteam(boolean isFluid, boolean isOutput, boolean isFirst, boolean isSpecial, @@ -3234,8 +3353,12 @@ public class GT_Recipe implements Comparable<GT_Recipe> { } public GT_Recipe_Map setSlotOverlaySteam(boolean isOutput, SteamTexture slotOverlay) { - return setSlotOverlaySteam(false, isOutput, true, false, slotOverlay) - .setSlotOverlaySteam(false, isOutput, false, false, slotOverlay); + return setSlotOverlaySteam(false, isOutput, true, false, slotOverlay).setSlotOverlaySteam( + false, + isOutput, + false, + false, + slotOverlay); } public GT_Recipe_Map setProgressBar(UITexture progressBarTexture, ProgressBar.Direction progressBarDirection) { @@ -3300,15 +3423,15 @@ public class GT_Recipe implements Comparable<GT_Recipe> { public GT_Recipe_Map addSpecialTexture(int width, int height, int x, int y, IDrawable texture) { useModularUI(true); - specialTextures - .add(new ImmutablePair<>(texture, new ImmutablePair<>(new Size(width, height), new Pos2d(x, y)))); + specialTextures.add( + new ImmutablePair<>(texture, new ImmutablePair<>(new Size(width, height), new Pos2d(x, y)))); return this; } public GT_Recipe_Map addSpecialTextureSteam(int width, int height, int x, int y, SteamTexture texture) { useModularUI(true); - specialTexturesSteam - .add(new ImmutablePair<>(texture, new ImmutablePair<>(new Size(width, height), new Pos2d(x, y)))); + specialTexturesSteam.add( + new ImmutablePair<>(texture, new ImmutablePair<>(new Size(width, height), new Pos2d(x, y)))); return this; } @@ -3635,8 +3758,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> { for (GT_Recipe r : recipes) { if (recipeConfigCategory != null) { String configKey = recipeConfigKeyConvertor.apply(r); - if (configKey != null && (r.mDuration = GregTech_API.sRecipeFile - .get(recipeConfigCategory, configKey, r.mDuration)) <= 0) { + if (configKey != null && (r.mDuration = GregTech_API.sRecipeFile.get( + recipeConfigCategory, + configKey, + r.mDuration)) <= 0) { continue; } } @@ -3672,8 +3797,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { public final Iterable<? extends GT_Recipe> defaultBuildRecipe(GT_RecipeBuilder builder) { // TODO sensible validation - if (!downstreams.isEmpty() && disableOptimize && !builder.optimize) - return buildOrEmpty(builder.copy().noOptimize()); + if (!downstreams.isEmpty() && disableOptimize && !builder.optimize) return buildOrEmpty( + builder.copy() + .noOptimize()); return buildOrEmpty(builder); } @@ -3681,10 +3807,13 @@ public class GT_Recipe implements Comparable<GT_Recipe> { mRecipeList.add(aRecipe); for (FluidStack aFluid : aRecipe.mFluidInputs) { if (aFluid != null) { - Collection<GT_Recipe> tList = mRecipeFluidMap - .computeIfAbsent(aFluid.getFluid(), k -> new HashSet<>(1)); + Collection<GT_Recipe> tList = mRecipeFluidMap.computeIfAbsent( + aFluid.getFluid(), + k -> new HashSet<>(1)); tList.add(aRecipe); - mRecipeFluidNameMap.add(aFluid.getFluid().getName()); + mRecipeFluidNameMap.add( + aFluid.getFluid() + .getName()); } } if (aRecipe.mFluidOutputs.length != 0) { @@ -3947,26 +4076,36 @@ public class GT_Recipe implements Comparable<GT_Recipe> { IItemHandlerModifiable fluidInputsInventory, IItemHandlerModifiable fluidOutputsInventory, Supplier<Float> progressSupplier, Pos2d windowOffset) { ModularWindow.Builder builder = ModularWindow.builder(neiBackgroundSize) - .setBackground(ModularUITextures.VANILLA_BACKGROUND); + .setBackground(ModularUITextures.VANILLA_BACKGROUND); UIHelper.forEachSlots( (i, backgrounds, pos) -> builder.widget( - SlotWidget.phantom(itemInputsInventory, i).setBackground(backgrounds).setPos(pos) - .setSize(18, 18)), + SlotWidget.phantom(itemInputsInventory, i) + .setBackground(backgrounds) + .setPos(pos) + .setSize(18, 18)), (i, backgrounds, pos) -> builder.widget( - SlotWidget.phantom(itemOutputsInventory, i).setBackground(backgrounds).setPos(pos) - .setSize(18, 18)), + SlotWidget.phantom(itemOutputsInventory, i) + .setBackground(backgrounds) + .setPos(pos) + .setSize(18, 18)), (i, backgrounds, pos) -> { if (usesSpecialSlot()) builder.widget( - SlotWidget.phantom(specialSlotInventory, 0).setBackground(backgrounds).setPos(pos) - .setSize(18, 18)); + SlotWidget.phantom(specialSlotInventory, 0) + .setBackground(backgrounds) + .setPos(pos) + .setSize(18, 18)); }, (i, backgrounds, pos) -> builder.widget( - SlotWidget.phantom(fluidInputsInventory, i).setBackground(backgrounds).setPos(pos) - .setSize(18, 18)), + SlotWidget.phantom(fluidInputsInventory, i) + .setBackground(backgrounds) + .setPos(pos) + .setSize(18, 18)), (i, backgrounds, pos) -> builder.widget( - SlotWidget.phantom(fluidOutputsInventory, i).setBackground(backgrounds).setPos(pos) - .setSize(18, 18)), + SlotWidget.phantom(fluidOutputsInventory, i) + .setBackground(backgrounds) + .setPos(pos) + .setSize(18, 18)), ModularUITextures.ITEM_SLOT, ModularUITextures.FLUID_SLOT, this, @@ -3983,8 +4122,13 @@ public class GT_Recipe implements Comparable<GT_Recipe> { for (Pair<IDrawable, Pair<Size, Pos2d>> specialTexture : specialTextures) { builder.widget( new DrawableWidget().setDrawable(specialTexture.getLeft()) - .setSize(specialTexture.getRight().getLeft()) - .setPos(specialTexture.getRight().getRight().add(windowOffset))); + .setSize( + specialTexture.getRight() + .getLeft()) + .setPos( + specialTexture.getRight() + .getRight() + .add(windowOffset))); } return builder; @@ -3993,18 +4137,27 @@ public class GT_Recipe implements Comparable<GT_Recipe> { public void addProgressBarUI(ModularWindow.Builder builder, Supplier<Float> progressSupplier, Pos2d windowOffset) { builder.widget( - new ProgressBar().setTexture(getProgressBarTexture(), 20).setDirection(progressBarDirection) - .setProgress(progressSupplier).setSynced(false, false) - .setPos(progressBarPos.add(windowOffset)).setSize(progressBarSize)); + new ProgressBar().setTexture(getProgressBarTexture(), 20) + .setDirection(progressBarDirection) + .setProgress(progressSupplier) + .setSynced(false, false) + .setPos(progressBarPos.add(windowOffset)) + .setSize(progressBarSize)); } public void addGregTechLogoUI(ModularWindow.Builder builder, Pos2d windowOffset) { - builder.widget(new DrawableWidget().setDrawable(logo).setSize(logoSize).setPos(logoPos.add(windowOffset))); + builder.widget( + new DrawableWidget().setDrawable(logo) + .setSize(logoSize) + .setPos(logoPos.add(windowOffset))); } public void addRecipeSpecificDrawable(ModularWindow.Builder builder, Pos2d windowOffset, Supplier<IDrawable> supplier, Pos2d pos, Size size) { - builder.widget(new DrawableWidget().setDrawable(supplier).setSize(size).setPos(pos.add(windowOffset))); + builder.widget( + new DrawableWidget().setDrawable(supplier) + .setSize(size) + .setPos(pos.add(windowOffset))); } /** @@ -4145,18 +4298,21 @@ public class GT_Recipe implements Comparable<GT_Recipe> { drawNEIText( recipeInfo, EnumChatFormatting.ITALIC + GT_Utility.trans("273", "Original Recipe by: ") - + recipe.owners.get(0).getName()); + + recipe.owners.get(0) + .getName()); for (int i = 1; i < recipe.owners.size(); i++) { drawNEIText( recipeInfo, EnumChatFormatting.ITALIC + GT_Utility.trans("274", "Modified by: ") - + recipe.owners.get(i).getName()); + + recipe.owners.get(i) + .getName()); } } else if (recipe.owners.size() > 0) { drawNEIText( recipeInfo, EnumChatFormatting.ITALIC + GT_Utility.trans("272", "Recipe by: ") - + recipe.owners.get(0).getName()); + + recipe.owners.get(0) + .getName()); } } if (GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace && recipe.stackTraces != null @@ -5092,20 +5248,18 @@ public class GT_Recipe implements Comparable<GT_Recipe> { null, null, null); - return GT_Utility.arrayContainsNonNull(tOutputItems) - ? new GT_Recipe( - false, - new ItemStack[] { GT_Utility - .copyAmount(aInputs[0].stackSize - tComparedInput.stackSize, aInputs[0]) }, - tOutputItems, - null, - null, - null, - null, - 400, - 2, - 0) - : null; + return GT_Utility.arrayContainsNonNull(tOutputItems) ? new GT_Recipe( + false, + new ItemStack[] { + GT_Utility.copyAmount(aInputs[0].stackSize - tComparedInput.stackSize, aInputs[0]) }, + tOutputItems, + null, + null, + null, + null, + 400, + 2, + 0) : null; } @Override @@ -5164,20 +5318,18 @@ public class GT_Recipe implements Comparable<GT_Recipe> { null, null, null); - return GT_Utility.arrayContainsNonNull(tOutputItems) - ? new GT_Recipe( - false, - new ItemStack[] { GT_Utility - .copyAmount(aInputs[0].stackSize - tComparedInput.stackSize, aInputs[0]) }, - tOutputItems, - null, - null, - null, - null, - 400, - 2, - 0) - : null; + return GT_Utility.arrayContainsNonNull(tOutputItems) ? new GT_Recipe( + false, + new ItemStack[] { + GT_Utility.copyAmount(aInputs[0].stackSize - tComparedInput.stackSize, aInputs[0]) }, + tOutputItems, + null, + null, + null, + null, + 400, + 2, + 0) : null; } @Override @@ -5236,20 +5388,18 @@ public class GT_Recipe implements Comparable<GT_Recipe> { null, null, null); - return GT_Utility.arrayContainsNonNull(tOutputItems) - ? new GT_Recipe( - false, - new ItemStack[] { GT_Utility - .copyAmount(aInputs[0].stackSize - tComparedInput.stackSize, aInputs[0]) }, - tOutputItems, - null, - null, - null, - null, - 400, - 48, - 0) - : null; + return GT_Utility.arrayContainsNonNull(tOutputItems) ? new GT_Recipe( + false, + new ItemStack[] { + GT_Utility.copyAmount(aInputs[0].stackSize - tComparedInput.stackSize, aInputs[0]) }, + tOutputItems, + null, + null, + null, + null, + 400, + 48, + 0) : null; } @Override @@ -5314,22 +5464,20 @@ public class GT_Recipe implements Comparable<GT_Recipe> { null, null, null); - return GT_Utility.arrayContainsNonNull(tOutputItems) - ? new GT_Recipe( - false, - new ItemStack[] { GT_Utility - .copyAmount(aInputs[0].stackSize - tComparedInput.stackSize, aInputs[0]) }, - tOutputItems, - null, - null, - new FluidStack[] { new FluidStack( - aFluids[0].getFluid(), - ((NBTTagCompound) aRecipeMetaData.getTag("return")).getInteger("amount")) }, - null, - 400, - 16, - 0) - : null; + return GT_Utility.arrayContainsNonNull(tOutputItems) ? new GT_Recipe( + false, + new ItemStack[] { + GT_Utility.copyAmount(aInputs[0].stackSize - tComparedInput.stackSize, aInputs[0]) }, + tOutputItems, + null, + null, + new FluidStack[] { new FluidStack( + aFluids[0].getFluid(), + ((NBTTagCompound) aRecipeMetaData.getTag("return")).getInteger("amount")) }, + null, + 400, + 16, + 0) : null; } @Override @@ -5393,8 +5541,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { if (aRecipe != null) return aRecipe; try { - List<ItemStack> tRecipeOutputs = mods.railcraft.api.crafting.RailcraftCraftingManager.rockCrusher - .getRecipe(GT_Utility.copyAmount(1, aInputs[0])).getRandomizedOuputs(); + List<ItemStack> tRecipeOutputs = mods.railcraft.api.crafting.RailcraftCraftingManager.rockCrusher.getRecipe( + GT_Utility.copyAmount(1, aInputs[0])) + .getRandomizedOuputs(); if (tRecipeOutputs != null) { aRecipe = new GT_Recipe( false, @@ -5426,20 +5575,18 @@ public class GT_Recipe implements Comparable<GT_Recipe> { null, null, null); - return GT_Utility.arrayContainsNonNull(tOutputItems) - ? new GT_Recipe( - false, - new ItemStack[] { GT_Utility - .copyAmount(aInputs[0].stackSize - tComparedInput.stackSize, aInputs[0]) }, - tOutputItems, - null, - null, - null, - null, - 400, - 2, - 0) - : null; + return GT_Utility.arrayContainsNonNull(tOutputItems) ? new GT_Recipe( + false, + new ItemStack[] { + GT_Utility.copyAmount(aInputs[0].stackSize - tComparedInput.stackSize, aInputs[0]) }, + tOutputItems, + null, + null, + null, + null, + 400, + 2, + 0) : null; } @Override @@ -6031,7 +6178,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { FluidStack inputFluidContent = FluidContainerRegistry.getFluidForFilledItem(input); if (inputFluidContent != null) { inputFluidContent.amount *= input.stackSize; - if (inputFluidContent.getFluid().getName().equals("ic2steam")) { + if (inputFluidContent.getFluid() + .getName() + .equals("ic2steam")) { inputFluidContent = GT_ModHandler.getSteam(inputFluidContent.amount); } adjustedFluidInputs.add(inputFluidContent); @@ -6073,7 +6222,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { FluidStack outputFluidContent = FluidContainerRegistry.getFluidForFilledItem(output); if (outputFluidContent != null) { outputFluidContent.amount *= output.stackSize; - if (outputFluidContent.getFluid().getName().equals("ic2steam")) { + if (outputFluidContent.getFluid() + .getName() + .equals("ic2steam")) { outputFluidContent = GT_ModHandler.getSteam(outputFluidContent.amount); } adjustedFluidOutputs.add(outputFluidContent); @@ -6182,13 +6333,17 @@ public class GT_Recipe implements Comparable<GT_Recipe> { public GT_Recipe add(GT_Recipe aRecipe) { GT_Recipe ret = super.add(aRecipe); if (ret != null && ret.mFluidInputs != null && ret.mFluidInputs.length > 1 && ret.mFluidInputs[1] != null) { - mValidCatalystFluidNames.add(ret.mFluidInputs[1].getFluid().getName()); + mValidCatalystFluidNames.add( + ret.mFluidInputs[1].getFluid() + .getName()); } return ret; } public boolean isValidCatalystFluid(FluidStack aFluidStack) { - return mValidCatalystFluidNames.contains(aFluidStack.getFluid().getName()); + return mValidCatalystFluidNames.contains( + aFluidStack.getFluid() + .getName()); } } @@ -6282,9 +6437,12 @@ public class GT_Recipe implements Comparable<GT_Recipe> { Object aSpecial, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) { AtomicInteger ai = new AtomicInteger(); - Optional.ofNullable(GT_OreDictUnificator.getAssociation(aOutputs[0])).map(itemData -> itemData.mMaterial) - .map(materialsStack -> materialsStack.mMaterial).map(materials -> materials.mElement) - .map(Element::getMass).ifPresent(e -> { + Optional.ofNullable(GT_OreDictUnificator.getAssociation(aOutputs[0])) + .map(itemData -> itemData.mMaterial) + .map(materialsStack -> materialsStack.mMaterial) + .map(materials -> materials.mElement) + .map(Element::getMass) + .ifPresent(e -> { aFluidInputs[0].amount = (int) GT_MetaTileEntity_Replicator.cubicFluidMultiplier(e); ai.set(GT_Utility.safeInt(aFluidInputs[0].amount * 512L, 1)); }); @@ -6413,21 +6571,30 @@ public class GT_Recipe implements Comparable<GT_Recipe> { int bar2Width = 18; builder.widget( new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ASSEMBLY_LINE_1, 17) - .setDirection(ProgressBar.Direction.RIGHT) - .setProgress(() -> progressSupplier.get() * ((float) (bar1Width + bar2Width) / bar1Width)) - .setSynced(false, false).setPos(new Pos2d(88, 8).add(windowOffset)).setSize(bar1Width, 72)); + .setDirection(ProgressBar.Direction.RIGHT) + .setProgress( + () -> progressSupplier.get() + * ((float) (bar1Width + bar2Width) / bar1Width)) + .setSynced(false, false) + .setPos(new Pos2d(88, 8).add(windowOffset)) + .setSize(bar1Width, 72)); builder.widget( new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ASSEMBLY_LINE_2, 18) - .setDirection(ProgressBar.Direction.RIGHT) - .setProgress( - () -> (progressSupplier.get() - ((float) bar1Width / (bar1Width + bar2Width))) - * ((float) (bar1Width + bar2Width) / bar2Width)) - .setSynced(false, false).setPos(new Pos2d(124, 8).add(windowOffset)) - .setSize(bar2Width, 72)); + .setDirection(ProgressBar.Direction.RIGHT) + .setProgress( + () -> (progressSupplier.get() + - ((float) bar1Width / (bar1Width + bar2Width))) + * ((float) (bar1Width + bar2Width) / bar2Width)) + .setSynced(false, false) + .setPos(new Pos2d(124, 8).add(windowOffset)) + .setSize(bar2Width, 72)); builder.widget( new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ASSEMBLY_LINE_3, 18) - .setDirection(ProgressBar.Direction.UP).setProgress(progressSupplier) - .setSynced(false, false).setPos(new Pos2d(146, 26).add(windowOffset)).setSize(10, 18)); + .setDirection(ProgressBar.Direction.UP) + .setProgress(progressSupplier) + .setSynced(false, false) + .setPos(new Pos2d(146, 26).add(windowOffset)) + .setSize(10, 18)); } } } diff --git a/src/main/java/gregtech/api/util/GT_RecipeBuilder.java b/src/main/java/gregtech/api/util/GT_RecipeBuilder.java index 199d79af84..dc3dd8bba1 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeBuilder.java +++ b/src/main/java/gregtech/api/util/GT_RecipeBuilder.java @@ -95,7 +95,10 @@ public class GT_RecipeBuilder { } private static FluidStack[] fix(FluidStack[] fluidInputs) { - return Arrays.stream(fluidInputs).filter(Objects::nonNull).map(GT_FluidStack::new).toArray(FluidStack[]::new); + return Arrays.stream(fluidInputs) + .filter(Objects::nonNull) + .map(GT_FluidStack::new) + .toArray(FluidStack[]::new); } private static ItemStack[] fix(ItemStack[] inputs) { @@ -144,8 +147,10 @@ public class GT_RecipeBuilder { List<ItemStack> ores = GT_OreDictUnificator.getOres(arr[0]); if (ores.isEmpty()) continue; int size = ((Number) arr[1]).intValue(); - alts[i] = ores.stream().map(s -> GT_Utility.copyAmount(size, s)).filter(GT_Utility::isStackValid) - .toArray(ItemStack[]::new); + alts[i] = ores.stream() + .map(s -> GT_Utility.copyAmount(size, s)) + .filter(GT_Utility::isStackValid) + .toArray(ItemStack[]::new); } else if (input == null) { if (DEBUG_MODE) { throw new NullPointerException(); @@ -159,7 +164,9 @@ public class GT_RecipeBuilder { throw new IllegalArgumentException("index " + i + ", unexpected type: " + input.getClass()); } } - inputsBasic = Arrays.stream(alts).map(ss -> ss.length > 0 ? ss[0] : null).toArray(ItemStack[]::new); + inputsBasic = Arrays.stream(alts) + .map(ss -> ss.length > 0 ? ss[0] : null) + .toArray(ItemStack[]::new); // optimize cannot handle recipes with alts return noOptimize(); } @@ -673,8 +680,8 @@ public class GT_RecipeBuilder { public final static class MetadataIdentifier<T> { - private static final Map<MetadataIdentifier<?>, MetadataIdentifier<?>> allIdentifiers = Collections - .synchronizedMap(new HashMap<>()); + private static final Map<MetadataIdentifier<?>, MetadataIdentifier<?>> allIdentifiers = Collections.synchronizedMap( + new HashMap<>()); private final Class<T> clazz; private final String identifier; diff --git a/src/main/java/gregtech/api/util/GT_RecipeConstants.java b/src/main/java/gregtech/api/util/GT_RecipeConstants.java index 5ccb84da9a..701e1ee4a8 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeConstants.java +++ b/src/main/java/gregtech/api/util/GT_RecipeConstants.java @@ -21,54 +21,64 @@ public class GT_RecipeConstants { * Set to true to signal the recipe require low gravity. do nothing if recipe set specialValue explicitly. Can * coexist with CLEANROOM just fine */ - public static final GT_RecipeBuilder.MetadataIdentifier<Boolean> LOW_GRAVITY = GT_RecipeBuilder.MetadataIdentifier - .create(Boolean.class, "low_gravity"); + public static final GT_RecipeBuilder.MetadataIdentifier<Boolean> LOW_GRAVITY = GT_RecipeBuilder.MetadataIdentifier.create( + Boolean.class, + "low_gravity"); /** * Set to true to signal the recipe require cleanroom. do nothing if recipe set specialValue explicitly. Can coexist * with LOW_GRAVITY just fine */ - public static final GT_RecipeBuilder.MetadataIdentifier<Boolean> CLEANROOM = GT_RecipeBuilder.MetadataIdentifier - .create(Boolean.class, "cleanroom"); + public static final GT_RecipeBuilder.MetadataIdentifier<Boolean> CLEANROOM = GT_RecipeBuilder.MetadataIdentifier.create( + Boolean.class, + "cleanroom"); /** * Common additive to use in recipe, e.g. for PBF, this is coal amount. */ - public static final GT_RecipeBuilder.MetadataIdentifier<Integer> ADDITIVE_AMOUNT = GT_RecipeBuilder.MetadataIdentifier - .create(Integer.class, "additives"); + public static final GT_RecipeBuilder.MetadataIdentifier<Integer> ADDITIVE_AMOUNT = GT_RecipeBuilder.MetadataIdentifier.create( + Integer.class, + "additives"); /** * Used for fusion reactor. Denotes ignition threshold. */ - public static final GT_RecipeBuilder.MetadataIdentifier<Integer> FUSION_THRESHOLD = GT_RecipeBuilder.MetadataIdentifier - .create(Integer.class, "fusion_threshold"); + public static final GT_RecipeBuilder.MetadataIdentifier<Integer> FUSION_THRESHOLD = GT_RecipeBuilder.MetadataIdentifier.create( + Integer.class, + "fusion_threshold"); /** * Research time in a scanner used in ticks. */ - public static final GT_RecipeBuilder.MetadataIdentifier<Integer> RESEARCH_TIME = GT_RecipeBuilder.MetadataIdentifier - .create(Integer.class, "research_time"); + public static final GT_RecipeBuilder.MetadataIdentifier<Integer> RESEARCH_TIME = GT_RecipeBuilder.MetadataIdentifier.create( + Integer.class, + "research_time"); /** * Fuel type. TODO should we use enum directly? */ - public static final GT_RecipeBuilder.MetadataIdentifier<Integer> FUEL_TYPE = GT_RecipeBuilder.MetadataIdentifier - .create(Integer.class, "fuel_type"); + public static final GT_RecipeBuilder.MetadataIdentifier<Integer> FUEL_TYPE = GT_RecipeBuilder.MetadataIdentifier.create( + Integer.class, + "fuel_type"); /** * Fuel value. */ - public static final GT_RecipeBuilder.MetadataIdentifier<Integer> FUEL_VALUE = GT_RecipeBuilder.MetadataIdentifier - .create(Integer.class, "fuel_value"); + public static final GT_RecipeBuilder.MetadataIdentifier<Integer> FUEL_VALUE = GT_RecipeBuilder.MetadataIdentifier.create( + Integer.class, + "fuel_value"); /** * Fuel value. */ - public static final GT_RecipeBuilder.MetadataIdentifier<Integer> COIL_HEAT = GT_RecipeBuilder.MetadataIdentifier - .create(Integer.class, "coil_heat"); + public static final GT_RecipeBuilder.MetadataIdentifier<Integer> COIL_HEAT = GT_RecipeBuilder.MetadataIdentifier.create( + Integer.class, + "coil_heat"); /** * Research item used by assline recipes. */ - public static final GT_RecipeBuilder.MetadataIdentifier<ItemStack> RESEARCH_ITEM = GT_RecipeBuilder.MetadataIdentifier - .create(ItemStack.class, "research_item"); + public static final GT_RecipeBuilder.MetadataIdentifier<ItemStack> RESEARCH_ITEM = GT_RecipeBuilder.MetadataIdentifier.create( + ItemStack.class, + "research_item"); /** * For assembler. It accepts a single item as oredict. It looks like no one uses this anyway... */ - public static final GT_RecipeBuilder.MetadataIdentifier<Object> OREDICT_INPUT = GT_RecipeBuilder.MetadataIdentifier - .create(Object.class, "oredict_input"); + public static final GT_RecipeBuilder.MetadataIdentifier<Object> OREDICT_INPUT = GT_RecipeBuilder.MetadataIdentifier.create( + Object.class, + "oredict_input"); public static final IGT_RecipeMap Fusion = IGT_RecipeMap.newRecipeMap(builder -> { if (GT_Utility.isArrayEmptyOrNull(builder.getFluidInputs()) @@ -92,27 +102,36 @@ public class GT_RecipeConstants { for (Materials mat : new Materials[] { Materials.Argon, Materials.Nitrogen }) { int tPlasmaAmount = (int) Math.max(1L, aDuration / (mat.getMass() * 16L)); GT_RecipeBuilder b2 = builder.copy(); - b2.fluidInputs(mat.getPlasma(tPlasmaAmount)).fluidOutputs(mat.getGas(tPlasmaAmount)); + b2.fluidInputs(mat.getPlasma(tPlasmaAmount)) + .fluidOutputs(mat.getGas(tPlasmaAmount)); ret.addAll(GT_Recipe_Map.sPlasmaArcFurnaceRecipes.doAdd(b2)); } ret.addAll( - GT_Recipe_Map.sArcFurnaceRecipes.doAdd(builder.copy().fluidInputs(Materials.Oxygen.getGas(aDuration)))); + GT_Recipe_Map.sArcFurnaceRecipes.doAdd( + builder.copy() + .fluidInputs(Materials.Oxygen.getGas(aDuration)))); return ret; }); public static final IGT_RecipeMap UniversalChemical = IGT_RecipeMap.newRecipeMap(builder -> { for (ItemStack input : builder.getItemInputsBasic()) { if (GT_Utility.isAnyIntegratedCircuit(input) && input.getItemDamage() >= 10) return GT_Utility.concat( - builder.copy().addTo(GT_Recipe_Map.sChemicalRecipes), + builder.copy() + .addTo(GT_Recipe_Map.sChemicalRecipes), // LCR does not need cleanroom, for now. - builder.metadata(CLEANROOM, false).addTo(GT_Recipe_Map.sMultiblockChemicalRecipes)); + builder.metadata(CLEANROOM, false) + .addTo(GT_Recipe_Map.sMultiblockChemicalRecipes)); } return builder.addTo(GT_Recipe_Map.sChemicalRecipes); }); public static final IGT_RecipeMap AssemblyLine = IGT_RecipeMap.newRecipeMap(builder -> { - Optional<GT_Recipe.GT_Recipe_WithAlt> rr = builder.forceOreDictInput().validateInputCount(4, 16) - .validateOutputCount(1, 1).validateOutputFluidCount(-1, 0).validateInputFluidCount(0, 4).buildWithAlt(); + Optional<GT_Recipe.GT_Recipe_WithAlt> rr = builder.forceOreDictInput() + .validateInputCount(4, 16) + .validateOutputCount(1, 1) + .validateOutputFluidCount(-1, 0) + .validateInputFluidCount(0, 4) + .buildWithAlt(); if (!rr.isPresent()) return Collections.emptyList(); GT_Recipe.GT_Recipe_WithAlt r = rr.get(); ItemStack[][] mOreDictAlt = r.mOreDictAlt; @@ -134,11 +153,11 @@ public class GT_RecipeConstants { Object[] objs = (Object[]) input; Arrays.sort( alts, - Comparator - .<ItemStack, String>comparing( - s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).modId) - .thenComparing(s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).name) - .thenComparingInt(Items.feather::getDamage).thenComparingInt(s -> s.stackSize)); + Comparator.<ItemStack, String>comparing( + s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).modId) + .thenComparing(s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).name) + .thenComparingInt(Items.feather::getDamage) + .thenComparingInt(s -> s.stackSize)); tPersistentHash = tPersistentHash * 31 + (objs[0] == null ? "" : objs[0].toString()).hashCode(); tPersistentHash = tPersistentHash * 31 + ((Number) objs[1]).intValue(); @@ -205,21 +224,29 @@ public class GT_RecipeConstants { Collection<GT_Recipe> ret = new ArrayList<>(); for (ItemStack input : GT_OreDictUnificator.getOresImmutable(builder.getMetadata(OREDICT_INPUT))) { ret.addAll( - builder.copy().itemInputs(GT_RecipeMapUtil.appendArray(builder.getItemInputsBasic(), input)) - .addTo(GT_Recipe_Map.sAssemblerRecipes)); + builder.copy() + .itemInputs(GT_RecipeMapUtil.appendArray(builder.getItemInputsBasic(), input)) + .addTo(GT_Recipe_Map.sAssemblerRecipes)); } return ret; }); public static IGT_RecipeMap Fuel = IGT_RecipeMap.newRecipeMap(builder -> { - builder.validateInputCount(1, 1).validateNoInputFluid().validateOutputCount(-1, 0).validateNoOutputFluid(); + builder.validateInputCount(1, 1) + .validateNoInputFluid() + .validateOutputCount(-1, 0) + .validateNoOutputFluid(); if (!builder.isValid()) return Collections.emptyList(); int fuelType = builder.getMetadata(FUEL_TYPE); builder.metadata( FUEL_VALUE, - GregTech_API.sRecipeFile - .get("fuel_" + fuelType, builder.getItemInputBasic(0), builder.getMetadata(FUEL_VALUE))); - return FuelType.get(fuelType).getTarget().doAdd(builder); + GregTech_API.sRecipeFile.get( + "fuel_" + fuelType, + builder.getItemInputBasic(0), + builder.getMetadata(FUEL_VALUE))); + return FuelType.get(fuelType) + .getTarget() + .doAdd(builder); }); public enum FuelType { diff --git a/src/main/java/gregtech/api/util/GT_RecipeMapUtil.java b/src/main/java/gregtech/api/util/GT_RecipeMapUtil.java index 7bb02a5681..54a2c5a692 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeMapUtil.java +++ b/src/main/java/gregtech/api/util/GT_RecipeMapUtil.java @@ -28,9 +28,11 @@ public class GT_RecipeMapUtil { }; public static final Function<GT_Recipe, String> FIRST_FLUID_INPUT = r -> isArrayEmptyOrNull(r.mFluidInputs) ? null - : r.mFluidInputs[0].getFluid().getName(); + : r.mFluidInputs[0].getFluid() + .getName(); public static final Function<GT_Recipe, String> FIRST_FLUID_OUTPUT = r -> isArrayEmptyOrNull(r.mFluidInputs) ? null - : r.mFluidOutputs[0].getFluid().getName(); + : r.mFluidOutputs[0].getFluid() + .getName(); public static final Function<GT_Recipe, String> FIRST_FLUIDSTACK_INPUT = r -> isArrayEmptyOrNull(r.mFluidInputs) ? null : r.mFluidInputs[0].getUnlocalizedName(); @@ -42,10 +44,14 @@ public class GT_RecipeMapUtil { public static final Function<GT_Recipe, String> FIRST_ITEM_OUTPUT = r -> isArrayEmptyOrNull(r.mOutputs) ? null : getStackConfigName(r.mOutputs[0]); public static final Function<GT_Recipe, String> FIRST_ITEM_OR_FLUID_INPUT = r -> isArrayEmptyOrNull(r.mInputs) - ? isArrayEmptyOrNull(r.mFluidInputs) ? null : r.mFluidInputs[0].getFluid().getName() + ? isArrayEmptyOrNull(r.mFluidInputs) ? null + : r.mFluidInputs[0].getFluid() + .getName() : getStackConfigName(r.mInputs[0]); public static final Function<GT_Recipe, String> FIRST_ITEM_OR_FLUID_OUTPUT = r -> isArrayEmptyOrNull(r.mOutputs) - ? isArrayEmptyOrNull(r.mFluidOutputs) ? null : r.mFluidOutputs[0].getFluid().getName() + ? isArrayEmptyOrNull(r.mFluidOutputs) ? null + : r.mFluidOutputs[0].getFluid() + .getName() : getStackConfigName(r.mOutputs[0]); private static final Map<String, IGT_RecipeMap> addonRecipeMaps = new HashMap<>(); private static final Multimap<String, Consumer<IGT_RecipeMap>> delayedActions = ArrayListMultimap.create(); @@ -74,9 +80,10 @@ public class GT_RecipeMapUtil { cellToFluid(itemInputs, fluidInputs, true); cellToFluid(itemInputs, fluidInputs, false); return buildOrEmpty( - b.itemInputs(itemInputs.toArray(new ItemStack[0])).itemOutputs(itemOutputs.toArray(new ItemStack[0])) - .fluidInputs(fluidInputs.toArray(new FluidStack[0])) - .fluidOutputs(fluidOutputs.toArray(new FluidStack[0]))); + b.itemInputs(itemInputs.toArray(new ItemStack[0])) + .itemOutputs(itemOutputs.toArray(new ItemStack[0])) + .fluidInputs(fluidInputs.toArray(new FluidStack[0])) + .fluidOutputs(fluidOutputs.toArray(new FluidStack[0]))); } public static List<GT_Recipe> buildRecipeForMultiblockNoCircuit(GT_RecipeBuilder b) { @@ -87,9 +94,10 @@ public class GT_RecipeMapUtil { cellToFluid(itemInputs, fluidInputs, false); cellToFluid(itemInputs, fluidInputs, false); return buildOrEmpty( - b.itemInputs(itemInputs.toArray(new ItemStack[0])).itemOutputs(itemOutputs.toArray(new ItemStack[0])) - .fluidInputs(fluidInputs.toArray(new FluidStack[0])) - .fluidOutputs(fluidOutputs.toArray(new FluidStack[0]))); + b.itemInputs(itemInputs.toArray(new ItemStack[0])) + .itemOutputs(itemOutputs.toArray(new ItemStack[0])) + .fluidInputs(fluidInputs.toArray(new FluidStack[0])) + .fluidOutputs(fluidOutputs.toArray(new FluidStack[0]))); } private static void cellToFluid(List<ItemStack> items, List<FluidStack> fluids, boolean removeIntegratedCircuit) { @@ -104,7 +112,9 @@ public class GT_RecipeMapUtil { } public static List<GT_Recipe> buildOrEmpty(GT_RecipeBuilder builder) { - return builder.build().map(Collections::singletonList).orElse(Collections.emptyList()); + return builder.build() + .map(Collections::singletonList) + .orElse(Collections.emptyList()); } /** @@ -119,7 +129,9 @@ public class GT_RecipeMapUtil { */ public static void registerRecipeMap(String identifier, IGT_RecipeMap recipeMap, RecipeMapDependency... dependencies) { - String modId = Loader.instance().activeModContainer().getModId(); + String modId = Loader.instance() + .activeModContainer() + .getModId(); if ("gregtech".equals(modId)) throw new IllegalStateException( "do not register recipe map under the name of gregtech! do it in your own preinit!"); String id = modId + "@" + identifier; diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index 0b881ce477..b6a4b960c7 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -178,7 +178,8 @@ public class GT_RecipeRegistrator { || (L * aMaterialAmount) / (M * aStack.stackSize) <= 0) return; ItemData tData = GT_OreDictUnificator.getItemData(aStack); - boolean tHide = aStack.getUnlocalizedName().startsWith("gt.blockmachines") + boolean tHide = aStack.getUnlocalizedName() + .startsWith("gt.blockmachines") && (GT_Mod.gregtechproxy.mHideRecyclingRecipes); if (GT_Mod.gregtechproxy.mHideRecyclingRecipes && tData != null && tData.hasValidPrefixData() @@ -199,8 +200,9 @@ public class GT_RecipeRegistrator { : aByproduct.mMaterial.contains(SubTag.NO_SMELTING) || !aByproduct.mMaterial.contains(SubTag.METAL) ? aByproduct.mMaterial.contains(SubTag.FLAMMABLE) - ? GT_OreDictUnificator - .getDust(Materials.Ash, aByproduct.mAmount / 2) + ? GT_OreDictUnificator.getDust( + Materials.Ash, + aByproduct.mAmount / 2) : aByproduct.mMaterial.contains(SubTag.UNBURNABLE) ? GT_OreDictUnificator.getDustOrIngot( aByproduct.mMaterial.mSmeltInto, @@ -467,7 +469,8 @@ public class GT_RecipeRegistrator { private static Map<RecipeShape, List<IRecipe>> createIndexedRecipeListCache() { Map<RecipeShape, List<IRecipe>> result = new IdentityHashMap<>(); @SuppressWarnings("unchecked") - ArrayList<IRecipe> allRecipeList = (ArrayList<IRecipe>) CraftingManager.getInstance().getRecipeList(); + ArrayList<IRecipe> allRecipeList = (ArrayList<IRecipe>) CraftingManager.getInstance() + .getRecipeList(); // filter using the empty slots in the shape. // if the empty slots doesn't match, the recipe will definitely fail SetMultimap<List<Integer>, RecipeShape> filter = HashMultimap.create(); @@ -498,7 +501,8 @@ public class GT_RecipeRegistrator { getRecipeWidth(tShapedRecipe), getRecipeHeight(tShapedRecipe))) { for (RecipeShape s : filter.get(buffer)) { - result.computeIfAbsent(s, k -> new ArrayList<>()).add(tRecipe); + result.computeIfAbsent(s, k -> new ArrayList<>()) + .add(tRecipe); } } } else if (tRecipe instanceof ShapedRecipes) { @@ -509,14 +513,16 @@ public class GT_RecipeRegistrator { getRecipeWidth(tShapedRecipe), getRecipeHeight(tShapedRecipe))) { for (RecipeShape s : filter.get(buffer)) { - result.computeIfAbsent(s, k -> new ArrayList<>()).add(tRecipe); + result.computeIfAbsent(s, k -> new ArrayList<>()) + .add(tRecipe); } } } else { for (RecipeShape s : sShapes) { // unknown recipe type. cannot determine empty slots. we choose to add to the recipe list for // all shapes - result.computeIfAbsent(s, k -> new ArrayList<>()).add(tRecipe); + result.computeIfAbsent(s, k -> new ArrayList<>()) + .add(tRecipe); } } } @@ -563,8 +569,10 @@ public class GT_RecipeRegistrator { for (int i = 0; i < sShapes.length; i++) { RecipeShape tRecipe = sShapes[i]; - for (ItemStack tCrafted : GT_ModHandler - .getRecipeOutputs(getRecipeList(tRecipe), true, tRecipe.shape)) { + for (ItemStack tCrafted : GT_ModHandler.getRecipeOutputs( + getRecipeList(tRecipe), + true, + tRecipe.shape)) { if (aItemData != null && aItemData.hasValidPrefixMaterialData()) GT_OreDictUnificator.addItemData( tCrafted, @@ -735,7 +743,8 @@ public class GT_RecipeRegistrator { } public static boolean hasVanillaRecipes(Materials materials) { - return Arrays.stream(VANILLA_MATS).anyMatch(mat -> mat == materials); + return Arrays.stream(VANILLA_MATS) + .anyMatch(mat -> mat == materials); } private static int getRecipeWidth(ShapedOreRecipe r) { diff --git a/src/main/java/gregtech/api/util/GT_RenderingWorld.java b/src/main/java/gregtech/api/util/GT_RenderingWorld.java index bab2a30505..b8caa59554 100644 --- a/src/main/java/gregtech/api/util/GT_RenderingWorld.java +++ b/src/main/java/gregtech/api/util/GT_RenderingWorld.java @@ -59,7 +59,8 @@ public class GT_RenderingWorld implements IBlockAccess { public void register(int x, int y, int z, Block block, int meta) { ChunkPosition key = new ChunkPosition(x, y, z); infos.put(key, new BlockInfo(block, meta)); - index.computeIfAbsent(new ChunkCoordIntPair(x >> 4, z >> 4), p -> new HashSet<>()).add(key); + index.computeIfAbsent(new ChunkCoordIntPair(x >> 4, z >> 4), p -> new HashSet<>()) + .add(key); } public void unregister(int x, int y, int z, Block block, int meta) { @@ -127,7 +128,9 @@ public class GT_RenderingWorld implements IBlockAccess { public class FMLEventHandler { public FMLEventHandler() { - FMLCommonHandler.instance().bus().register(this); + FMLCommonHandler.instance() + .bus() + .register(this); } @SubscribeEvent(priority = EventPriority.HIGHEST) @@ -145,8 +148,11 @@ public class GT_RenderingWorld implements IBlockAccess { @SubscribeEvent public void onChunkUnloaded(ChunkEvent.Unload e) { if (!e.world.isRemote) return; - Set<ChunkPosition> set = index.remove(e.getChunk().getChunkCoordIntPair()); - if (set != null) infos.keySet().removeAll(set); + Set<ChunkPosition> set = index.remove( + e.getChunk() + .getChunkCoordIntPair()); + if (set != null) infos.keySet() + .removeAll(set); } @SubscribeEvent diff --git a/src/main/java/gregtech/api/util/GT_Shaped_Recipe.java b/src/main/java/gregtech/api/util/GT_Shaped_Recipe.java index 62096c1ebd..982c0e8f35 100644 --- a/src/main/java/gregtech/api/util/GT_Shaped_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Shaped_Recipe.java @@ -36,9 +36,12 @@ public class GT_Shaped_Recipe extends ShapedOreRecipe implements IGT_CraftingRec for (int i = 0; i < aGrid.getSizeInventory(); i++) { if (aGrid.getStackInSlot(i) != null) { if (tStack != null) { - if ((tStack.hasTagCompound() != aGrid.getStackInSlot(i).hasTagCompound()) - || (tStack.hasTagCompound() - && !tStack.getTagCompound().equals(aGrid.getStackInSlot(i).getTagCompound()))) + if ((tStack.hasTagCompound() != aGrid.getStackInSlot(i) + .hasTagCompound()) + || (tStack.hasTagCompound() && !tStack.getTagCompound() + .equals( + aGrid.getStackInSlot(i) + .getTagCompound()))) return false; } tStack = aGrid.getStackInSlot(i); @@ -57,8 +60,12 @@ public class GT_Shaped_Recipe extends ShapedOreRecipe implements IGT_CraftingRec // Keeping NBT if (mKeepingNBT) for (int i = 0; i < aGrid.getSizeInventory(); i++) { - if (aGrid.getStackInSlot(i) != null && aGrid.getStackInSlot(i).hasTagCompound()) { - rStack.setTagCompound((NBTTagCompound) aGrid.getStackInSlot(i).getTagCompound().copy()); + if (aGrid.getStackInSlot(i) != null && aGrid.getStackInSlot(i) + .hasTagCompound()) { + rStack.setTagCompound( + (NBTTagCompound) aGrid.getStackInSlot(i) + .getTagCompound() + .copy()); break; } } diff --git a/src/main/java/gregtech/api/util/GT_Shapeless_Recipe.java b/src/main/java/gregtech/api/util/GT_Shapeless_Recipe.java index 02c479cc94..fc1d523ecc 100644 --- a/src/main/java/gregtech/api/util/GT_Shapeless_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Shapeless_Recipe.java @@ -36,9 +36,12 @@ public class GT_Shapeless_Recipe extends ShapelessOreRecipe implements IGT_Craft for (int i = 0; i < aGrid.getSizeInventory(); i++) { if (aGrid.getStackInSlot(i) != null) { if (tStack != null) { - if ((tStack.hasTagCompound() != aGrid.getStackInSlot(i).hasTagCompound()) - || (tStack.hasTagCompound() - && !tStack.getTagCompound().equals(aGrid.getStackInSlot(i).getTagCompound()))) + if ((tStack.hasTagCompound() != aGrid.getStackInSlot(i) + .hasTagCompound()) + || (tStack.hasTagCompound() && !tStack.getTagCompound() + .equals( + aGrid.getStackInSlot(i) + .getTagCompound()))) return false; } tStack = aGrid.getStackInSlot(i); @@ -57,8 +60,12 @@ public class GT_Shapeless_Recipe extends ShapelessOreRecipe implements IGT_Craft // Keeping NBT if (mKeepingNBT) for (int i = 0; i < aGrid.getSizeInventory(); i++) { - if (aGrid.getStackInSlot(i) != null && aGrid.getStackInSlot(i).hasTagCompound()) { - rStack.setTagCompound((NBTTagCompound) aGrid.getStackInSlot(i).getTagCompound().copy()); + if (aGrid.getStackInSlot(i) != null && aGrid.getStackInSlot(i) + .hasTagCompound()) { + rStack.setTagCompound( + (NBTTagCompound) aGrid.getStackInSlot(i) + .getTagCompound() + .copy()); break; } } diff --git a/src/main/java/gregtech/api/util/GT_Single_Recipe_Check.java b/src/main/java/gregtech/api/util/GT_Single_Recipe_Check.java index 89a7fb371d..806d892365 100644 --- a/src/main/java/gregtech/api/util/GT_Single_Recipe_Check.java +++ b/src/main/java/gregtech/api/util/GT_Single_Recipe_Check.java @@ -42,8 +42,14 @@ public class GT_Single_Recipe_Check { this.itemCost = itemCost; this.fluidCost = fluidCost; - this.totalItemCost = itemCost.values().stream().mapToInt(Integer::intValue).sum(); - this.totalFluidCost = fluidCost.values().stream().mapToInt(Integer::intValue).sum(); + this.totalItemCost = itemCost.values() + .stream() + .mapToInt(Integer::intValue) + .sum(); + this.totalFluidCost = fluidCost.values() + .stream() + .mapToInt(Integer::intValue) + .sum(); } public GT_Recipe getRecipe() { @@ -208,13 +214,19 @@ public class GT_Single_Recipe_Check { tag.setInteger("specialValue", recipe.mSpecialValue); tag.setTag("itemCost", writeList(itemCost.entrySet(), e -> { NBTTagCompound ret = new NBTTagCompound(); - ret.setTag("id", e.getKey().writeToNBT()); + ret.setTag( + "id", + e.getKey() + .writeToNBT()); ret.setInteger("count", e.getValue()); return ret; })); tag.setTag("fluidCost", writeList(fluidCost.entrySet(), e -> { NBTTagCompound ret = new NBTTagCompound(); - ret.setString("id", e.getKey().getName()); + ret.setString( + "id", + e.getKey() + .getName()); ret.setInteger("count", e.getValue()); return ret; })); @@ -248,30 +260,36 @@ public class GT_Single_Recipe_Check { } protected static ImmutableMap<Fluid, Integer> loadFluidCost(NBTTagCompound tag) { - return GT_Utility.streamCompounds(tag.getTagList("fluidCost", Constants.NBT.TAG_COMPOUND)).collect( - GT_Utility.toImmutableMapSerial( - t -> FluidRegistry.getFluid(t.getString("id")), - t -> t.getInteger("count"))); + return GT_Utility.streamCompounds(tag.getTagList("fluidCost", Constants.NBT.TAG_COMPOUND)) + .collect( + GT_Utility.toImmutableMapSerial( + t -> FluidRegistry.getFluid(t.getString("id")), + t -> t.getInteger("count"))); } protected static ImmutableMap<GT_Utility.ItemId, Integer> loadItemCost(NBTTagCompound tag) { - return GT_Utility.streamCompounds(tag.getTagList("itemCost", Constants.NBT.TAG_COMPOUND)).collect( - GT_Utility.toImmutableMapSerial( - t -> GT_Utility.ItemId.create(t.getCompoundTag("id")), - t -> t.getInteger("count"))); + return GT_Utility.streamCompounds(tag.getTagList("itemCost", Constants.NBT.TAG_COMPOUND)) + .collect( + GT_Utility.toImmutableMapSerial( + t -> GT_Utility.ItemId.create(t.getCompoundTag("id")), + t -> t.getInteger("count"))); } protected static GT_Recipe tryFindRecipe(GT_MetaTileEntity_MultiBlockBase parent, GT_Recipe.GT_Recipe_Map recipeMap, NBTTagCompound tag) { if (tag == null || tag.hasNoTags()) return null; ItemStack[] inputs = GT_Utility.streamCompounds(tag.getTagList("inputs", Constants.NBT.TAG_COMPOUND)) - .map(GT_Utility::loadItem).toArray(ItemStack[]::new); + .map(GT_Utility::loadItem) + .toArray(ItemStack[]::new); ItemStack[] outputs = GT_Utility.streamCompounds(tag.getTagList("outputs", Constants.NBT.TAG_COMPOUND)) - .map(GT_Utility::loadItem).toArray(ItemStack[]::new); + .map(GT_Utility::loadItem) + .toArray(ItemStack[]::new); FluidStack[] fInputs = GT_Utility.streamCompounds(tag.getTagList("fInputs", Constants.NBT.TAG_COMPOUND)) - .map(FluidStack::loadFluidStackFromNBT).toArray(FluidStack[]::new); + .map(FluidStack::loadFluidStackFromNBT) + .toArray(FluidStack[]::new); FluidStack[] fOutputs = GT_Utility.streamCompounds(tag.getTagList("fOutputs", Constants.NBT.TAG_COMPOUND)) - .map(FluidStack::loadFluidStackFromNBT).toArray(FluidStack[]::new); + .map(FluidStack::loadFluidStackFromNBT) + .toArray(FluidStack[]::new); int eut = tag.getInteger("eut"); GT_Recipe found = recipeMap.findRecipe( parent.getBaseMetaTileEntity(), diff --git a/src/main/java/gregtech/api/util/GT_Single_Recipe_Check_Processing_Array.java b/src/main/java/gregtech/api/util/GT_Single_Recipe_Check_Processing_Array.java index 656c752ea6..3996484935 100644 --- a/src/main/java/gregtech/api/util/GT_Single_Recipe_Check_Processing_Array.java +++ b/src/main/java/gregtech/api/util/GT_Single_Recipe_Check_Processing_Array.java @@ -94,8 +94,13 @@ public class GT_Single_Recipe_Check_Processing_Array extends GT_Single_Recipe_Ch if (consumeInputs) { if (totalItemCost > 0) { int remainingItemCost = totalItemCost * finalParallel; - Map<GT_Utility.ItemId, Integer> runningItemCost = itemCost.entrySet().stream() - .collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue() * finalParallel)); + Map<GT_Utility.ItemId, Integer> runningItemCost = itemCost.entrySet() + .stream() + .collect( + Collectors.toMap( + Map.Entry::getKey, + entry -> entry.getValue() + * finalParallel)); for (ItemStack itemStack : items) { GT_Utility.ItemId key = GT_Utility.ItemId.createNoCopy(itemStack); @@ -113,8 +118,13 @@ public class GT_Single_Recipe_Check_Processing_Array extends GT_Single_Recipe_Ch if (totalFluidCost > 0) { int remainingFluidCost = totalFluidCost * finalParallel; - Map<Fluid, Integer> runningFluidCost = fluidCost.entrySet().stream() - .collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue() * finalParallel)); + Map<Fluid, Integer> runningFluidCost = fluidCost.entrySet() + .stream() + .collect( + Collectors.toMap( + Map.Entry::getKey, + entry -> entry.getValue() + * finalParallel)); for (FluidStack fluidStack : fluids) { Fluid key = fluidStack.getFluid(); diff --git a/src/main/java/gregtech/api/util/GT_SpawnEventHandler.java b/src/main/java/gregtech/api/util/GT_SpawnEventHandler.java index 7b03dd8884..c17f73a147 100644 --- a/src/main/java/gregtech/api/util/GT_SpawnEventHandler.java +++ b/src/main/java/gregtech/api/util/GT_SpawnEventHandler.java @@ -40,8 +40,9 @@ public class GT_SpawnEventHandler { public void denyMobSpawn(CheckSpawn event) { if (event.getResult() == Event.Result.DENY) return; - if (event.entityLiving instanceof EntitySlime - && !(((EntitySlime) event.entityLiving).getCustomNameTag().length() > 0)) { + if (event.entityLiving instanceof EntitySlime && !(((EntitySlime) event.entityLiving).getCustomNameTag() + .length() + > 0)) { if (event.getResult() == Event.Result.ALLOW) event.setResult(Event.Result.DEFAULT); } @@ -64,10 +65,9 @@ public class GT_SpawnEventHandler { if (check > maxRangeCheck) continue; final TileEntity tTile = event.entity.worldObj.getTileEntity(rep[0], rep[1], rep[2]); - if (tTile instanceof BaseMetaTileEntity && ((BaseMetaTileEntity) tTile) - .getMetaTileEntity() instanceof GT_MetaTileEntity_MonsterRepellent) { - final int r = ((GT_MetaTileEntity_MonsterRepellent) ((BaseMetaTileEntity) tTile) - .getMetaTileEntity()).mRange; + if (tTile instanceof BaseMetaTileEntity + && ((BaseMetaTileEntity) tTile).getMetaTileEntity() instanceof GT_MetaTileEntity_MonsterRepellent) { + final int r = ((GT_MetaTileEntity_MonsterRepellent) ((BaseMetaTileEntity) tTile).getMetaTileEntity()).mRange; if (check <= Math.pow(r, 2)) { if (event.entityLiving instanceof EntitySlime) ((EntitySlime) event.entityLiving).setCustomNameTag("DoNotSpawnSlimes"); diff --git a/src/main/java/gregtech/api/util/GT_StructureUtility.java b/src/main/java/gregtech/api/util/GT_StructureUtility.java index 25ba192794..80fc64a8c3 100644 --- a/src/main/java/gregtech/api/util/GT_StructureUtility.java +++ b/src/main/java/gregtech/api/util/GT_StructureUtility.java @@ -249,17 +249,26 @@ public class GT_StructureUtility { Class<? extends IMetaTileEntity> clazz = aMetaId.apply(t); if (clazz == null) return REJECT; ItemStack taken = env.getSource() - .takeOne(is -> clazz.isInstance(GT_Item_Machines.getMetaTileEntity(is)), true); + .takeOne(is -> clazz.isInstance(GT_Item_Machines.getMetaTileEntity(is)), true); if (GT_Utility.isStackInvalid(taken)) { - env.getChatter().accept( - new ChatComponentTranslation( - "GT5U.autoplace.error.no_mte.class_name", - clazz.getSimpleName())); + env.getChatter() + .accept( + new ChatComponentTranslation( + "GT5U.autoplace.error.no_mte.class_name", + clazz.getSimpleName())); return REJECT; } - if (StructureUtility - .survivalPlaceBlock(taken, EXACT, null, true, world, x, y, z, env.getSource(), env.getActor()) - == ACCEPT) + if (StructureUtility.survivalPlaceBlock( + taken, + EXACT, + null, + true, + world, + x, + y, + z, + env.getSource(), + env.getActor()) == ACCEPT) return acceptType; return REJECT; } @@ -298,7 +307,9 @@ public class GT_StructureUtility { GT_Item_Machines item = (GT_Item_Machines) Item.getItemFromBlock(GregTech_API.sBlockMachines); int meta = aMetaId.applyAsInt(t); if (meta < 0) return BlocksToPlace.createEmpty(); - return BlocksToPlace.create(ItemStackPredicate.from(item).setMeta(meta)); + return BlocksToPlace.create( + ItemStackPredicate.from(item) + .setMeta(meta)); } @Override @@ -327,14 +338,27 @@ public class GT_StructureUtility { GT_Item_Machines item = (GT_Item_Machines) Item.getItemFromBlock(GregTech_API.sBlockMachines); int meta = aMetaId.applyAsInt(t); if (meta < 0) return REJECT; - ItemStack taken = env.getSource().takeOne(ItemStackPredicate.from(item).setMeta(meta), true); + ItemStack taken = env.getSource() + .takeOne( + ItemStackPredicate.from(item) + .setMeta(meta), + true); if (GT_Utility.isStackInvalid(taken)) { - env.getChatter().accept(new ChatComponentTranslation("GT5U.autoplace.error.no_mte.id", meta)); + env.getChatter() + .accept(new ChatComponentTranslation("GT5U.autoplace.error.no_mte.id", meta)); return REJECT; } - return StructureUtility - .survivalPlaceBlock(taken, EXACT, null, true, world, x, y, z, env.getSource(), env.getActor()) - == ACCEPT ? ACCEPT_STOP : REJECT; + return StructureUtility.survivalPlaceBlock( + taken, + EXACT, + null, + true, + world, + x, + y, + z, + env.getSource(), + env.getActor()) == ACCEPT ? ACCEPT_STOP : REJECT; } }; } @@ -382,8 +406,16 @@ public class GT_StructureUtility { public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger, IItemSource s, EntityPlayerMP actor, Consumer<IChatComponent> chatter) { if (check(t, world, x, y, z)) return SKIP; - return StructureUtility - .survivalPlaceBlock(placeCasing, placeCasingMeta, world, x, y, z, s, actor, chatter); + return StructureUtility.survivalPlaceBlock( + placeCasing, + placeCasingMeta, + world, + x, + y, + z, + s, + actor, + chatter); } }; } @@ -494,7 +526,8 @@ public class GT_StructureUtility { public static Predicate<ItemStack> filterByMTEClass(List<? extends Class<? extends IMetaTileEntity>> list) { return is -> { IMetaTileEntity tile = GT_Item_Machines.getMetaTileEntity(is); - return tile != null && list.stream().anyMatch(c -> c.isInstance(tile)); + return tile != null && list.stream() + .anyMatch(c -> c.isInstance(tile)); }; } diff --git a/src/main/java/gregtech/api/util/GT_Util.java b/src/main/java/gregtech/api/util/GT_Util.java index 6e203a2682..177b391f5d 100644 --- a/src/main/java/gregtech/api/util/GT_Util.java +++ b/src/main/java/gregtech/api/util/GT_Util.java @@ -38,17 +38,47 @@ public class GT_Util { for (Tuple t : aTags) { if (t.getSecond() == null) continue; - if (t.getSecond() instanceof Boolean) rNBT.setBoolean(t.getFirst().toString(), (Boolean) t.getSecond()); - else if (t.getSecond() instanceof Byte) rNBT.setByte(t.getFirst().toString(), (Byte) t.getSecond()); - else if (t.getSecond() instanceof Short) rNBT.setShort(t.getFirst().toString(), (Short) t.getSecond()); - else if (t.getSecond() instanceof Integer) - rNBT.setInteger(t.getFirst().toString(), (Integer) t.getSecond()); - else if (t.getSecond() instanceof Long) rNBT.setLong(t.getFirst().toString(), (Long) t.getSecond()); - else if (t.getSecond() instanceof Float) rNBT.setFloat(t.getFirst().toString(), (Float) t.getSecond()); - else if (t.getSecond() instanceof Double) rNBT.setDouble(t.getFirst().toString(), (Double) t.getSecond()); - else if (t.getSecond() instanceof String) rNBT.setString(t.getFirst().toString(), (String) t.getSecond()); - else if (t.getSecond() instanceof NBTBase) rNBT.setTag(t.getFirst().toString(), (NBTBase) t.getSecond()); - else rNBT.setString(t.getFirst().toString(), t.getSecond().toString()); + if (t.getSecond() instanceof Boolean) rNBT.setBoolean( + t.getFirst() + .toString(), + (Boolean) t.getSecond()); + else if (t.getSecond() instanceof Byte) rNBT.setByte( + t.getFirst() + .toString(), + (Byte) t.getSecond()); + else if (t.getSecond() instanceof Short) rNBT.setShort( + t.getFirst() + .toString(), + (Short) t.getSecond()); + else if (t.getSecond() instanceof Integer) rNBT.setInteger( + t.getFirst() + .toString(), + (Integer) t.getSecond()); + else if (t.getSecond() instanceof Long) rNBT.setLong( + t.getFirst() + .toString(), + (Long) t.getSecond()); + else if (t.getSecond() instanceof Float) rNBT.setFloat( + t.getFirst() + .toString(), + (Float) t.getSecond()); + else if (t.getSecond() instanceof Double) rNBT.setDouble( + t.getFirst() + .toString(), + (Double) t.getSecond()); + else if (t.getSecond() instanceof String) rNBT.setString( + t.getFirst() + .toString(), + (String) t.getSecond()); + else if (t.getSecond() instanceof NBTBase) rNBT.setTag( + t.getFirst() + .toString(), + (NBTBase) t.getSecond()); + else rNBT.setString( + t.getFirst() + .toString(), + t.getSecond() + .toString()); } return rNBT; diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 32ccca715a..859c1ab84b 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -169,8 +169,9 @@ public class GT_Utility { // 1 is the magic index to get the cobblestone block. // See: GT_Block_Stones.java, GT_Block_Granites.java - Function<Materials, Supplier<ItemStack>> materialToCobble = m -> Suppliers - .memoize(() -> GT_OreDictUnificator.getOres(OrePrefixes.stone, m).get(1))::get; + Function<Materials, Supplier<ItemStack>> materialToCobble = m -> Suppliers.memoize( + () -> GT_OreDictUnificator.getOres(OrePrefixes.stone, m) + .get(1))::get; sOreToCobble.put(OrePrefixes.oreBlackgranite, materialToCobble.apply(Materials.GraniteBlack)); sOreToCobble.put(OrePrefixes.oreRedgranite, materialToCobble.apply(Materials.GraniteRed)); sOreToCobble.put(OrePrefixes.oreMarble, materialToCobble.apply(Materials.Marble)); @@ -191,7 +192,8 @@ public class GT_Utility { public static Field getPublicField(Object aObject, String aField) { Field rField = null; try { - rField = aObject.getClass().getDeclaredField(aField); + rField = aObject.getClass() + .getDeclaredField(aField); } catch (Throwable e) { /* Do nothing */ } @@ -201,7 +203,8 @@ public class GT_Utility { public static Field getField(Object aObject, String aField) { Field rField = null; try { - rField = aObject.getClass().getDeclaredField(aField); + rField = aObject.getClass() + .getDeclaredField(aField); rField.setAccessible(true); } catch (Throwable e) { /* Do nothing */ @@ -234,7 +237,8 @@ public class GT_Utility { public static Method getMethod(Object aObject, String aMethod, Class<?>... aParameterTypes) { Method rMethod = null; try { - rMethod = aObject.getClass().getMethod(aMethod, aParameterTypes); + rMethod = aObject.getClass() + .getMethod(aMethod, aParameterTypes); rMethod.setAccessible(true); } catch (Throwable e) { /* Do nothing */ @@ -245,8 +249,10 @@ public class GT_Utility { public static Field getField(Object aObject, String aField, boolean aPrivate, boolean aLogErrors) { try { Field tField = (aObject instanceof Class) ? ((Class) aObject).getDeclaredField(aField) - : (aObject instanceof String) ? Class.forName((String) aObject).getDeclaredField(aField) - : aObject.getClass().getDeclaredField(aField); + : (aObject instanceof String) ? Class.forName((String) aObject) + .getDeclaredField(aField) + : aObject.getClass() + .getDeclaredField(aField); if (aPrivate) tField.setAccessible(true); return tField; } catch (Throwable e) { @@ -258,8 +264,10 @@ public class GT_Utility { public static Object getFieldContent(Object aObject, String aField, boolean aPrivate, boolean aLogErrors) { try { Field tField = (aObject instanceof Class) ? ((Class) aObject).getDeclaredField(aField) - : (aObject instanceof String) ? Class.forName((String) aObject).getDeclaredField(aField) - : aObject.getClass().getDeclaredField(aField); + : (aObject instanceof String) ? Class.forName((String) aObject) + .getDeclaredField(aField) + : aObject.getClass() + .getDeclaredField(aField); if (aPrivate) tField.setAccessible(true); return tField.get(aObject instanceof Class || aObject instanceof String ? null : aObject); } catch (Throwable e) { @@ -299,7 +307,8 @@ public class GT_Utility { } Method tMethod = (aObject instanceof Class) ? ((Class) aObject).getMethod(aMethod, tParameterTypes) - : aObject.getClass().getMethod(aMethod, tParameterTypes); + : aObject.getClass() + .getMethod(aMethod, tParameterTypes); if (aPrivate) tMethod.setAccessible(true); return tMethod.invoke(aObject, aParameters); } catch (Throwable e) { @@ -346,8 +355,9 @@ public class GT_Utility { } public static String capitalizeString(String aString) { - if (aString != null && aString.length() > 0) - return aString.substring(0, 1).toUpperCase() + aString.substring(1); + if (aString != null && aString.length() > 0) return aString.substring(0, 1) + .toUpperCase() + + aString.substring(1); return E; } @@ -374,7 +384,12 @@ public class GT_Utility { public static String getClassName(Object aObject) { if (aObject == null) return "null"; - return aObject.getClass().getName().substring(aObject.getClass().getName().lastIndexOf(".") + 1); + return aObject.getClass() + .getName() + .substring( + aObject.getClass() + .getName() + .lastIndexOf(".") + 1); } public static void removePotion(EntityLivingBase aPlayer, int aPotionIndex) { @@ -434,7 +449,9 @@ public class GT_Utility { } public static byte getOppositeSide(int aSide) { - return (byte) ForgeDirection.getOrientation(aSide).getOpposite().ordinal(); + return (byte) ForgeDirection.getOrientation(aSide) + .getOpposite() + .ordinal(); } public static byte getTier(long l) { @@ -489,8 +506,8 @@ public class GT_Utility { checkAvailabilities(); if (TE_CHECK && aTileEntity instanceof IItemDuct) return true; if (BC_CHECK && aTileEntity instanceof buildcraft.api.transport.IPipeTile) - return ((buildcraft.api.transport.IPipeTile) aTileEntity) - .isPipeConnected(ForgeDirection.getOrientation(aSide)); + return ((buildcraft.api.transport.IPipeTile) aTileEntity).isPipeConnected( + ForgeDirection.getOrientation(aSide)); return GregTech_API.mTranslocator && aTileEntity instanceof codechicken.translocator.TileItemTranslocator; } @@ -548,8 +565,9 @@ public class GT_Utility { aTileEntity1.getStackInSlot(aGrabSlot).stackSize, Math.min(aMaxMoveAtOnce, aMaxTargetStackSize)), aTileEntity1.getStackInSlot(aGrabSlot)); - ItemStack rStack = ((IItemDuct) aTileEntity2) - .insertItem(ForgeDirection.getOrientation(aPutTo), copyOrNull(tStack)); + ItemStack rStack = ((IItemDuct) aTileEntity2).insertItem( + ForgeDirection.getOrientation(aPutTo), + copyOrNull(tStack)); byte tMovedItemCount = (byte) (tStack.stackSize - (rStack == null ? 0 : rStack.stackSize)); if (tMovedItemCount >= 1 /* Math.max(aMinMoveAtOnce, aMinTargetStackSize) */) { @@ -580,14 +598,15 @@ public class GT_Utility { aTileEntity1.getStackInSlot(aGrabSlot).stackSize, Math.min(aMaxMoveAtOnce, aMaxTargetStackSize)), aTileEntity1.getStackInSlot(aGrabSlot)); - byte tMovedItemCount = (byte) ((buildcraft.api.transport.IPipeTile) aTileEntity2) - .injectItem(copyOrNull(tStack), false, ForgeDirection.getOrientation(aPutTo)); + byte tMovedItemCount = (byte) ((buildcraft.api.transport.IPipeTile) aTileEntity2).injectItem( + copyOrNull(tStack), + false, + ForgeDirection.getOrientation(aPutTo)); if (tMovedItemCount >= Math.max(aMinMoveAtOnce, aMinTargetStackSize)) { - tMovedItemCount = (byte) (((buildcraft.api.transport.IPipeTile) aTileEntity2) - .injectItem( - copyAmount(tMovedItemCount, tStack), - true, - ForgeDirection.getOrientation(aPutTo))); + tMovedItemCount = (byte) (((buildcraft.api.transport.IPipeTile) aTileEntity2).injectItem( + copyAmount(tMovedItemCount, tStack), + true, + ForgeDirection.getOrientation(aPutTo))); aTileEntity1.decrStackSize(aGrabSlot, tMovedItemCount); aTileEntity1.markDirty(); return tMovedItemCount; @@ -628,7 +647,8 @@ public class GT_Utility { tZ + 0.5, tStack); tEntity.motionX = tEntity.motionY = tEntity.motionZ = 0; - ((TileEntity) aTileEntity1).getWorldObj().spawnEntityInWorld(tEntity); + ((TileEntity) aTileEntity1).getWorldObj() + .spawnEntityInWorld(tEntity); aTileEntity1.decrStackSize(aGrabSlot, tStack.stackSize); aTileEntity1.markDirty(); return (byte) tStack.stackSize; @@ -669,8 +689,9 @@ public class GT_Utility { Math.min( tStack2 == null ? Integer.MAX_VALUE : tStack2.getMaxStackSize(), aTileEntity2.getInventoryStackLimit()))); - tStack3.stackSize = Math - .min(tStack3.stackSize, aMaxTargetStackSize - (tStack2 == null ? 0 : tStack2.stackSize)); + tStack3.stackSize = Math.min( + tStack3.stackSize, + aMaxTargetStackSize - (tStack2 == null ? 0 : tStack2.stackSize)); if (tStack3.stackSize > aMaxMoveAtOnce) tStack3.stackSize = aMaxMoveAtOnce; if (tStack3.stackSize + (tStack2 == null ? 0 : tStack2.stackSize) >= Math.min(tStack3.getMaxStackSize(), aMinTargetStackSize) @@ -831,7 +852,8 @@ public class GT_Utility { (Math.min(s.getMaxStackSize(), tPutInventory.getInventoryStackLimit()) - s.stackSize), Integer::sum); - tPutItemStacks.computeIfAbsent(sID, k -> new ArrayList<>()).add(s); + tPutItemStacks.computeIfAbsent(sID, k -> new ArrayList<>()) + .add(s); } } @@ -931,15 +953,16 @@ public class GT_Utility { if (s != null) { // s might be null if tPutInventory is very special, e.g. infinity chest // if s is null, we will not mark this slot as target candidate for anything - final int spare = Math - .min(s.getMaxStackSize(), tPutInventory.getInventoryStackLimit()) - - s.stackSize; + final int spare = Math.min( + s.getMaxStackSize(), + tPutInventory.getInventoryStackLimit()) - s.stackSize; if (spare > 0) { final ItemId ssID = ItemId.createNoCopy(s); // add back to spare space count tPutItems.merge(ssID, spare, Integer::sum); // add to partially filled slot list - tPutItemStacks.computeIfAbsent(ssID, k -> new ArrayList<>()).add(s); + tPutItemStacks.computeIfAbsent(ssID, k -> new ArrayList<>()) + .add(s); } // this is no longer free tPutFreeSlots.remove(i); @@ -1653,9 +1676,12 @@ public class GT_Utility { public static boolean areStacksOrToolsEqual(ItemStack aStack1, ItemStack aStack2) { if (aStack1 != null && aStack2 != null && aStack1.getItem() == aStack2.getItem()) { - if (aStack1.getItem().isDamageable()) return true; + if (aStack1.getItem() + .isDamageable()) + return true; return ((aStack1.getTagCompound() == null) == (aStack2.getTagCompound() == null)) - && (aStack1.getTagCompound() == null || aStack1.getTagCompound().equals(aStack2.getTagCompound())) + && (aStack1.getTagCompound() == null || aStack1.getTagCompound() + .equals(aStack2.getTagCompound())) && (Items.feather.getDamage(aStack1) == Items.feather.getDamage(aStack2) || Items.feather.getDamage(aStack1) == W || Items.feather.getDamage(aStack2) == W); @@ -1682,8 +1708,8 @@ public class GT_Utility { return aStack1 != null && aStack2 != null && aStack1.getItem() == aStack2.getItem() && (aIgnoreNBT || (((aStack1.getTagCompound() == null) == (aStack2.getTagCompound() == null)) - && (aStack1.getTagCompound() == null - || aStack1.getTagCompound().equals(aStack2.getTagCompound())))) + && (aStack1.getTagCompound() == null || aStack1.getTagCompound() + .equals(aStack2.getTagCompound())))) && (Items.feather.getDamage(aStack1) == Items.feather.getDamage(aStack2) || Items.feather.getDamage(aStack1) == W || Items.feather.getDamage(aStack2) == W); @@ -1728,8 +1754,9 @@ public class GT_Utility { public static String getFluidName(Fluid aFluid, boolean aLocalized) { if (aFluid == null) return E; String rName = aLocalized ? aFluid.getLocalizedName(new FluidStack(aFluid, 0)) : aFluid.getUnlocalizedName(); - if (rName.contains("fluid.") || rName.contains("tile.")) - return capitalizeString(rName.replaceAll("fluid.", E).replaceAll("tile.", E)); + if (rName.contains("fluid.") || rName.contains("tile.")) return capitalizeString( + rName.replaceAll("fluid.", E) + .replaceAll("tile.", E)); return rName; } @@ -1745,8 +1772,8 @@ public class GT_Utility { sFluidUnlocalizedNameToFluid.clear(); for (FluidContainerData tData : sFluidContainerList) { sFilledContainerToData.put(new GT_ItemStack(tData.filledContainer), tData); - Map<Fluid, FluidContainerData> tFluidToContainer = sEmptyContainerToFluidToData - .get(new GT_ItemStack(tData.emptyContainer)); + Map<Fluid, FluidContainerData> tFluidToContainer = sEmptyContainerToFluidToData.get( + new GT_ItemStack(tData.emptyContainer)); List<ItemStack> tContainers = sFluidToContainers.get(tData.fluid.getFluid()); if (tFluidToContainer == null) { sEmptyContainerToFluidToData.put( @@ -1761,7 +1788,8 @@ public class GT_Utility { sFluidToContainers.put(tData.fluid.getFluid(), tContainers); } else tContainers.add(tData.filledContainer); } - for (Fluid tFluid : FluidRegistry.getRegisteredFluids().values()) { + for (Fluid tFluid : FluidRegistry.getRegisteredFluids() + .values()) { sFluidUnlocalizedNameToFluid.put(tFluid.getUnlocalizedName(), tFluid); } } @@ -1773,12 +1801,13 @@ public class GT_Utility { public static void addFluidContainerData(FluidContainerData aData) { sFluidContainerList.add(aData); sFilledContainerToData.put(new GT_ItemStack(aData.filledContainer), aData); - Map<Fluid, FluidContainerData> tFluidToContainer = sEmptyContainerToFluidToData - .get(new GT_ItemStack(aData.emptyContainer)); + Map<Fluid, FluidContainerData> tFluidToContainer = sEmptyContainerToFluidToData.get( + new GT_ItemStack(aData.emptyContainer)); List<ItemStack> tContainers = sFluidToContainers.get(aData.fluid.getFluid()); if (tFluidToContainer == null) { - sEmptyContainerToFluidToData - .put(new GT_ItemStack(aData.emptyContainer), tFluidToContainer = new /* Concurrent */ HashMap<>()); + sEmptyContainerToFluidToData.put( + new GT_ItemStack(aData.emptyContainer), + tFluidToContainer = new /* Concurrent */ HashMap<>()); GregTech_API.sFluidMappings.add(tFluidToContainer); } tFluidToContainer.put(aData.fluid.getFluid(), aData); @@ -1811,8 +1840,10 @@ public class GT_Utility { if (aCheckIFluidContainerItems && aStack.getItem() instanceof IFluidContainerItem && ((IFluidContainerItem) aStack.getItem()).getFluid(aStack) == null && ((IFluidContainerItem) aStack.getItem()).getCapacity(aStack) <= aFluid.amount) { - if (aRemoveFluidDirectly) aFluid.amount -= ((IFluidContainerItem) aStack.getItem()) - .fill(aStack = copyAmount(1, aStack), aFluid, true); + if (aRemoveFluidDirectly) aFluid.amount -= ((IFluidContainerItem) aStack.getItem()).fill( + aStack = copyAmount(1, aStack), + aFluid, + true); else((IFluidContainerItem) aStack.getItem()).fill(aStack = copyAmount(1, aStack), aFluid, true); return aStack; } @@ -1841,15 +1872,22 @@ public class GT_Utility { if (aFluid == null || aFluid.getFluid() == null) return null; int tmp = 0; try { - tmp = aFluid.getFluid().getID(); + tmp = aFluid.getFluid() + .getID(); } catch (Exception e) { System.err.println(e); } ItemStack rStack = ItemList.Display_Fluid.getWithDamage(1, tmp); NBTTagCompound tNBT = new NBTTagCompound(); tNBT.setLong("mFluidDisplayAmount", aUseStackSize ? aFluid.amount : 0); - tNBT.setLong("mFluidDisplayHeat", aFluid.getFluid().getTemperature(aFluid)); - tNBT.setBoolean("mFluidState", aFluid.getFluid().isGaseous(aFluid)); + tNBT.setLong( + "mFluidDisplayHeat", + aFluid.getFluid() + .getTemperature(aFluid)); + tNBT.setBoolean( + "mFluidState", + aFluid.getFluid() + .isGaseous(aFluid)); tNBT.setBoolean("mHideStackSize", aHideStackSize); try { tNBT.setString("mFluidMaterialName", FLUID_MAP.get(aFluid.getFluid()).mName); @@ -1862,16 +1900,21 @@ public class GT_Utility { if (!isStackValid(aDisplayStack) || aDisplayStack.getItem() != ItemList.Display_Fluid.getItem() || !aDisplayStack.hasTagCompound()) return null; - Fluid tFluid = FluidRegistry.getFluid(ItemList.Display_Fluid.getItem().getDamage(aDisplayStack)); - return new FluidStack(tFluid, (int) aDisplayStack.getTagCompound().getLong("mFluidDisplayAmount")); + Fluid tFluid = FluidRegistry.getFluid( + ItemList.Display_Fluid.getItem() + .getDamage(aDisplayStack)); + return new FluidStack( + tFluid, + (int) aDisplayStack.getTagCompound() + .getLong("mFluidDisplayAmount")); } public static boolean containsFluid(ItemStack aStack, FluidStack aFluid, boolean aCheckIFluidContainerItems) { if (isStackInvalid(aStack) || aFluid == null) return false; if (aCheckIFluidContainerItems && aStack.getItem() instanceof IFluidContainerItem && ((IFluidContainerItem) aStack.getItem()).getCapacity(aStack) > 0) - return aFluid - .isFluidEqual(((IFluidContainerItem) aStack.getItem()).getFluid(aStack = copyAmount(1, aStack))); + return aFluid.isFluidEqual( + ((IFluidContainerItem) aStack.getItem()).getFluid(aStack = copyAmount(1, aStack))); FluidContainerData tData = sFilledContainerToData.get(new GT_ItemStack(aStack)); return tData != null && tData.fluid.isFluidEqual(aFluid); } @@ -1906,7 +1949,10 @@ public class GT_Utility { */ public static ItemStack getContainerItem(ItemStack aStack, boolean aCheckIFluidContainerItems) { if (isStackInvalid(aStack)) return null; - if (aStack.getItem().hasContainerItem(aStack)) return aStack.getItem().getContainerItem(aStack); + if (aStack.getItem() + .hasContainerItem(aStack)) + return aStack.getItem() + .getContainerItem(aStack); /** * These are all special Cases, in which it is intended to have only GT Blocks outputting those Container Items */ @@ -1945,12 +1991,13 @@ public class GT_Utility { if ((isStackInvalid(aInput) && isStackInvalid(aOutput) && isStackInvalid(aContainer)) || aRecipeList == null) return false; boolean rReturn = false; - Iterator<Map.Entry<ic2.api.recipe.ICannerBottleRecipeManager.Input, RecipeOutput>> tIterator = aRecipeList - .entrySet().iterator(); + Iterator<Map.Entry<ic2.api.recipe.ICannerBottleRecipeManager.Input, RecipeOutput>> tIterator = aRecipeList.entrySet() + .iterator(); aOutput = GT_OreDictUnificator.get(aOutput); while (tIterator.hasNext()) { Map.Entry<ic2.api.recipe.ICannerBottleRecipeManager.Input, RecipeOutput> tEntry = tIterator.next(); - if (aInput == null || tEntry.getKey().matches(aContainer, aInput)) { + if (aInput == null || tEntry.getKey() + .matches(aContainer, aInput)) { List<ItemStack> tList = tEntry.getValue().items; if (tList != null) for (ItemStack tOutput : tList) if (aOutput == null || areStacksEqual(GT_OreDictUnificator.get(tOutput), aOutput)) { @@ -1967,11 +2014,13 @@ public class GT_Utility { Map<IRecipeInput, RecipeOutput> aRecipeList, ItemStack aOutput) { if ((isStackInvalid(aInput) && isStackInvalid(aOutput)) || aRecipeList == null) return false; boolean rReturn = false; - Iterator<Map.Entry<IRecipeInput, RecipeOutput>> tIterator = aRecipeList.entrySet().iterator(); + Iterator<Map.Entry<IRecipeInput, RecipeOutput>> tIterator = aRecipeList.entrySet() + .iterator(); aOutput = GT_OreDictUnificator.get(aOutput); while (tIterator.hasNext()) { Map.Entry<IRecipeInput, RecipeOutput> tEntry = tIterator.next(); - if (aInput == null || tEntry.getKey().matches(aInput)) { + if (aInput == null || tEntry.getKey() + .matches(aInput)) { List<ItemStack> tList = tEntry.getValue().items; if (tList != null) for (ItemStack tOutput : tList) if (aOutput == null || areStacksEqual(GT_OreDictUnificator.get(tOutput), aOutput)) { @@ -1987,20 +2036,32 @@ public class GT_Utility { public static synchronized void bulkRemoveSimpleIC2MachineRecipe(Map<ItemStack, ItemStack> toRemove, Map<IRecipeInput, RecipeOutput> aRecipeList) { if (aRecipeList == null || aRecipeList.isEmpty()) return; - toRemove.entrySet().removeIf(aEntry -> (isStackInvalid(aEntry.getKey()) && isStackInvalid(aEntry.getValue()))); - final Map<ItemStack, ItemStack> finalToRemove = Maps - .transformValues(toRemove, GT_OreDictUnificator::get_nocopy); - - aRecipeList.entrySet().removeIf(tEntry -> finalToRemove.entrySet().stream().anyMatch(aEntry -> { - final ItemStack aInput = aEntry.getKey(), aOutput = aEntry.getValue(); - final List<ItemStack> tList = tEntry.getValue().items; - - if (tList == null) return false; - if (aInput != null && !tEntry.getKey().matches(aInput)) return false; - - return tList.stream().anyMatch( - tOutput -> (aOutput == null || areStacksEqual(GT_OreDictUnificator.get(tOutput), aOutput))); - })); + toRemove.entrySet() + .removeIf(aEntry -> (isStackInvalid(aEntry.getKey()) && isStackInvalid(aEntry.getValue()))); + final Map<ItemStack, ItemStack> finalToRemove = Maps.transformValues( + toRemove, + GT_OreDictUnificator::get_nocopy); + + aRecipeList.entrySet() + .removeIf( + tEntry -> finalToRemove.entrySet() + .stream() + .anyMatch(aEntry -> { + final ItemStack aInput = aEntry.getKey(), + aOutput = aEntry.getValue(); + final List<ItemStack> tList = tEntry.getValue().items; + + if (tList == null) return false; + if (aInput != null && !tEntry.getKey() + .matches(aInput)) + return false; + + return tList.stream() + .anyMatch( + tOutput -> (aOutput == null || areStacksEqual( + GT_OreDictUnificator.get(tOutput), + aOutput))); + })); } public static boolean addSimpleIC2MachineRecipe(ItemStack aInput, Map<IRecipeInput, RecipeOutput> aRecipeList, @@ -2016,10 +2077,14 @@ public class GT_Utility { ItemStack[] tStack = GT_OreDictUnificator.getStackArray(true, aOutput); if (tStack.length > 0 && areStacksEqual(aInput, tStack[0])) return false; if (tOreName != null) { - if (tOreName.toString().equals("dustAsh") && tStack[0].getUnlocalizedName().equals("tile.volcanicAsh")) + if (tOreName.toString() + .equals("dustAsh") + && tStack[0].getUnlocalizedName() + .equals("tile.volcanicAsh")) return false; - aRecipeList - .put(new RecipeInputOreDict(tOreName.toString(), aInput.stackSize), new RecipeOutput(aNBT, tStack)); + aRecipeList.put( + new RecipeInputOreDict(tOreName.toString(), aInput.stackSize), + new RecipeOutput(aNBT, tStack)); } else { aRecipeList.put( new RecipeInputItemStack(copyOrNull(aInput), aInput.stackSize), @@ -2051,8 +2116,9 @@ public class GT_Utility { tNBT.setString("author", aAuthor); NBTTagList tNBTList = new NBTTagList(); for (byte i = 0; i < aPages.length; i++) { - aPages[i] = GT_LanguageManager - .addStringLocalization("Book." + aTitle + ".Page" + ((i < 10) ? "0" + i : i), aPages[i]); + aPages[i] = GT_LanguageManager.addStringLocalization( + "Book." + aTitle + ".Page" + ((i < 10) ? "0" + i : i), + aPages[i]); if (i < 48) { if (aPages[i].length() < 256) tNBTList.appendTag(new NBTTagString(aPages[i])); else GT_Log.err.println("WARNING: String for written Book too long! -> " + aPages[i]); @@ -2160,7 +2226,10 @@ public class GT_Utility { public static boolean doSoundAtClient(ResourceLocation aSoundResourceLocation, int aTimeUntilNextSound, float aSoundStrength, float aSoundModulation, double aX, double aY, double aZ) { - if (!FMLCommonHandler.instance().getEffectiveSide().isClient() || GT.getThePlayer() == null + if (!FMLCommonHandler.instance() + .getEffectiveSide() + .isClient() + || GT.getThePlayer() == null || !GT.getThePlayer().worldObj.isRemote) return false; if (GregTech_API.sMultiThreadedSounds) new Thread( @@ -2328,11 +2397,13 @@ public class GT_Utility { } public static boolean isStringValid(Object aString) { - return aString != null && !aString.toString().isEmpty(); + return aString != null && !aString.toString() + .isEmpty(); } public static boolean isStringInvalid(Object aString) { - return aString == null || aString.toString().isEmpty(); + return aString == null || aString.toString() + .isEmpty(); } public static boolean isStackValid(Object aStack) { @@ -2360,31 +2431,49 @@ public class GT_Utility { } public static boolean isOpaqueBlock(World aWorld, int aX, int aY, int aZ) { - return aWorld.getBlock(aX, aY, aZ).isOpaqueCube(); + return aWorld.getBlock(aX, aY, aZ) + .isOpaqueCube(); } public static boolean isBlockAir(World aWorld, int aX, int aY, int aZ) { - return aWorld.getBlock(aX, aY, aZ).isAir(aWorld, aX, aY, aZ); + return aWorld.getBlock(aX, aY, aZ) + .isAir(aWorld, aX, aY, aZ); } public static boolean hasBlockHitBox(World aWorld, int aX, int aY, int aZ) { - return aWorld.getBlock(aX, aY, aZ).getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ) != null; + return aWorld.getBlock(aX, aY, aZ) + .getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ) + != null; } public static void setCoordsOnFire(World aWorld, int aX, int aY, int aZ, boolean aReplaceCenter) { - if (aReplaceCenter) if (aWorld.getBlock(aX, aY, aZ).getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ) == null) + if (aReplaceCenter) if (aWorld.getBlock(aX, aY, aZ) + .getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ) + == null) aWorld.setBlock(aX, aY, aZ, Blocks.fire); - if (aWorld.getBlock(aX + 1, aY, aZ).getCollisionBoundingBoxFromPool(aWorld, aX + 1, aY, aZ) == null) + if (aWorld.getBlock(aX + 1, aY, aZ) + .getCollisionBoundingBoxFromPool(aWorld, aX + 1, aY, aZ) + == null) aWorld.setBlock(aX + 1, aY, aZ, Blocks.fire); - if (aWorld.getBlock(aX - 1, aY, aZ).getCollisionBoundingBoxFromPool(aWorld, aX - 1, aY, aZ) == null) + if (aWorld.getBlock(aX - 1, aY, aZ) + .getCollisionBoundingBoxFromPool(aWorld, aX - 1, aY, aZ) + == null) aWorld.setBlock(aX - 1, aY, aZ, Blocks.fire); - if (aWorld.getBlock(aX, aY + 1, aZ).getCollisionBoundingBoxFromPool(aWorld, aX, aY + 1, aZ) == null) + if (aWorld.getBlock(aX, aY + 1, aZ) + .getCollisionBoundingBoxFromPool(aWorld, aX, aY + 1, aZ) + == null) aWorld.setBlock(aX, aY + 1, aZ, Blocks.fire); - if (aWorld.getBlock(aX, aY - 1, aZ).getCollisionBoundingBoxFromPool(aWorld, aX, aY - 1, aZ) == null) + if (aWorld.getBlock(aX, aY - 1, aZ) + .getCollisionBoundingBoxFromPool(aWorld, aX, aY - 1, aZ) + == null) aWorld.setBlock(aX, aY - 1, aZ, Blocks.fire); - if (aWorld.getBlock(aX, aY, aZ + 1).getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ + 1) == null) + if (aWorld.getBlock(aX, aY, aZ + 1) + .getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ + 1) + == null) aWorld.setBlock(aX, aY, aZ + 1, Blocks.fire); - if (aWorld.getBlock(aX, aY, aZ - 1).getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ - 1) == null) + if (aWorld.getBlock(aX, aY, aZ - 1) + .getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ - 1) + == null) aWorld.setBlock(aX, aY, aZ - 1, Blocks.fire); } @@ -2955,8 +3044,10 @@ public class GT_Utility { } public static <X, Y extends Comparable<Y>> LinkedHashMap<X, Y> sortMapByValuesAcending(Map<X, Y> map) { - return map.entrySet().stream().sorted(Entry.comparingByValue()) - .collect(CollectorUtils.entriesToMap(LinkedHashMap::new)); + return map.entrySet() + .stream() + .sorted(Entry.comparingByValue()) + .collect(CollectorUtils.entriesToMap(LinkedHashMap::new)); } /** @@ -2965,7 +3056,8 @@ public class GT_Utility { public static <X, Y extends Comparable> LinkedHashMap<X, Y> sortMapByValuesDescending(Map<X, Y> aMap) { List<Map.Entry<X, Y>> tEntrySet = new LinkedList<>(aMap.entrySet()); tEntrySet.sort((aValue1, aValue2) -> { - return aValue2.getValue().compareTo(aValue1.getValue()); // FB: RV - RV_NEGATING_RESULT_OF_COMPARETO + return aValue2.getValue() + .compareTo(aValue1.getValue()); // FB: RV - RV_NEGATING_RESULT_OF_COMPARETO }); LinkedHashMap<X, Y> rMap = new LinkedHashMap<>(); for (Map.Entry<X, Y> tEntry : tEntrySet) rMap.put(tEntry.getKey(), tEntry.getValue()); @@ -3009,8 +3101,9 @@ public class GT_Utility { if (entity.riddenByEntity != null) entity.riddenByEntity.mountEntity(null); World startWorld = entity.worldObj; - World destinationWorld = FMLCommonHandler.instance().getMinecraftServerInstance() - .worldServerForDimension(aDimension); + World destinationWorld = FMLCommonHandler.instance() + .getMinecraftServerInstance() + .worldServerForDimension(aDimension); if (destinationWorld == null) { return false; @@ -3028,16 +3121,20 @@ public class GT_Utility { new S07PacketRespawn( player.dimension, player.worldObj.difficultySetting, - destinationWorld.getWorldInfo().getTerrainType(), + destinationWorld.getWorldInfo() + .getTerrainType(), player.theItemInWorldManager.getGameType())); - ((WorldServer) startWorld).getPlayerManager().removePlayer(player); + ((WorldServer) startWorld).getPlayerManager() + .removePlayer(player); startWorld.playerEntities.remove(player); startWorld.updateAllPlayersSleepingFlag(); int i = entity.chunkCoordX; int j = entity.chunkCoordZ; - if ((entity.addedToChunk) && (startWorld.getChunkProvider().chunkExists(i, j))) { - startWorld.getChunkFromChunkCoords(i, j).removeEntity(entity); + if ((entity.addedToChunk) && (startWorld.getChunkProvider() + .chunkExists(i, j))) { + startWorld.getChunkFromChunkCoords(i, j) + .removeEntity(entity); startWorld.getChunkFromChunkCoords(i, j).isModified = true; } startWorld.loadedEntityList.remove(entity); @@ -3073,7 +3170,8 @@ public class GT_Utility { if ((entity instanceof EntityPlayerMP)) { EntityPlayerMP player = (EntityPlayerMP) entity; if (interDimensional) { - player.mcServer.getConfigurationManager().func_72375_a(player, (WorldServer) destinationWorld); + player.mcServer.getConfigurationManager() + .func_72375_a(player, (WorldServer) destinationWorld); } player.playerNetServerHandler.setPlayerLocation(aX, aY, aZ, player.rotationYaw, player.rotationPitch); } @@ -3084,8 +3182,9 @@ public class GT_Utility { EntityPlayerMP player = (EntityPlayerMP) entity; player.theItemInWorldManager.setWorld((WorldServer) destinationWorld); player.mcServer.getConfigurationManager() - .updateTimeAndWeatherForPlayer(player, (WorldServer) destinationWorld); - player.mcServer.getConfigurationManager().syncPlayerInventory(player); + .updateTimeAndWeatherForPlayer(player, (WorldServer) destinationWorld); + player.mcServer.getConfigurationManager() + .syncPlayerInventory(player); for (PotionEffect potionEffect : (Iterable<PotionEffect>) player.getActivePotionEffects()) { player.playerNetServerHandler.sendPacket(new S1DPacketEntityEffect(player.getEntityId(), potionEffect)); @@ -3093,10 +3192,11 @@ public class GT_Utility { player.playerNetServerHandler.sendPacket( new S1FPacketSetExperience(player.experience, player.experienceTotal, player.experienceLevel)); - FMLCommonHandler.instance().firePlayerChangedDimensionEvent( - player, - startWorld.provider.dimensionId, - destinationWorld.provider.dimensionId); + FMLCommonHandler.instance() + .firePlayerChangedDimensionEvent( + player, + startWorld.provider.dimensionId, + destinationWorld.provider.dimensionId); } entity.setLocationAndAngles(aX, aY, aZ, entity.rotationYaw, entity.rotationPitch); @@ -3181,8 +3281,8 @@ public class GT_Utility { try { if (tTileEntity instanceof IFluidHandler) { rEUAmount += 500; - final FluidTankInfo[] tTanks = ((IFluidHandler) tTileEntity) - .getTankInfo(ForgeDirection.getOrientation(aSide)); + final FluidTankInfo[] tTanks = ((IFluidHandler) tTileEntity).getTankInfo( + ForgeDirection.getOrientation(aSide)); if (tTanks != null) for (byte i = 0; i < tTanks.length; i++) { tList.add( GT_Utility.trans("167", "Tank ") + i @@ -3335,7 +3435,7 @@ public class GT_Utility { if (tTileEntity instanceof ICoverable) { rEUAmount += 300; final String tString = ((ICoverable) tTileEntity).getCoverInfoAtSide((byte) aSide) - .getBehaviorDescription(); + .getBehaviorDescription(); if (tString != null && !tString.equals(E)) tList.add(tString); } } catch (Throwable e) { @@ -3406,7 +3506,8 @@ public class GT_Utility { if (crop.getScanLevel() < 4) crop.setScanLevel((byte) 4); if (crop.getCrop() != null) { tList.add( - GT_Utility.trans("187", "Type -- Crop-Name: ") + crop.getCrop().name() + GT_Utility.trans("187", "Type -- Crop-Name: ") + crop.getCrop() + .name() + GT_Utility.trans("188", " Growth: ") + crop.getGrowth() + GT_Utility.trans("189", " Gain: ") @@ -3430,12 +3531,16 @@ public class GT_Utility { + crop.getAirQuality()); if (crop.getCrop() != null) { final StringBuilder tStringB = new StringBuilder(); - for (String tAttribute : crop.getCrop().attributes()) { - tStringB.append(", ").append(tAttribute); + for (String tAttribute : crop.getCrop() + .attributes()) { + tStringB.append(", ") + .append(tAttribute); } final String tString = tStringB.toString(); tList.add(GT_Utility.trans("198", "Attributes:") + tString.replaceFirst(",", E)); - tList.add(GT_Utility.trans("199", "Discovered by: ") + crop.getCrop().discoveredBy()); + tList.add( + GT_Utility.trans("199", "Discovered by: ") + crop.getCrop() + .discoveredBy()); } } } catch (Throwable e) { @@ -3677,7 +3782,8 @@ public class GT_Utility { } public static float getBlockHardnessAt(World aWorld, int aX, int aY, int aZ) { - return aWorld.getBlock(aX, aY, aZ).getBlockHardness(aWorld, aX, aY, aZ); + return aWorld.getBlock(aX, aY, aZ) + .getBlockHardness(aWorld, aX, aY, aZ); } public static FakePlayer getFakePlayer(IGregTechTileEntity aBaseMetaTileEntity) { @@ -3816,17 +3922,21 @@ public class GT_Utility { String... aOres) { NBTTagCompound tNBT = getNBT(aStack); StringBuilder tData = new StringBuilder(aX + "," + aY + "," + aZ + "," + aDim + ","); - if (aFluid != null) tData.append(aFluid.amount).append(",").append(aFluid.getLocalizedName()).append(","); // TODO - // CHECK - // IF - // THAT - // /5000 - // is - // needed - // (Not - // needed) + if (aFluid != null) tData.append(aFluid.amount) + .append(",") + .append(aFluid.getLocalizedName()) + .append(","); // TODO + // CHECK + // IF + // THAT + // /5000 + // is + // needed + // (Not + // needed) for (String tString : aOres) { - tData.append(tString).append(","); + tData.append(tString) + .append(","); } tNBT.setString("prospection", tData.toString()); setNBT(aStack, tNBT); @@ -3915,7 +4025,8 @@ public class GT_Utility { NBTTagList tNBTList = new NBTTagList(); StringBuilder tOres = new StringBuilder(" Prospected Ores: "); for (int i = 6; tDataArray.length > i; i++) { - tOres.append(tDataArray[i]).append(" "); + tOres.append(tDataArray[i]) + .append(" "); } tNBTList.appendTag( new NBTTagString( @@ -3994,7 +4105,8 @@ public class GT_Utility { do { tPageText = new StringBuilder(); for (int i = tPage * aItemsPerPage; i < (tPage + 1) * aItemsPerPage && i < list.length; i += 1) - tPageText.append((tPageText.length() == 0) ? "" : aListDelimiter).append(list[i]); + tPageText.append((tPageText.length() == 0) ? "" : aListDelimiter) + .append(list[i]); if (tPageText.length() > 0) { String tPageCounter = tTotalPages > 1 ? String.format(aPageFormatter, tPage + 1, tTotalPages) : ""; @@ -4047,8 +4159,10 @@ public class GT_Utility { if (nbttaglist != null) { try { for (int i = 0; i < nbttaglist.tagCount(); ++i) { - short short1 = nbttaglist.getCompoundTagAt(i).getShort("id"); - short short2 = nbttaglist.getCompoundTagAt(i).getShort("lvl"); + short short1 = nbttaglist.getCompoundTagAt(i) + .getShort("id"); + short short2 = nbttaglist.getCompoundTagAt(i) + .getShort("lvl"); if (Enchantment.enchantmentsList[short1] != null) aBullshitModifier.calculateModifier(Enchantment.enchantmentsList[short1], short2); } @@ -4115,7 +4229,8 @@ public class GT_Utility { } public static String toSubscript(long no) { - char[] chars = Long.toString(no).toCharArray(); + char[] chars = Long.toString(no) + .toCharArray(); for (int i = 0; i < chars.length; i++) { chars[i] += 8272; } @@ -4139,7 +4254,9 @@ public class GT_Utility { public static boolean isOre(Block aBlock, int aMeta) { return (aBlock instanceof GT_Block_Ores_Abstract) || isOre(new ItemStack(aBlock, 1, aMeta)) - || ORE_BLOCK_CLASSES.contains(aBlock.getClass().getName()); + || ORE_BLOCK_CLASSES.contains( + aBlock.getClass() + .getName()); } public static boolean isOre(ItemStack aStack) { @@ -4148,7 +4265,8 @@ public class GT_Utility { return sOreTable.get(tItem); } for (int id : OreDictionary.getOreIDs(aStack)) { - if (OreDictionary.getOreName(id).startsWith("ore")) { + if (OreDictionary.getOreName(id) + .startsWith("ore")) { sOreTable.put(tItem, true); return true; } @@ -4166,8 +4284,8 @@ public class GT_Utility { // We take the modulus of the metadata by 16000 because that is the magic number to convert small ores to // regular ores. // See: GT_TileEntity_Ores.java - ItemData association = GT_OreDictUnificator - .getAssociation(new ItemStack(Item.getItemFromBlock(ore), 1, metaData % 16000)); + ItemData association = GT_OreDictUnificator.getAssociation( + new ItemStack(Item.getItemFromBlock(ore), 1, metaData % 16000)); if (association != null) { Supplier<ItemStack> supplier = sOreToCobble.get(association.mPrefix); if (supplier != null) { @@ -4191,9 +4309,12 @@ public class GT_Utility { } else if (o instanceof String) { ItemStack stack = GT_OreDictUnificator.get(o, 1); if (stack == null) { - Optional<ItemStack> oStack = OreDictionary.getOres((String) o).stream().findAny(); + Optional<ItemStack> oStack = OreDictionary.getOres((String) o) + .stream() + .findAny(); if (oStack.isPresent()) { - ItemStack copy = oStack.get().copy(); + ItemStack copy = oStack.get() + .copy(); inputs.add(copy); } } else { @@ -4258,9 +4379,12 @@ public class GT_Utility { if (ToolDictNames.contains(dictName)) continue; ItemStack stack = GT_OreDictUnificator.get(dictName, null, amount, false, true); if (stack == null) { - Optional<ItemStack> oStack = OreDictionary.getOres(dictName).stream().findAny(); + Optional<ItemStack> oStack = OreDictionary.getOres(dictName) + .stream() + .findAny(); if (oStack.isPresent()) { - ItemStack copy = oStack.get().copy(); + ItemStack copy = oStack.get() + .copy(); copy.stackSize = amount; inputs.add(copy); } @@ -4304,7 +4428,9 @@ public class GT_Utility { } public static long getNonnullElementCount(Object[] tArray) { - return Arrays.stream(tArray).filter(Objects::nonNull).count(); + return Arrays.stream(tArray) + .filter(Objects::nonNull) + .count(); } public static int clamp(int val, int lo, int hi) { @@ -4337,7 +4463,9 @@ public class GT_Utility { */ public static int persistentHash(FluidStack aStack, boolean aUseStackSize, boolean aUseNBT) { if (aStack == null) return 0; - int base = Objects.hashCode(aStack.getFluid().getName()); + int base = Objects.hashCode( + aStack.getFluid() + .getName()); if (aUseStackSize) base = base * 31 + aStack.amount; if (aUseNBT) base = base * 31 + Objects.hashCode(aStack.tag); @@ -4418,7 +4546,8 @@ public class GT_Utility { public static Stream<NBTTagCompound> streamCompounds(NBTTagList list) { if (list == null) return Stream.empty(); - return IntStream.range(0, list.tagCount()).mapToObj(list::getCompoundTagAt); + return IntStream.range(0, list.tagCount()) + .mapToObj(list::getCompoundTagAt); } public static boolean equals(ItemStack[] a, ItemStack[] b) { @@ -4471,7 +4600,9 @@ public class GT_Utility { Collection<Collection<E>> colls1 = null; for (Collection<E> list : lists) { if (list == null || list.isEmpty()) { - colls1 = lists.stream().filter(c -> c != null && !c.isEmpty()).collect(Collectors.toList()); + colls1 = lists.stream() + .filter(c -> c != null && !c.isEmpty()) + .collect(Collectors.toList()); break; } } @@ -4486,7 +4617,9 @@ public class GT_Utility { @Override public Iterator<E> iterator() { - return colls.stream().flatMap(Collection::stream).iterator(); + return colls.stream() + .flatMap(Collection::stream) + .iterator(); } @Override diff --git a/src/main/java/gregtech/api/util/GT_UtilityClient.java b/src/main/java/gregtech/api/util/GT_UtilityClient.java index 22bf2b746e..2b4039a4c2 100644 --- a/src/main/java/gregtech/api/util/GT_UtilityClient.java +++ b/src/main/java/gregtech/api/util/GT_UtilityClient.java @@ -14,8 +14,10 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class GT_UtilityClient { - private static final Field isDrawingField = ReflectionHelper - .findField(Tessellator.class, "isDrawing", "field_78415_z"); + private static final Field isDrawingField = ReflectionHelper.findField( + Tessellator.class, + "isDrawing", + "field_78415_z"); public static boolean isDrawing(Tessellator tess) { try { diff --git a/src/main/java/gregtech/api/util/LightingHelper.java b/src/main/java/gregtech/api/util/LightingHelper.java index 36d8f4cda3..25897487d2 100644 --- a/src/main/java/gregtech/api/util/LightingHelper.java +++ b/src/main/java/gregtech/api/util/LightingHelper.java @@ -351,55 +351,96 @@ public class LightingHelper { brightness = mixedBrightness; float ratio = (float) (1.0F - renderBlocks.renderMinX); - float aoLightValue = renderBlocks.blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(); - - renderBlocks.aoBrightnessXYNN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z); - renderBlocks.aoBrightnessXZNN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y, z - 1); - renderBlocks.aoBrightnessXZNP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y, z + 1); - renderBlocks.aoBrightnessXYNP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z); - renderBlocks.aoBrightnessXYZNNN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z - 1); - renderBlocks.aoBrightnessXYZNNP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z + 1); - renderBlocks.aoBrightnessXYZNPN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z - 1); - renderBlocks.aoBrightnessXYZNPP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z + 1); + float aoLightValue = renderBlocks.blockAccess.getBlock(x - 1, y, z) + .getAmbientOcclusionLightValue(); + + renderBlocks.aoBrightnessXYNN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y - 1, + z); + renderBlocks.aoBrightnessXZNN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y, + z - 1); + renderBlocks.aoBrightnessXZNP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y, + z + 1); + renderBlocks.aoBrightnessXYNP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y + 1, + z); + renderBlocks.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y - 1, + z - 1); + renderBlocks.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y - 1, + z + 1); + renderBlocks.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y + 1, + z - 1); + renderBlocks.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y + 1, + z + 1); renderBlocks.aoLightValueScratchXYNN = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y - 1, z).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y - 1, z) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y - 1, z) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXZNN = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y, z - 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y, z - 1) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXZNP = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y, z + 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y, z + 1) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXYNP = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y + 1, z).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y + 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y + 1, z) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y + 1, z) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXYZNNN = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y - 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y - 1, z - 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y - 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y - 1, z - 1) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXYZNNP = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y - 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y - 1, z + 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y - 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y - 1, z + 1) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXYZNPN = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y + 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y + 1, z - 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y + 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y + 1, z - 1) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXYZNPP = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y + 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y + 1, z + 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y + 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y + 1, z + 1) + .getAmbientOcclusionLightValue(), ratio); int brightnessMixedXYZNPN = renderBlocks.getAoBrightness( @@ -519,55 +560,96 @@ public class LightingHelper { int mixedBrightness = block.getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y, z); brightness = mixedBrightness; - float aoLightValue = renderBlocks.blockAccess.getBlock(x + 1, y, z).getAmbientOcclusionLightValue(); - - renderBlocks.aoBrightnessXYPN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z); - renderBlocks.aoBrightnessXZPN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y, z - 1); - renderBlocks.aoBrightnessXZPP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y, z + 1); - renderBlocks.aoBrightnessXYPP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z); - renderBlocks.aoBrightnessXYZPNN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z - 1); - renderBlocks.aoBrightnessXYZPNP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y - 1, z + 1); - renderBlocks.aoBrightnessXYZPPN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z - 1); - renderBlocks.aoBrightnessXYZPPP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, xOffset, y + 1, z + 1); + float aoLightValue = renderBlocks.blockAccess.getBlock(x + 1, y, z) + .getAmbientOcclusionLightValue(); + + renderBlocks.aoBrightnessXYPN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y - 1, + z); + renderBlocks.aoBrightnessXZPN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y, + z - 1); + renderBlocks.aoBrightnessXZPP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y, + z + 1); + renderBlocks.aoBrightnessXYPP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y + 1, + z); + renderBlocks.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y - 1, + z - 1); + renderBlocks.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y - 1, + z + 1); + renderBlocks.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y + 1, + z - 1); + renderBlocks.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + xOffset, + y + 1, + z + 1); renderBlocks.aoLightValueScratchXYPN = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y - 1, z).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y - 1, z) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y - 1, z) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxX); renderBlocks.aoLightValueScratchXZPN = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y, z - 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y, z - 1) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxX); renderBlocks.aoLightValueScratchXZPP = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y, z + 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y, z + 1) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxX); renderBlocks.aoLightValueScratchXYPP = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y + 1, z).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y + 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y + 1, z) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y + 1, z) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxX); renderBlocks.aoLightValueScratchXYZPNN = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y - 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y - 1, z - 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y - 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y - 1, z - 1) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxX); renderBlocks.aoLightValueScratchXYZPNP = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y - 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y - 1, z + 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y - 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y - 1, z + 1) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxX); renderBlocks.aoLightValueScratchXYZPPN = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y + 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y + 1, z - 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y + 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y + 1, z - 1) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxX); renderBlocks.aoLightValueScratchXYZPPP = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y + 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y + 1, z + 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y + 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y + 1, z + 1) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxX); int brightnessMixedXYZPPP = renderBlocks.getAoBrightness( @@ -688,55 +770,96 @@ public class LightingHelper { brightness = mixedBrightness; float ratio = (float) (1.0F - renderBlocks.renderMinY); - float aoLightValue = renderBlocks.blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(); - - renderBlocks.aoBrightnessXYNN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z); - renderBlocks.aoBrightnessYZNN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, yOffset, z - 1); - renderBlocks.aoBrightnessYZNP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, yOffset, z + 1); - renderBlocks.aoBrightnessXYPN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z); - renderBlocks.aoBrightnessXYZNNN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z - 1); - renderBlocks.aoBrightnessXYZNNP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z + 1); - renderBlocks.aoBrightnessXYZPNN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z - 1); - renderBlocks.aoBrightnessXYZPNP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z + 1); + float aoLightValue = renderBlocks.blockAccess.getBlock(x, y - 1, z) + .getAmbientOcclusionLightValue(); + + renderBlocks.aoBrightnessXYNN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x - 1, + yOffset, + z); + renderBlocks.aoBrightnessYZNN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x, + yOffset, + z - 1); + renderBlocks.aoBrightnessYZNP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x, + yOffset, + z + 1); + renderBlocks.aoBrightnessXYPN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x + 1, + yOffset, + z); + renderBlocks.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x - 1, + yOffset, + z - 1); + renderBlocks.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x - 1, + yOffset, + z + 1); + renderBlocks.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x + 1, + yOffset, + z - 1); + renderBlocks.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x + 1, + yOffset, + z + 1); renderBlocks.aoLightValueScratchXYNN = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y - 1, z).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y - 1, z) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y, z) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchYZNN = getMixedAo( - renderBlocks.blockAccess.getBlock(x, y - 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y, z - 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y - 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y, z - 1) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchYZNP = getMixedAo( - renderBlocks.blockAccess.getBlock(x, y - 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y, z + 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y - 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y, z + 1) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXYPN = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y - 1, z).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x + 1, y, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y - 1, z) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y, z) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXYZNNN = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y - 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x - 1, y, z - 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y - 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y, z - 1) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXYZNNP = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y - 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x - 1, y, z + 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y - 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y, z + 1) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXYZPNN = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y - 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x + 1, y, z - 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y - 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y, z - 1) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXYZPNP = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y - 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x + 1, y, z + 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y - 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y, z + 1) + .getAmbientOcclusionLightValue(), ratio); int brightnessMixedXYZPNP = renderBlocks.getAoBrightness( @@ -856,55 +979,96 @@ public class LightingHelper { int mixedBrightness = block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x, yOffset, z); brightness = mixedBrightness; - float aoLightValue = renderBlocks.blockAccess.getBlock(x, y + 1, z).getAmbientOcclusionLightValue(); - - renderBlocks.aoBrightnessXYNP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z); - renderBlocks.aoBrightnessXYPP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z); - renderBlocks.aoBrightnessYZPN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, yOffset, z - 1); - renderBlocks.aoBrightnessYZPP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, yOffset, z + 1); - renderBlocks.aoBrightnessXYZNPN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z - 1); - renderBlocks.aoBrightnessXYZPPN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z - 1); - renderBlocks.aoBrightnessXYZNPP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, yOffset, z + 1); - renderBlocks.aoBrightnessXYZPPP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, yOffset, z + 1); + float aoLightValue = renderBlocks.blockAccess.getBlock(x, y + 1, z) + .getAmbientOcclusionLightValue(); + + renderBlocks.aoBrightnessXYNP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x - 1, + yOffset, + z); + renderBlocks.aoBrightnessXYPP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x + 1, + yOffset, + z); + renderBlocks.aoBrightnessYZPN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x, + yOffset, + z - 1); + renderBlocks.aoBrightnessYZPP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x, + yOffset, + z + 1); + renderBlocks.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x - 1, + yOffset, + z - 1); + renderBlocks.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x + 1, + yOffset, + z - 1); + renderBlocks.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x - 1, + yOffset, + z + 1); + renderBlocks.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x + 1, + yOffset, + z + 1); renderBlocks.aoLightValueScratchXYNP = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y + 1, z).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y + 1, z) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y, z) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxY); renderBlocks.aoLightValueScratchXYPP = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y + 1, z).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x + 1, y, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y + 1, z) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y, z) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxY); renderBlocks.aoLightValueScratchYZPN = getMixedAo( - renderBlocks.blockAccess.getBlock(x, y + 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y, z - 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y + 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y, z - 1) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxY); renderBlocks.aoLightValueScratchYZPP = getMixedAo( - renderBlocks.blockAccess.getBlock(x, y + 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y, z + 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y + 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y, z + 1) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxY); renderBlocks.aoLightValueScratchXYZNPN = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y + 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x - 1, y, z - 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y + 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y, z - 1) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxY); renderBlocks.aoLightValueScratchXYZPPN = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y + 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x + 1, y, z - 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y + 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y, z - 1) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxY); renderBlocks.aoLightValueScratchXYZNPP = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y + 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x - 1, y, z + 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y + 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y, z + 1) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxY); renderBlocks.aoLightValueScratchXYZPPP = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y + 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x + 1, y, z + 1).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y + 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y, z + 1) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxY); int brightnessMixedXYZPPP = renderBlocks.getAoBrightness( @@ -1025,55 +1189,96 @@ public class LightingHelper { brightness = mixedBrightness; float ratio = (float) (1.0F - renderBlocks.renderMinZ); - float aoLightValue = renderBlocks.blockAccess.getBlock(x, y, z - 1).getAmbientOcclusionLightValue(); - - renderBlocks.aoBrightnessXZNN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y, zOffset); - renderBlocks.aoBrightnessYZNN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y - 1, zOffset); - renderBlocks.aoBrightnessYZPN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y + 1, zOffset); - renderBlocks.aoBrightnessXZPN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y, zOffset); - renderBlocks.aoBrightnessXYZNNN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y - 1, zOffset); - renderBlocks.aoBrightnessXYZNPN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y + 1, zOffset); - renderBlocks.aoBrightnessXYZPNN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y - 1, zOffset); - renderBlocks.aoBrightnessXYZPPN = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y + 1, zOffset); + float aoLightValue = renderBlocks.blockAccess.getBlock(x, y, z - 1) + .getAmbientOcclusionLightValue(); + + renderBlocks.aoBrightnessXZNN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x - 1, + y, + zOffset); + renderBlocks.aoBrightnessYZNN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x, + y - 1, + zOffset); + renderBlocks.aoBrightnessYZPN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x, + y + 1, + zOffset); + renderBlocks.aoBrightnessXZPN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x + 1, + y, + zOffset); + renderBlocks.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x - 1, + y - 1, + zOffset); + renderBlocks.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x - 1, + y + 1, + zOffset); + renderBlocks.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x + 1, + y - 1, + zOffset); + renderBlocks.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x + 1, + y + 1, + zOffset); renderBlocks.aoLightValueScratchXZNN = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y, z) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchYZNN = getMixedAo( - renderBlocks.blockAccess.getBlock(x, y - 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y - 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y - 1, z) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchYZPN = getMixedAo( - renderBlocks.blockAccess.getBlock(x, y + 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y + 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y + 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y + 1, z) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXZPN = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x + 1, y, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y, z) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXYZNNN = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y - 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x - 1, y - 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y - 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y - 1, z) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXYZNPN = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y + 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x - 1, y + 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y + 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y + 1, z) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXYZPNN = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y - 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x + 1, y - 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y - 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y - 1, z) + .getAmbientOcclusionLightValue(), ratio); renderBlocks.aoLightValueScratchXYZPPN = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y + 1, z - 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x + 1, y + 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y + 1, z - 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y + 1, z) + .getAmbientOcclusionLightValue(), ratio); int brightnessMixedXYZPPN = renderBlocks.getAoBrightness( @@ -1193,55 +1398,96 @@ public class LightingHelper { int mixedBrightness = block.getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y, zOffset); brightness = mixedBrightness; - float aoLightValue = renderBlocks.blockAccess.getBlock(x, y, z + 1).getAmbientOcclusionLightValue(); - - renderBlocks.aoBrightnessXZNP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y, zOffset); - renderBlocks.aoBrightnessXZPP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y, zOffset); - renderBlocks.aoBrightnessYZNP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y - 1, zOffset); - renderBlocks.aoBrightnessYZPP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x, y + 1, zOffset); - renderBlocks.aoBrightnessXYZNNP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y - 1, zOffset); - renderBlocks.aoBrightnessXYZNPP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x - 1, y + 1, zOffset); - renderBlocks.aoBrightnessXYZPNP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y - 1, zOffset); - renderBlocks.aoBrightnessXYZPPP = block - .getMixedBrightnessForBlock(renderBlocks.blockAccess, x + 1, y + 1, zOffset); + float aoLightValue = renderBlocks.blockAccess.getBlock(x, y, z + 1) + .getAmbientOcclusionLightValue(); + + renderBlocks.aoBrightnessXZNP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x - 1, + y, + zOffset); + renderBlocks.aoBrightnessXZPP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x + 1, + y, + zOffset); + renderBlocks.aoBrightnessYZNP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x, + y - 1, + zOffset); + renderBlocks.aoBrightnessYZPP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x, + y + 1, + zOffset); + renderBlocks.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x - 1, + y - 1, + zOffset); + renderBlocks.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x - 1, + y + 1, + zOffset); + renderBlocks.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x + 1, + y - 1, + zOffset); + renderBlocks.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock( + renderBlocks.blockAccess, + x + 1, + y + 1, + zOffset); renderBlocks.aoLightValueScratchXZNP = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x - 1, y, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y, z) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxZ); renderBlocks.aoLightValueScratchXZPP = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x + 1, y, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y, z) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxZ); renderBlocks.aoLightValueScratchYZNP = getMixedAo( - renderBlocks.blockAccess.getBlock(x, y - 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y - 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y - 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y - 1, z) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxZ); renderBlocks.aoLightValueScratchYZPP = getMixedAo( - renderBlocks.blockAccess.getBlock(x, y + 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x, y + 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y + 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x, y + 1, z) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxZ); renderBlocks.aoLightValueScratchXYZNNP = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y - 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x - 1, y - 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y - 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y - 1, z) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxZ); renderBlocks.aoLightValueScratchXYZNPP = getMixedAo( - renderBlocks.blockAccess.getBlock(x - 1, y + 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x - 1, y + 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y + 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x - 1, y + 1, z) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxZ); renderBlocks.aoLightValueScratchXYZPNP = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y - 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x + 1, y - 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y - 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y - 1, z) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxZ); renderBlocks.aoLightValueScratchXYZPPP = getMixedAo( - renderBlocks.blockAccess.getBlock(x + 1, y + 1, z + 1).getAmbientOcclusionLightValue(), - renderBlocks.blockAccess.getBlock(x + 1, y + 1, z).getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y + 1, z + 1) + .getAmbientOcclusionLightValue(), + renderBlocks.blockAccess.getBlock(x + 1, y + 1, z) + .getAmbientOcclusionLightValue(), renderBlocks.renderMaxZ); int brightnessMixedXYZNPP = renderBlocks.getAoBrightness( diff --git a/src/main/java/gregtech/api/world/GT_Worldgen.java b/src/main/java/gregtech/api/world/GT_Worldgen.java index 3d2fe466c2..742651b02a 100644 --- a/src/main/java/gregtech/api/world/GT_Worldgen.java +++ b/src/main/java/gregtech/api/world/GT_Worldgen.java @@ -65,18 +65,25 @@ public abstract class GT_Worldgen { */ public boolean isGenerationAllowed(World aWorld, int aDimensionType, int aAllowedDimensionType) { - if (!((aWorld.provider.getDimensionName().equalsIgnoreCase("Overworld")) - || (aWorld.provider.getDimensionName().equalsIgnoreCase("Nether")) - || (aWorld.provider.getDimensionName().equalsIgnoreCase("The End")) - || (aWorld.provider.getDimensionName().equalsIgnoreCase("Twilight Forest")) - || (aWorld.provider.getDimensionName().equalsIgnoreCase("Underdark")))) + if (!((aWorld.provider.getDimensionName() + .equalsIgnoreCase("Overworld")) + || (aWorld.provider.getDimensionName() + .equalsIgnoreCase("Nether")) + || (aWorld.provider.getDimensionName() + .equalsIgnoreCase("The End")) + || (aWorld.provider.getDimensionName() + .equalsIgnoreCase("Twilight Forest")) + || (aWorld.provider.getDimensionName() + .equalsIgnoreCase("Underdark")))) return false; String aDimName = aWorld.provider.getDimensionName(); Boolean tAllowed = mDimensionMap.get(aDimName); if (tAllowed == null) { - boolean tValue = GregTech_API.sWorldgenFile - .get("worldgen." + mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType); + boolean tValue = GregTech_API.sWorldgenFile.get( + "worldgen." + mWorldGenName, + aDimName, + aDimensionType == aAllowedDimensionType); mDimensionMap.put(aDimName, tValue); return tValue; } diff --git a/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock.java b/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock.java index 5916d04a49..79b9e1711f 100644 --- a/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock.java +++ b/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock.java @@ -38,7 +38,8 @@ public class GT_Worldgen_Ore_SingleBlock extends GT_Worldgen_Ore { int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY), tZ = aChunkZ + aRandom.nextInt(16); Block tBlock = aWorld.getBlock(tX, tY, tZ); - if (((mAllowToGenerateinVoid && aWorld.getBlock(tX, tY, tZ).isAir(aWorld, tX, tY, tZ)) + if (((mAllowToGenerateinVoid && aWorld.getBlock(tX, tY, tZ) + .isAir(aWorld, tX, tY, tZ)) || (tBlock != null && (tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.stone) || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.end_stone) || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.netherrack))))) { diff --git a/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock_UnderLava.java b/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock_UnderLava.java index a1bd913ace..2c35dbf27e 100644 --- a/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock_UnderLava.java +++ b/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock_UnderLava.java @@ -38,7 +38,8 @@ public class GT_Worldgen_Ore_SingleBlock_UnderLava extends GT_Worldgen_Ore { int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY), tZ = aChunkZ + aRandom.nextInt(16); Block tBlock = aWorld.getBlock(tX, tY, tZ); - if (((mAllowToGenerateinVoid && aWorld.getBlock(tX, tY, tZ).isAir(aWorld, tX, tY, tZ)) + if (((mAllowToGenerateinVoid && aWorld.getBlock(tX, tY, tZ) + .isAir(aWorld, tX, tY, tZ)) || (tBlock != null && (tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.stone) || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.end_stone) || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.netherrack))))) { diff --git a/src/main/java/gregtech/client/GT_GUI_ClientConfig.java b/src/main/java/gregtech/client/GT_GUI_ClientConfig.java index 49611cfa72..cf9b2fd8f9 100644 --- a/src/main/java/gregtech/client/GT_GUI_ClientConfig.java +++ b/src/main/java/gregtech/client/GT_GUI_ClientConfig.java @@ -31,8 +31,11 @@ public class GT_GUI_ClientConfig extends GuiConfig { private static List<IConfigElement> getConfigElements() { final Configuration config = GregTech_API.sClientDataFile.mConfig; setLanguageKeys(config); - return config.getCategoryNames().stream().filter(name -> name.indexOf('.') == -1) - .map(name -> new ConfigElement(config.getCategory(name))).collect(Collectors.toList()); + return config.getCategoryNames() + .stream() + .filter(name -> name.indexOf('.') == -1) + .map(name -> new ConfigElement(config.getCategory(name))) + .collect(Collectors.toList()); } private static void setLanguageKeys(Configuration config) { @@ -44,7 +47,8 @@ public class GT_GUI_ClientConfig extends GuiConfig { String name = entry.getKey(); int defaultStart = name.lastIndexOf('_'); String realName = defaultStart >= 0 ? name.substring(0, defaultStart) : name; - entry.getValue().setLanguageKey(String.format("%s.%s", category.getLanguagekey(), realName)); + entry.getValue() + .setLanguageKey(String.format("%s.%s", category.getLanguagekey(), realName)); } } } diff --git a/src/main/java/gregtech/client/GT_SoundLoop.java b/src/main/java/gregtech/client/GT_SoundLoop.java index 6692775d20..135ef032f5 100644 --- a/src/main/java/gregtech/client/GT_SoundLoop.java +++ b/src/main/java/gregtech/client/GT_SoundLoop.java @@ -61,8 +61,13 @@ public class GT_SoundLoop extends MovingSound { volume += VOLUME_RAMP; } World world = Minecraft.getMinecraft().thePlayer.worldObj; - donePlaying = world.provider.dimensionId != worldID || !world - .checkChunksExist((int) xPosF, (int) yPosF, (int) zPosF, (int) xPosF, (int) yPosF, (int) zPosF); + donePlaying = world.provider.dimensionId != worldID || !world.checkChunksExist( + (int) xPosF, + (int) yPosF, + (int) zPosF, + (int) xPosF, + (int) yPosF, + (int) zPosF); if (donePlaying) return; TileEntity tile = world.getTileEntity((int) xPosF, (int) yPosF, (int) zPosF); if ((tile instanceof IGregTechTileEntity)) { diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java index 351a1aac16..9938b46ab0 100644 --- a/src/main/java/gregtech/common/GT_Client.java +++ b/src/main/java/gregtech/common/GT_Client.java @@ -101,17 +101,25 @@ public class GT_Client extends GT_Proxy implements Runnable { // don't ask. these "just works" private static final Transformation ROTATION_MARKER_TRANSFORM_CENTER = new Scale(0.5); private static final Transformation[] ROTATION_MARKER_TRANSFORMS_SIDES_TRANSFORMS = { - new Scale(0.25).with(new Translation(0, 0, 0.375)).compile(), - new Scale(0.25).with(new Translation(0.375, 0, 0)).compile(), - new Scale(0.25).with(new Translation(0, 0, -0.375)).compile(), - new Scale(0.25).with(new Translation(-0.375, 0, 0)).compile(), }; + new Scale(0.25).with(new Translation(0, 0, 0.375)) + .compile(), + new Scale(0.25).with(new Translation(0.375, 0, 0)) + .compile(), + new Scale(0.25).with(new Translation(0, 0, -0.375)) + .compile(), + new Scale(0.25).with(new Translation(-0.375, 0, 0)) + .compile(), }; private static final int[] ROTATION_MARKER_TRANSFORMS_SIDES = { -1, -1, 2, 0, 3, 1, -1, -1, 0, 2, 3, 1, 0, 2, -1, -1, 3, 1, 2, 0, -1, -1, 3, 1, 1, 3, 2, 0, -1, -1, 3, 1, 2, 0, -1, -1 }; private static final Transformation[] ROTATION_MARKER_TRANSFORMS_CORNER = { - new Scale(0.25).with(new Translation(0.375, 0, 0.375)).compile(), - new Scale(0.25).with(new Translation(-0.375, 0, 0.375)).compile(), - new Scale(0.25).with(new Translation(0.375, 0, -0.375)).compile(), - new Scale(0.25).with(new Translation(-0.375, 0, -0.375)).compile(), }; + new Scale(0.25).with(new Translation(0.375, 0, 0.375)) + .compile(), + new Scale(0.25).with(new Translation(-0.375, 0, 0.375)) + .compile(), + new Scale(0.25).with(new Translation(0.375, 0, -0.375)) + .compile(), + new Scale(0.25).with(new Translation(-0.375, 0, -0.375)) + .compile(), }; private static int rotationMarkerDisplayList; private static boolean rotationMarkerDisplayListCompiled = false; @@ -314,8 +322,10 @@ public class GT_Client extends GT_Proxy implements Runnable { GL11.glVertex3d(+.25D, .0D, +.50D); GL11.glVertex3d(-.25D, .0D, -.50D); GL11.glVertex3d(-.25D, .0D, +.50D); - final TileEntity tTile = aEvent.player.worldObj - .getTileEntity(aEvent.target.blockX, aEvent.target.blockY, aEvent.target.blockZ); + final TileEntity tTile = aEvent.player.worldObj.getTileEntity( + aEvent.target.blockX, + aEvent.target.blockY, + aEvent.target.blockZ); // draw connection indicators byte tConnections = 0; @@ -392,17 +402,19 @@ public class GT_Client extends GT_Proxy implements Runnable { final ForgeDirection direction = tAlignment.getDirection(); if (direction.ordinal() == tSideHit) drawExtendedRotationMarker(ROTATION_MARKER_TRANSFORM_CENTER, aIsSneaking, false); - else if (direction.getOpposite().ordinal() == tSideHit) { - for (Transformation t : ROTATION_MARKER_TRANSFORMS_CORNER) { - drawExtendedRotationMarker(t, aIsSneaking, true); - } - } else { - drawExtendedRotationMarker( - ROTATION_MARKER_TRANSFORMS_SIDES_TRANSFORMS[ROTATION_MARKER_TRANSFORMS_SIDES[tSideHit * 6 - + direction.ordinal()]], - aIsSneaking, - true); - } + else if (direction.getOpposite() + .ordinal() + == tSideHit) { + for (Transformation t : ROTATION_MARKER_TRANSFORMS_CORNER) { + drawExtendedRotationMarker(t, aIsSneaking, true); + } + } else { + drawExtendedRotationMarker( + ROTATION_MARKER_TRANSFORMS_SIDES_TRANSFORMS[ROTATION_MARKER_TRANSFORMS_SIDES[tSideHit + * 6 + direction.ordinal()]], + aIsSneaking, + true); + } } } GL11.glPopMatrix(); // get back to player center @@ -518,8 +530,10 @@ public class GT_Client extends GT_Proxy implements Runnable { super.onPreLoad(); MinecraftForge.EVENT_BUS.register(new ExtraIcons()); - Minecraft.getMinecraft().getResourcePackRepository().rprMetadataSerializer - .registerMetadataSectionType(new ColorsMetadataSectionSerializer(), ColorsMetadataSection.class); + Minecraft.getMinecraft() + .getResourcePackRepository().rprMetadataSerializer.registerMetadataSectionType( + new ColorsMetadataSectionSerializer(), + ColorsMetadataSection.class); new GT_MetaTileEntity_AdvDebugStructureWriter.ForgeEventHandler(); @@ -580,7 +594,8 @@ public class GT_Client extends GT_Proxy implements Runnable { for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { try { if (GregTech_API.METATILEENTITIES[i] != null) { - GregTech_API.METATILEENTITIES[i].getStackForm(1L).getTooltip(null, true); + GregTech_API.METATILEENTITIES[i].getStackForm(1L) + .getTooltip(null, true); GT_Log.out.println("META " + i + " " + GregTech_API.METATILEENTITIES[i].getMetaName()); } } catch (Throwable e) { @@ -594,16 +609,19 @@ public class GT_Client extends GT_Proxy implements Runnable { // reobf doesn't work with lambda, so this must be a class // noinspection Convert2Lambda - ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()) - .registerReloadListener(new IResourceManagerReloadListener() { - - @Override - public void onResourceManagerReload(IResourceManager l) { - GT_GUIColorOverride.onResourceManagerReload(); - FallbackableSteamTexture.reload(); - GregTech_API.sCoverBehaviors.values().forEach(GT_CoverBehaviorBase::reloadColorOverride); - } - }); + ((IReloadableResourceManager) Minecraft.getMinecraft() + .getResourceManager()).registerReloadListener( + new IResourceManagerReloadListener() { + + @Override + public void onResourceManagerReload(IResourceManager l) { + GT_GUIColorOverride.onResourceManagerReload(); + FallbackableSteamTexture.reload(); + GregTech_API.sCoverBehaviors.values() + .forEach( + GT_CoverBehaviorBase::reloadColorOverride); + } + }); } @Override @@ -611,7 +629,9 @@ public class GT_Client extends GT_Proxy implements Runnable { GT_Log.out.println("GT_Mod: Downloading Cape List."); try (final Scanner tScanner = new Scanner(new URL(GT_CAPE_LIST_URL).openStream())) { while (tScanner.hasNextLine()) { - this.mCapeList.add(tScanner.nextLine().toLowerCase()); + this.mCapeList.add( + tScanner.nextLine() + .toLowerCase()); } } catch (Throwable e) { e.printStackTrace(GT_Log.err); @@ -619,7 +639,8 @@ public class GT_Client extends GT_Proxy implements Runnable { GT_Log.out.println("GT New Horizons: Downloading Cape List."); try (final Scanner tScanner = new Scanner(new URL(GTNH_CAPE_LIST_URL).openStream())) { while (tScanner.hasNextLine()) { - final String tName = tScanner.nextLine().toLowerCase(); + final String tName = tScanner.nextLine() + .toLowerCase(); if (tName.contains(":")) { if (!this.mCapeList.contains(tName.substring(0, tName.indexOf(":")))) { this.mCapeList.add(tName); @@ -659,7 +680,8 @@ public class GT_Client extends GT_Proxy implements Runnable { mFirstTick = false; GT_Values.NW.sendToServer(new GT_Packet_ClientPreference(mPreference)); - if (!Minecraft.getMinecraft().isSingleplayer()) { + if (!Minecraft.getMinecraft() + .isSingleplayer()) { // Check for more IC2 recipes to also catch MineTweaker additions GT_ModHandler.addIC2RecipesToGT( GT_ModHandler.getMaceratorRecipeList(), @@ -701,7 +723,7 @@ public class GT_Client extends GT_Proxy implements Runnable { } } for (Iterator<Map.Entry<GT_PlayedSound, Integer>> iterator = GT_Utility.sPlayedSoundMap.entrySet() - .iterator(); iterator.hasNext();) { + .iterator(); iterator.hasNext();) { Map.Entry<GT_PlayedSound, Integer> tEntry = iterator.next(); if (tEntry.getValue() < 0) { iterator.remove(); @@ -718,8 +740,10 @@ public class GT_Client extends GT_Proxy implements Runnable { mLastUpdatedBlockX = trace.blockX; mLastUpdatedBlockY = trace.blockY; mLastUpdatedBlockZ = trace.blockZ; - final TileEntity tileEntity = aEvent.player.worldObj - .getTileEntity(trace.blockX, trace.blockY, trace.blockZ); + final TileEntity tileEntity = aEvent.player.worldObj.getTileEntity( + trace.blockX, + trace.blockY, + trace.blockZ); if (tileEntity instanceof IGregTechTileEntity) { final IGregTechTileEntity gtTile = (IGregTechTileEntity) tileEntity; if (gtTile.getMetaTileEntity() instanceof IHasFluidDisplayItem) { @@ -749,10 +773,14 @@ public class GT_Client extends GT_Proxy implements Runnable { @SubscribeEvent public void onDrawBlockHighlight(DrawBlockHighlightEvent aEvent) { - final Block aBlock = aEvent.player.worldObj - .getBlock(aEvent.target.blockX, aEvent.target.blockY, aEvent.target.blockZ); - final TileEntity aTileEntity = aEvent.player.worldObj - .getTileEntity(aEvent.target.blockX, aEvent.target.blockY, aEvent.target.blockZ); + final Block aBlock = aEvent.player.worldObj.getBlock( + aEvent.target.blockX, + aEvent.target.blockY, + aEvent.target.blockZ); + final TileEntity aTileEntity = aEvent.player.worldObj.getTileEntity( + aEvent.target.blockX, + aEvent.target.blockY, + aEvent.target.blockZ); if (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sWrenchList)) { if (aTileEntity instanceof ITurnable || ROTATABLE_VANILLA_BLOCKS.contains(aBlock) @@ -975,11 +1003,20 @@ public class GT_Client extends GT_Proxy implements Runnable { } if (tString.startsWith("streaming.")) { new WorldSpawnedEventBuilder.RecordEffectEventBuilder().setIdentifier(tString.substring(10)) - .setPosition(aX, aY, aZ).run(); + .setPosition(aX, aY, aZ) + .run(); } else { - new WorldSpawnedEventBuilder.SoundEventBuilder().setVolume(3f).setPitch( - tString.startsWith("note.") ? (float) Math.pow(2D, (double) (aStack.stackSize - 13) / 12D) : 1.0F) - .setIdentifier(tString).setPosition(aX, aY, aZ).run(); + new WorldSpawnedEventBuilder.SoundEventBuilder().setVolume(3f) + .setPitch( + tString.startsWith("note.") + ? (float) Math.pow( + 2D, + (double) (aStack.stackSize - 13) + / 12D) + : 1.0F) + .setIdentifier(tString) + .setPosition(aX, aY, aZ) + .run(); } } @@ -1005,7 +1042,8 @@ public class GT_Client extends GT_Proxy implements Runnable { final int[] ids = OreDictionary.getOreIDs(tCurrentItem); int hide = 0; for (int i : ids) { - if (OreDictionary.getOreName(i).equals("craftingToolSolderingIron")) { + if (OreDictionary.getOreName(i) + .equals("craftingToolSolderingIron")) { hide |= 0x1; break; } diff --git a/src/main/java/gregtech/common/GT_Network.java b/src/main/java/gregtech/common/GT_Network.java index 77a7e3477e..665439dbd8 100644 --- a/src/main/java/gregtech/common/GT_Network.java +++ b/src/main/java/gregtech/common/GT_Network.java @@ -74,15 +74,23 @@ public class GT_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet> @Override protected void encode(ChannelHandlerContext aContext, GT_Packet aPacket, List<Object> aOutput) throws Exception { - final ByteBuf tBuf = Unpooled.buffer().writeByte(aPacket.getPacketID()); + final ByteBuf tBuf = Unpooled.buffer() + .writeByte(aPacket.getPacketID()); aPacket.encode(tBuf); - aOutput.add(new FMLProxyPacket(tBuf, aContext.channel().attr(NetworkRegistry.FML_CHANNEL).get())); + aOutput.add( + new FMLProxyPacket( + tBuf, + aContext.channel() + .attr(NetworkRegistry.FML_CHANNEL) + .get())); } @Override protected void decode(ChannelHandlerContext aContext, FMLProxyPacket aPacket, List<Object> aOutput) throws Exception { - final ByteArrayDataInput aData = ByteStreams.newDataInput(aPacket.payload().array()); + final ByteArrayDataInput aData = ByteStreams.newDataInput( + aPacket.payload() + .array()); final GT_Packet tPacket = this.mSubChannels[aData.readByte()].decode(aData); tPacket.setINetHandler(aPacket.handler()); aOutput.add(tPacket); @@ -98,25 +106,35 @@ public class GT_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet> GT_FML_LOGGER.info("player null"); return; } - 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); } @Override public void sendToAllAround(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(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 @@ -128,8 +146,9 @@ public class GT_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet> } EntityPlayerMP tPlayer = (EntityPlayerMP) tObject; 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)) { sendToPlayer(aPacket, tPlayer); } } diff --git a/src/main/java/gregtech/common/GT_Pollution.java b/src/main/java/gregtech/common/GT_Pollution.java index 12ea4650e9..ad2da33259 100644 --- a/src/main/java/gregtech/common/GT_Pollution.java +++ b/src/main/java/gregtech/common/GT_Pollution.java @@ -318,8 +318,7 @@ public class GT_Pollution { if (iMetaTileEntity instanceof IMachineCallback) { if (((IMachineCallback) iMetaTileEntity).getCallbackBase() instanceof GT_MetaTileEntity_Cleanroom) { if (aPollution > 0) { - ((GT_MetaTileEntity_Cleanroom) ((IMachineCallback) iMetaTileEntity).getCallbackBase()) - .doMaintenanceIssue(); + ((GT_MetaTileEntity_Cleanroom) ((IMachineCallback) iMetaTileEntity).getCallbackBase()).doMaintenanceIssue(); } } } @@ -384,7 +383,8 @@ public class GT_Pollution { if (w.isRemote) // it really should be querying the client side stuff instead return GT_PollutionRenderer.getKnownPollution(chunkX << 4, chunkZ << 4); - return STORAGE.get(w, chunkX, chunkZ).getAmount(); + return STORAGE.get(w, chunkX, chunkZ) + .getAmount(); } @Deprecated @@ -394,7 +394,9 @@ public class GT_Pollution { public static boolean hasPollution(Chunk ch) { if (!GT_Mod.gregtechproxy.mPollution) return false; - return STORAGE.isCreated(ch.worldObj, ch.getChunkCoordIntPair()) && STORAGE.get(ch).getAmount() > 0; + return STORAGE.isCreated(ch.worldObj, ch.getChunkCoordIntPair()) && STORAGE.get(ch) + .getAmount() + > 0; } // Add compatibility with old code @@ -406,7 +408,10 @@ public class GT_Pollution { } static void migrate(ChunkDataEvent.Load e) { - addPollution(e.getChunk(), e.getData().getInteger("GTPOLLUTION")); + addPollution( + e.getChunk(), + e.getData() + .getInteger("GTPOLLUTION")); } public static class GT_PollutionEventHandler { @@ -416,7 +421,8 @@ public class GT_Pollution { if (!GT_Mod.gregtechproxy.mPollution) return; World world = event.player.worldObj; if (STORAGE.isCreated(world, event.chunk)) { - int pollution = STORAGE.get(world, event.chunk).getAmount(); + int pollution = STORAGE.get(world, event.chunk) + .getAmount(); if (pollution > POLLUTIONPACKET_MINVALUE) GT_Values.NW.sendToPlayer(new GT_Packet_Pollution(event.chunk, pollution), event.player); } diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 401b1395d5..30de62084a 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -748,18 +748,24 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GameRegistry.registerFuelHandler(this); MinecraftForge.EVENT_BUS.register(this); MinecraftForge.ORE_GEN_BUS.register(this); - FMLCommonHandler.instance().bus().register(this); - GregTech_API.sThaumcraftCompat = (IThaumcraftCompat) GT_Utility - .callConstructor("gregtech.common.GT_ThaumcraftCompat", 0, null, GT_Values.D1, new Object[0]); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + FMLCommonHandler.instance() + .bus() + .register(this); + GregTech_API.sThaumcraftCompat = (IThaumcraftCompat) GT_Utility.callConstructor( + "gregtech.common.GT_ThaumcraftCompat", + 0, + null, + GT_Values.D1, + new Object[0]); + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { onFluidContainerRegistration(new FluidContainerRegistry.FluidContainerRegisterEvent(tData)); } try { for (String tOreName : OreDictionary.getOreNames()) { ItemStack tOreStack; - for (Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$ - .hasNext(); registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { + for (Iterator i$ = OreDictionary.getOres(tOreName) + .iterator(); i$.hasNext(); registerOre( + new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { tOreStack = (ItemStack) i$.next(); } } @@ -776,8 +782,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG this.mIgnoreTcon = GregTech_API.sOPStuff.get(ConfigCategories.general, "ignoreTConstruct", true); this.mWireHeatingTicks = GregTech_API.sOPStuff.get(ConfigCategories.general, "WireHeatingTicks", 4); NetworkRegistry.INSTANCE.registerGuiHandler(GT_Values.GT, this); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { tData.fluid.amount = 0; break; @@ -872,8 +877,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG ItemList.IC2_Hops.set(GT_ModHandler.getIC2Item("hops", 1L)); ItemList.IC2_Resin.set(GT_ModHandler.getIC2Item("resin", 1L)); ItemList.IC2_Plantball.set(GT_ModHandler.getIC2Item("plantBall", 1L)); - ItemList.IC2_PlantballCompressed - .set(GT_ModHandler.getIC2Item("compressedPlantBall", 1L, ItemList.IC2_Plantball.get(1L))); + ItemList.IC2_PlantballCompressed.set( + GT_ModHandler.getIC2Item("compressedPlantBall", 1L, ItemList.IC2_Plantball.get(1L))); ItemList.IC2_Crop_Seeds.set(GT_ModHandler.getIC2Item("cropSeed", 1L)); ItemList.IC2_Grin_Powder.set(GT_ModHandler.getIC2Item("grinPowder", 1L)); ItemList.IC2_Energium_Dust.set(GT_ModHandler.getIC2Item("energiumDust", 1L)); @@ -883,8 +888,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG ItemList.IC2_Food_Can_Empty.set(GT_ModHandler.getIC2Item("tinCan", 1L)); ItemList.IC2_Food_Can_Filled.set(GT_ModHandler.getIC2Item("filledTinCan", 1L, 0)); ItemList.IC2_Food_Can_Spoiled.set(GT_ModHandler.getIC2Item("filledTinCan", 1L, 1)); - ItemList.IC2_Industrial_Diamond - .set(GT_ModHandler.getIC2Item("industrialDiamond", 1L, new ItemStack(Items.diamond, 1))); + ItemList.IC2_Industrial_Diamond.set( + GT_ModHandler.getIC2Item("industrialDiamond", 1L, new ItemStack(Items.diamond, 1))); ItemList.IC2_Compressed_Coal_Ball.set(GT_ModHandler.getIC2Item("compressedCoalBall", 1L)); ItemList.IC2_Compressed_Coal_Chunk.set(GT_ModHandler.getIC2Item("coalChunk", 1L)); ItemList.IC2_ShaftIron.set(GT_ModHandler.getIC2Item("ironshaft", 1L)); @@ -960,40 +965,40 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatChestplate", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatLeggings", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getIC2Item("hazmatBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.disk", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.blade", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.rotor", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.diamond", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.disk", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.blade", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(Railcraft.modID, "part.turbine.rotor", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(Railcraft.modID, "borehead.diamond", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.steel", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(Railcraft.modID, "borehead.iron", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.plateNaga", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.legsNaga", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticHelm", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticPlate", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticLegs", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiHelm", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiPlate", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiLegs", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiBoots", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem("appliedenergistics2", "item.ToolCertusQuartzCuttingKnife", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem("appliedenergistics2", "item.ToolNetherQuartzCuttingKnife", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.plateNaga", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.legsNaga", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticHelm", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticPlate", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticLegs", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.arcticBoots", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiHelm", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiPlate", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiLegs", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem(TwilightForest.modID, "item.yetiBoots", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem("appliedenergistics2", "item.ToolCertusQuartzCuttingKnife", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem("appliedenergistics2", "item.ToolNetherQuartzCuttingKnife", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristHelmet", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristChest", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "apiaristLegs", 1L, 32767)); @@ -1002,10 +1007,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "frameImpregnated", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "frameProven", 1L, 32767)); GT_ModHandler.sNonReplaceableItems.add(GT_ModHandler.getModItem(aTextForestry, "waxCast", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem("GalacticraftCore", "item.sensorGlasses", 1L, 32767)); - GT_ModHandler.sNonReplaceableItems - .add(GT_ModHandler.getModItem("IC2NuclearControl", "ItemToolThermometer", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem("GalacticraftCore", "item.sensorGlasses", 1L, 32767)); + GT_ModHandler.sNonReplaceableItems.add( + GT_ModHandler.getModItem("IC2NuclearControl", "ItemToolThermometer", 1L, 32767)); RecipeSorter.register( "gregtech:shaped", @@ -1028,16 +1033,21 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_OreDictUnificator.registerOre( "cropChilipepper", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 2)); - GT_OreDictUnificator - .registerOre("cropTomato", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 8)); - GT_OreDictUnificator - .registerOre("cropGrape", GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 4)); + GT_OreDictUnificator.registerOre( + "cropTomato", + GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 8)); + GT_OreDictUnificator.registerOre( + "cropGrape", + GT_ModHandler.getModItem("magicalcrops", "magicalcrops_CropProduce", 1L, 4)); GT_OreDictUnificator.registerOre("cropTea", GT_ModHandler.getModItem("ganyssurface", "teaLeaves", 1L, 0)); // Clay buckets, which don't get registered until Iguana Tweaks pre-init if (IguanaTweaksTinkerConstruct.isModLoaded()) { - OrePrefixes.bucketClay.mContainerItem = GT_ModHandler - .getModItem(IguanaTweaksTinkerConstruct.modID, "clayBucketFired", 1L, 0); + OrePrefixes.bucketClay.mContainerItem = GT_ModHandler.getModItem( + IguanaTweaksTinkerConstruct.modID, + "clayBucketFired", + 1L, + 0); GT_OreDictUnificator.set( OrePrefixes.bucketClay, Materials.Empty, @@ -1162,8 +1172,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG addFullHazmatToGeneralItem("EnderIO", "item.stellar_boots", 1L); GregTech_API.sLoadStarted = true; - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { tData.fluid.amount = 0; break; @@ -1189,10 +1198,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_MetaGenerated_Item_98.init(); GT_OreDictUnificator.addItemData(new ItemStack(Items.iron_door, 1), new ItemData(Materials.Iron, 21772800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Items.wooden_door, 1, 32767), new ItemData(Materials.Wood, 21772800L)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + GT_OreDictUnificator.addItemData( + new ItemStack(Items.wooden_door, 1, 32767), + new ItemData(Materials.Wood, 21772800L)); + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { tData.fluid.amount = 0; break; @@ -1284,8 +1293,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG this.mUniverse = null; this.isFirstServerWorldTick = true; - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { tData.fluid.amount = 0; break; @@ -1310,7 +1318,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_Log.out.println( "GT_Mod: Cleaning up all OreDict Crafting Recipes, which have an empty List in them, since they are never meeting any Condition."); - List tList = CraftingManager.getInstance().getRecipeList(); + List tList = CraftingManager.getInstance() + .getRecipeList(); for (int i = 0; i < tList.size(); i++) { if ((tList.get(i) instanceof ShapedOreRecipe)) { for (Object tObject : ((ShapedOreRecipe) tList.get(i)).getInput()) { @@ -1362,8 +1371,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG public void onArrowNockEvent(ArrowNockEvent aEvent) { if ((!aEvent.isCanceled()) && (GT_Utility.isStackValid(aEvent.result)) && (GT_Utility.getProjectile(SubTag.PROJECTILE_ARROW, aEvent.entityPlayer.inventory) != null)) { - aEvent.entityPlayer - .setItemInUse(aEvent.result, aEvent.result.getItem().getMaxItemUseDuration(aEvent.result)); + aEvent.entityPlayer.setItemInUse( + aEvent.result, + aEvent.result.getItem() + .getMaxItemUseDuration(aEvent.result)); aEvent.setCanceled(true); } } @@ -1407,8 +1418,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG aEvent.bow.getItem(); new WorldSpawnedEventBuilder.SoundAtEntityEventBuilder().setPitch(0.64893958288F + tSpeed * 0.5F) - .setVolume(1f).setIdentifier(SoundResource.RANDOM_BOW).setEntity(aEvent.entityPlayer) - .setWorld(aEvent.entityPlayer.worldObj).run(); + .setVolume(1f) + .setIdentifier(SoundResource.RANDOM_BOW) + .setEntity(aEvent.entityPlayer) + .setWorld(aEvent.entityPlayer.worldObj) + .run(); tArrowEntity.canBePickedUp = 1; if (!aEvent.entityPlayer.capabilities.isCreativeMode) { @@ -1446,8 +1460,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG new GT_Entity_Arrow( (EntityArrow) aEvent.entity, OrePrefixes.arrowGtWood.mPrefixedItems.get( - aEvent.entity.worldObj.rand - .nextInt(OrePrefixes.arrowGtWood.mPrefixedItems.size())))); + aEvent.entity.worldObj.rand.nextInt( + OrePrefixes.arrowGtWood.mPrefixedItems.size())))); aEvent.entity.setDead(); } } @@ -1570,7 +1584,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG @SubscribeEvent public void registerOre(OreDictionary.OreRegisterEvent aEvent) { - ModContainer tContainer = Loader.instance().activeModContainer(); + ModContainer tContainer = Loader.instance() + .activeModContainer(); String aMod = tContainer == null ? "UNKNOWN" : tContainer.getModId(); String aOriginalMod = aMod; if (GT_OreDictUnificator.isRegisteringOres()) { @@ -1582,7 +1597,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG || (aEvent.Ore.getItem() == null) || (aEvent.Name == null) || (aEvent.Name.isEmpty()) - || (aEvent.Name.replaceAll("_", "").length() - aEvent.Name.length() == 9)) { + || (aEvent.Name.replaceAll("_", "") + .length() + - aEvent.Name.length() == 9)) { if (aOriginalMod.equals("gregtech")) { aOriginalMod = "UNKNOWN"; } @@ -1595,11 +1612,16 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } try { aEvent.Ore.stackSize = 1; - if (this.mIgnoreTcon || aEvent.Ore.getUnlocalizedName().startsWith("item.oreberry")) { - if ((aOriginalMod.toLowerCase(Locale.ENGLISH).contains("xycraft")) - || (aOriginalMod.toLowerCase(Locale.ENGLISH).contains("tconstruct")) - || ((aOriginalMod.toLowerCase(Locale.ENGLISH).contains("natura")) - && (!aOriginalMod.toLowerCase(Locale.ENGLISH).contains("natural")))) { + if (this.mIgnoreTcon || aEvent.Ore.getUnlocalizedName() + .startsWith("item.oreberry")) { + if ((aOriginalMod.toLowerCase(Locale.ENGLISH) + .contains("xycraft")) + || (aOriginalMod.toLowerCase(Locale.ENGLISH) + .contains("tconstruct")) + || ((aOriginalMod.toLowerCase(Locale.ENGLISH) + .contains("natura")) + && (!aOriginalMod.toLowerCase(Locale.ENGLISH) + .contains("natural")))) { if (GT_Values.D1) { GT_Log.ore.println(aMod + " -> " + aEvent.Name + " is getting ignored, because of racism. :P"); } @@ -1689,8 +1711,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_Log.ore.println( tModToName + " is getting re-registered because the OreDict Name containing invalid spaces."); - GT_OreDictUnificator - .registerOre(aEvent.Name.replaceAll(" ", ""), GT_Utility.copyAmount(1L, aEvent.Ore)); + GT_OreDictUnificator.registerOre( + aEvent.Name.replaceAll(" ", ""), + GT_Utility.copyAmount(1L, aEvent.Ore)); aEvent.Ore.setStackDisplayName("Invalid OreDictionary Tag"); return; } else if (this.mInvalidNames.contains(aEvent.Name)) { @@ -1701,19 +1724,25 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG OrePrefixes aPrefix = OrePrefixes.getOrePrefix(aEvent.Name); Materials aMaterial = Materials._NULL; if ((aPrefix == OrePrefixes.nugget) && (aMod.equals("Thaumcraft")) - && (aEvent.Ore.getItem().getUnlocalizedName().contains("ItemResource"))) { + && (aEvent.Ore.getItem() + .getUnlocalizedName() + .contains("ItemResource"))) { return; } if (aPrefix == null) { - if (aEvent.Name.toLowerCase().equals(aEvent.Name)) { + if (aEvent.Name.toLowerCase() + .equals(aEvent.Name)) { GT_Log.ore.println(tModToName + " is invalid due to being solely lowercased."); return; - } else if (aEvent.Name.toUpperCase().equals(aEvent.Name)) { - GT_Log.ore.println(tModToName + " is invalid due to being solely uppercased."); - return; - } else if (Character.isUpperCase(aEvent.Name.charAt(0))) { - GT_Log.ore.println(tModToName + " is invalid due to the first character being uppercased."); - } + } else if (aEvent.Name.toUpperCase() + .equals(aEvent.Name)) { + GT_Log.ore.println( + tModToName + " is invalid due to being solely uppercased."); + return; + } else + if (Character.isUpperCase(aEvent.Name.charAt(0))) { + GT_Log.ore.println(tModToName + " is invalid due to the first character being uppercased."); + } } else { if (aPrefix.mDontUnificateActively) { GT_OreDictUnificator.addToBlacklist(aEvent.Ore); @@ -1749,9 +1778,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } if (aMaterial != Materials._NULL) { Materials tReRegisteredMaterial; - for (Iterator i$ = aMaterial.mOreReRegistrations.iterator(); i$ - .hasNext(); GT_OreDictUnificator - .registerOre(aPrefix, tReRegisteredMaterial, aEvent.Ore)) { + for (Iterator i$ = aMaterial.mOreReRegistrations.iterator(); i$.hasNext(); GT_OreDictUnificator.registerOre( + aPrefix, + tReRegisteredMaterial, + aEvent.Ore)) { tReRegisteredMaterial = (Materials) i$.next(); } aMaterial.add(GT_Utility.copyAmount(1L, aEvent.Ore)); @@ -1822,8 +1852,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG if (aMaterial == Materials.Tin) { GT_OreDictUnificator.registerOre(OreDictNames.craftingWireTin, aEvent.Ore); } else if (aMaterial == Materials.AnyCopper) { - GT_OreDictUnificator - .registerOre(OreDictNames.craftingWireCopper, aEvent.Ore); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingWireCopper, + aEvent.Ore); } else if (aMaterial == Materials.Gold) { GT_OreDictUnificator.registerOre(OreDictNames.craftingWireGold, aEvent.Ore); } else if (aMaterial == Materials.AnyIron) { @@ -1834,8 +1865,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG if ((aMaterial.contains(SubTag.TRANSPARENT)) && (aMaterial.mColor != Dyes._NULL)) { GT_OreDictUnificator.registerOre( - "craftingLens" - + aMaterial.mColor.toString().replaceFirst("dye", ""), + "craftingLens" + aMaterial.mColor.toString() + .replaceFirst("dye", ""), aEvent.Ore); } break; @@ -1905,40 +1936,66 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } else if (aMaterial == Materials.Knightmetal) { GT_OreDictUnificator.registerOre("knightmetal", aEvent.Ore); } else if ((aMaterial == Materials.Brass) && (aEvent.Ore.getItemDamage() == 2) - && (aEvent.Ore.getUnlocalizedName().equals("item.ingotBrass")) + && (aEvent.Ore.getUnlocalizedName() + .equals("item.ingotBrass")) && (new ItemStack(aEvent.Ore.getItem(), 1, 0).getUnlocalizedName() - .contains("red"))) { - GT_OreDictUnificator.set( - OrePrefixes.ingot, - Materials.RedAlloy, - new ItemStack(aEvent.Ore.getItem(), 1, 0)); - GT_OreDictUnificator.set( - OrePrefixes.ingot, - Materials.BlueAlloy, - new ItemStack(aEvent.Ore.getItem(), 1, 1)); - GT_OreDictUnificator.set( - OrePrefixes.ingot, - Materials.Brass, - new ItemStack(aEvent.Ore.getItem(), 1, 2)); - if (!mDisableIC2Cables) { - GT_Values.RA.addWiremillRecipe( - GT_ModHandler.getIC2Item("copperCableItem", 3L), - new ItemStack(aEvent.Ore.getItem(), 1, 8), - 400, - 1); - GT_Values.RA.addWiremillRecipe( - GT_ModHandler.getIC2Item("ironCableItem", 6L), - new ItemStack(aEvent.Ore.getItem(), 1, 9), - 400, - 2); - } - GT_Values.RA.addCutterRecipe( - new ItemStack(aEvent.Ore.getItem(), 1, 3), - new ItemStack(aEvent.Ore.getItem(), 16, 4), - null, - 400, - 8); - } + .contains("red"))) { + GT_OreDictUnificator.set( + OrePrefixes.ingot, + Materials.RedAlloy, + new ItemStack( + aEvent.Ore.getItem(), + 1, + 0)); + GT_OreDictUnificator.set( + OrePrefixes.ingot, + Materials.BlueAlloy, + new ItemStack( + aEvent.Ore.getItem(), + 1, + 1)); + GT_OreDictUnificator.set( + OrePrefixes.ingot, + Materials.Brass, + new ItemStack( + aEvent.Ore.getItem(), + 1, + 2)); + if (!mDisableIC2Cables) { + GT_Values.RA.addWiremillRecipe( + GT_ModHandler.getIC2Item( + "copperCableItem", + 3L), + new ItemStack( + aEvent.Ore.getItem(), + 1, + 8), + 400, + 1); + GT_Values.RA.addWiremillRecipe( + GT_ModHandler.getIC2Item( + "ironCableItem", + 6L), + new ItemStack( + aEvent.Ore.getItem(), + 1, + 9), + 400, + 2); + } + GT_Values.RA.addCutterRecipe( + new ItemStack( + aEvent.Ore.getItem(), + 1, + 3), + new ItemStack( + aEvent.Ore.getItem(), + 16, + 4), + null, + 400, + 8); + } break; default: break; @@ -1948,7 +2005,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } } else { for (Dyes tDye : Dyes.VALUES) { - if (aEvent.Name.endsWith(tDye.name().replaceFirst("dye", ""))) { + if (aEvent.Name.endsWith( + tDye.name() + .replaceFirst("dye", ""))) { GT_OreDictUnificator.addToBlacklist(aEvent.Ore); GT_Log.ore.println( tModToName @@ -2049,8 +2108,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG int size = 5; int sizeStep = mEvents.size() / 20 - 1; GT_Proxy.OreDictEventContainer tEvent; - for (Iterator<GT_Proxy.OreDictEventContainer> i$ = mEvents.iterator(); i$.hasNext(); GT_Proxy - .registerRecipes(tEvent)) { + for (Iterator<GT_Proxy.OreDictEventContainer> i$ = mEvents.iterator(); i$.hasNext(); GT_Proxy.registerRecipes( + tEvent)) { tEvent = i$.next(); sizeStep--; if (sizeStep == 0) { @@ -2147,8 +2206,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG && (((EntityLivingBase) tEntity).getHealth() > 0.0F)) { List tList = tEntity.worldObj.getEntitiesWithinAABBExcludingEntity( tEntity, - tEntity.boundingBox - .expand(0.20000000298023224D, 0.0D, 0.20000000298023224D)); + tEntity.boundingBox.expand( + 0.20000000298023224D, + 0.0D, + 0.20000000298023224D)); Class tClass = tEntity.getClass(); int tEntityCount = 1; if (tList != null) { @@ -2361,8 +2422,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } private static List<String> getOreDictNames(ItemStack stack) { - return Arrays.stream(OreDictionary.getOreIDs(stack)).mapToObj(OreDictionary::getOreName) - .collect(Collectors.toList()); + return Arrays.stream(OreDictionary.getOreIDs(stack)) + .mapToObj(OreDictionary::getOreName) + .collect(Collectors.toList()); } @Override @@ -2372,8 +2434,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } int rFuelValue = 0; if ((aFuel.getItem() instanceof GT_MetaGenerated_Item)) { - final Short tFuelValue = ((GT_MetaGenerated_Item) aFuel.getItem()).mBurnValues - .get((short) aFuel.getItemDamage()); + final Short tFuelValue = ((GT_MetaGenerated_Item) aFuel.getItem()).mBurnValues.get( + (short) aFuel.getItemDamage()); if (tFuelValue != null) { rFuelValue = Math.max(rFuelValue, tFuelValue); } @@ -2387,7 +2449,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG // If not check the ore dict rFuelValue = Math.max( rFuelValue, - getOreDictNames(aFuel).stream().mapToInt(f -> oreDictBurnTimes.getOrDefault(f, 0)).max().orElse(0)); + getOreDictNames(aFuel).stream() + .mapToInt(f -> oreDictBurnTimes.getOrDefault(f, 0)) + .max() + .orElse(0)); } // If we have something from the GT MetaGenerated_Item, ItemFuelValue, or OreDict return @@ -2414,13 +2479,16 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG : "autogenerated"; return GT_FluidFactory.builder(aMaterial.mName.toLowerCase(Locale.ENGLISH)) - .withLocalizedName(aMaterial.mDefaultLocalName).withTextureName(fluidTexture) - .withColorRGBA(aMaterial.mRGBa).withStateAndTemperature(LIQUID, aMaterial.getLiquidTemperature()) - .buildAndRegister().configureMaterials(aMaterial) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), - ItemList.Cell_Empty.get(1L)) - .asFluid(); + .withLocalizedName(aMaterial.mDefaultLocalName) + .withTextureName(fluidTexture) + .withColorRGBA(aMaterial.mRGBa) + .withStateAndTemperature(LIQUID, aMaterial.getLiquidTemperature()) + .buildAndRegister() + .configureMaterials(aMaterial) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), + ItemList.Cell_Empty.get(1L)) + .asFluid(); } public Fluid addAutoGeneratedCorrespondingGas(Materials aMaterial) { @@ -2431,13 +2499,16 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG : "autogenerated"; return GT_FluidFactory.builder(aMaterial.mName.toLowerCase(Locale.ENGLISH)) - .withLocalizedName(aMaterial.mDefaultLocalName).withTextureName(fluidTexture) - .withColorRGBA(aMaterial.mRGBa).withStateAndTemperature(GAS, aMaterial.getGasTemperature()) - .buildAndRegister().configureMaterials(aMaterial) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), - ItemList.Cell_Empty.get(1L)) - .asFluid(); + .withLocalizedName(aMaterial.mDefaultLocalName) + .withTextureName(fluidTexture) + .withColorRGBA(aMaterial.mRGBa) + .withStateAndTemperature(GAS, aMaterial.getGasTemperature()) + .buildAndRegister() + .configureMaterials(aMaterial) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), + ItemList.Cell_Empty.get(1L)) + .asFluid(); } public Fluid addAutogeneratedPlasmaFluid(Materials aMaterial) { @@ -2448,14 +2519,17 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG : "plasma.autogenerated"; return GT_FluidFactory.builder("plasma." + aMaterial.mName.toLowerCase(Locale.ENGLISH)) - .withLocalizedName(aMaterial.mDefaultLocalName + " Plasma").withTextureName(fluidTexture) - .withColorRGBA(aMaterial.mMoltenRGBa).withStateAndTemperature(PLASMA, 10000).buildAndRegister() - .configureMaterials(aMaterial) - .registerContainers( - GT_OreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L), - ItemList.Cell_Empty.get(1L), - aMaterial.getMolten(1) != null ? 144 : 1000) - .asFluid(); + .withLocalizedName(aMaterial.mDefaultLocalName + " Plasma") + .withTextureName(fluidTexture) + .withColorRGBA(aMaterial.mMoltenRGBa) + .withStateAndTemperature(PLASMA, 10000) + .buildAndRegister() + .configureMaterials(aMaterial) + .registerContainers( + GT_OreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L), + ItemList.Cell_Empty.get(1L), + aMaterial.getMolten(1) != null ? 144 : 1000) + .asFluid(); } public Fluid addAutogeneratedMoltenFluid(Materials aMaterial) { @@ -2466,15 +2540,19 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG : "molten.autogenerated"; return GT_FluidFactory.builder("molten." + aMaterial.mName.toLowerCase(Locale.ENGLISH)) - .withLocalizedName("Molten " + aMaterial.mDefaultLocalName).withTextureName(fluidTexture) - .withColorRGBA(aMaterial.mMoltenRGBa) - .withStateAndTemperature(MOLTEN, aMaterial.mMeltingPoint < 0 ? 1000 : aMaterial.mMeltingPoint) - .buildAndRegister().configureMaterials(aMaterial) - .registerContainers( - GT_OreDictUnificator.get(OrePrefixes.cellMolten, aMaterial, 1L), - ItemList.Cell_Empty.get(1L), - 144) - .asFluid(); + .withLocalizedName("Molten " + aMaterial.mDefaultLocalName) + .withTextureName(fluidTexture) + .withColorRGBA(aMaterial.mMoltenRGBa) + .withStateAndTemperature( + MOLTEN, + aMaterial.mMeltingPoint < 0 ? 1000 : aMaterial.mMeltingPoint) + .buildAndRegister() + .configureMaterials(aMaterial) + .registerContainers( + GT_OreDictUnificator.get(OrePrefixes.cellMolten, aMaterial, 1L), + ItemList.Cell_Empty.get(1L), + 144) + .asFluid(); } // ------------------------------------------------------------------------------------------------------------ @@ -2492,13 +2570,17 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } else return; for (int i = 0; i < 3; i++) { crackedFluids[i] = GT_FluidFactory.builder(namePrefixes[i] + aMaterial.mName.toLowerCase(Locale.ENGLISH)) - .withIconsFrom(uncrackedFluid) - .withLocalizedName(orePrefixes[i].mLocalizedMaterialPre + aMaterial.mDefaultLocalName) - .withColorRGBA(aMaterial.mRGBa).withStateAndTemperature(GAS, 775).buildAndRegister() - .registerBContainers( - GT_OreDictUnificator.get(orePrefixes[i], aMaterial, 1L), - ItemList.Cell_Empty.get(1L)) - .asFluid(); + .withIconsFrom(uncrackedFluid) + .withLocalizedName( + orePrefixes[i].mLocalizedMaterialPre + + aMaterial.mDefaultLocalName) + .withColorRGBA(aMaterial.mRGBa) + .withStateAndTemperature(GAS, 775) + .buildAndRegister() + .registerBContainers( + GT_OreDictUnificator.get(orePrefixes[i], aMaterial, 1L), + ItemList.Cell_Empty.get(1L)) + .asFluid(); int hydrogenAmount = 2 * i + 2; GT_Values.RA.addCrackingRecipe( @@ -2541,13 +2623,17 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } else return; for (int i = 0; i < 3; i++) { crackedFluids[i] = GT_FluidFactory.builder(namePrefixes[i] + aMaterial.mName.toLowerCase(Locale.ENGLISH)) - .withIconsFrom(uncrackedFluid) - .withLocalizedName(orePrefixes[i].mLocalizedMaterialPre + aMaterial.mDefaultLocalName) - .withColorRGBA(aMaterial.mRGBa).withStateAndTemperature(GAS, 775).buildAndRegister() - .registerBContainers( - GT_OreDictUnificator.get(orePrefixes[i], aMaterial, 1L), - ItemList.Cell_Empty.get(1L)) - .asFluid(); + .withIconsFrom(uncrackedFluid) + .withLocalizedName( + orePrefixes[i].mLocalizedMaterialPre + + aMaterial.mDefaultLocalName) + .withColorRGBA(aMaterial.mRGBa) + .withStateAndTemperature(GAS, 775) + .buildAndRegister() + .registerBContainers( + GT_OreDictUnificator.get(orePrefixes[i], aMaterial, 1L), + ItemList.Cell_Empty.get(1L)) + .asFluid(); GT_Values.RA.addCrackingRecipe( i + 1, @@ -2593,10 +2679,13 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG @Deprecated public Fluid addFluid(String aName, String aLocalized, Materials aMaterial, int aState, int aTemperatureK, ItemStack aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) { - return GT_FluidFactory.builder(aName).withLocalizedName(aLocalized) - .withStateAndTemperature(FluidState.fromValue(aState), aTemperatureK).buildAndRegister() - .configureMaterials(aMaterial).registerContainers(aFullContainer, aEmptyContainer, aFluidAmount) - .asFluid(); + return GT_FluidFactory.builder(aName) + .withLocalizedName(aLocalized) + .withStateAndTemperature(FluidState.fromValue(aState), aTemperatureK) + .buildAndRegister() + .configureMaterials(aMaterial) + .registerContainers(aFullContainer, aEmptyContainer, aFluidAmount) + .asFluid(); } /** @@ -2606,15 +2695,21 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG @SuppressWarnings({ "MethodWithTooManyParameters" }) // Deprecated method public Fluid addFluid(String aName, String aTexture, String aLocalized, Materials aMaterial, short[] aRGBa, int aState, int aTemperatureK, ItemStack aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) { - return GT_FluidFactory.builder(aName).withLocalizedName(aLocalized) - .withStillIconResourceLocation(new ResourceLocation(MOD_ID, "fluids/fluid." + aTexture)) - .withColorRGBA(aRGBa).withStateAndTemperature(FluidState.fromValue(aState), aTemperatureK) - .buildAndRegister().configureMaterials(aMaterial) - .registerContainers(aFullContainer, aEmptyContainer, aFluidAmount).asFluid(); + return GT_FluidFactory.builder(aName) + .withLocalizedName(aLocalized) + .withStillIconResourceLocation(new ResourceLocation(MOD_ID, "fluids/fluid." + aTexture)) + .withColorRGBA(aRGBa) + .withStateAndTemperature(FluidState.fromValue(aState), aTemperatureK) + .buildAndRegister() + .configureMaterials(aMaterial) + .registerContainers(aFullContainer, aEmptyContainer, aFluidAmount) + .asFluid(); } public File getSaveDirectory() { - return this.mUniverse == null ? null : this.mUniverse.getSaveHandler().getWorldDirectory(); + return this.mUniverse == null ? null + : this.mUniverse.getSaveHandler() + .getWorldDirectory(); } public long getAnimationTicks() { @@ -2644,22 +2739,29 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG tOre.mEvent.Ore, (GregTech_API.sUnification.get( new StringBuilder().append(ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID).toString(), + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); continue; } else if (tOre.mModID.equalsIgnoreCase("thermalfoundation") && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Blizz) { - GT_OreDictUnificator - .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); GT_OreDictUnificator.set( tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get( new StringBuilder().append(ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID).toString(), + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2667,16 +2769,21 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } else if (tOre.mModID.equalsIgnoreCase("thermalfoundation") && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Pyrotheum) { - GT_OreDictUnificator - .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); GT_OreDictUnificator.set( tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get( - new StringBuilder() - .append(ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID).toString(), + new StringBuilder().append( + ConfigCategories.specialunificationtargets) + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2684,16 +2791,21 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } else if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Vinteum) { - GT_OreDictUnificator - .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); + GT_OreDictUnificator.addAssociation( + tOre.mPrefix, + tOre.mMaterial, + tOre.mEvent.Ore, + false); GT_OreDictUnificator.set( tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get( - new StringBuilder() - .append(ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID).toString(), + new StringBuilder().append( + ConfigCategories.specialunificationtargets) + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2711,9 +2823,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get( - new StringBuilder() - .append(ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID).toString(), + new StringBuilder().append( + ConfigCategories.specialunificationtargets) + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2733,7 +2847,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG (GregTech_API.sUnification.get( new StringBuilder().append( ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID).toString(), + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2754,7 +2870,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG (GregTech_API.sUnification.get( new StringBuilder().append( ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID).toString(), + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2775,8 +2893,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG (GregTech_API.sUnification.get( new StringBuilder().append( ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID) - .toString(), + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2797,8 +2916,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG (GregTech_API.sUnification.get( new StringBuilder().append( ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID) - .toString(), + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2819,8 +2939,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG (GregTech_API.sUnification.get( new StringBuilder().append( ConfigCategories.specialunificationtargets) - .append(".").append(tOre.mModID) - .toString(), + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2841,9 +2962,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG (GregTech_API.sUnification.get( new StringBuilder().append( ConfigCategories.specialunificationtargets) - .append(".") - .append(tOre.mModID) - .toString(), + .append(".") + .append( + tOre.mModID) + .toString(), tOre.mEvent.Name, true)), true); @@ -2859,8 +2981,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG tOre.mMaterial, tOre.mEvent.Ore, (chkmi) && (GregTech_API.sUnification.get( - new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".") - .append(tOre.mModID).toString(), + new StringBuilder().append(ConfigCategories.specialunificationtargets) + .append(".") + .append(tOre.mModID) + .toString(), tOre.mEvent.Name, false)), true); @@ -2880,8 +3004,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG tOre.mMaterial, tOre.mEvent.Ore, (tOre.mModID != null) && (GregTech_API.sUnification.get( - new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".") - .append(tOre.mModID), + new StringBuilder().append(ConfigCategories.specialunificationtargets) + .append(".") + .append(tOre.mModID), tOre.mEvent.Name, false)), true); @@ -2977,7 +3102,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG @SubscribeEvent public void onBlockEvent(BlockEvent event) { - if (event.block.getUnlocalizedName().equals("blockAlloyGlass")) + if (event.block.getUnlocalizedName() + .equals("blockAlloyGlass")) GregTech_API.causeMachineUpdate(event.world, event.x, event.y, event.z); } diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 0e4c6e8c9a..5c7ac4cd4a 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -51,7 +51,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (aInput1 == null || aInput2 == null || aOutput1 == null || aDuration < 1 || aEUt < 1 || aStartEU < 1) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("fusion", aOutput1.getFluid().getName(), aDuration)) <= 0) { + if ((aDuration = GregTech_API.sRecipeFile.get( + "fusion", + aOutput1.getFluid() + .getName(), + aDuration)) <= 0) { return false; } GT_Recipe.GT_Recipe_Map.sFusionRecipes.addRecipe( @@ -163,8 +167,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput1 != null) && ((aDuration = GregTech_API.sRecipeFile.get("centrifuge", aInput1, aDuration)) <= 0)) { return false; } - if ((aFluidInput != null) && ((aDuration = GregTech_API.sRecipeFile - .get("centrifuge", aFluidInput.getFluid().getName(), aDuration)) <= 0)) { + if ((aFluidInput != null) && ((aDuration = GregTech_API.sRecipeFile.get( + "centrifuge", + aFluidInput.getFluid() + .getName(), + aDuration)) <= 0)) { return false; } if (!GT_Mod.gregtechproxy.mEnableCleanroom) { @@ -274,8 +281,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { && ((aDuration = GregTech_API.sRecipeFile.get("electrolyzer", aInput1, aDuration)) <= 0)) { return false; } - if ((aFluidInput != null) && ((aDuration = GregTech_API.sRecipeFile - .get("electrolyzer", aFluidInput.getFluid().getName(), aDuration)) <= 0)) { + if ((aFluidInput != null) && ((aDuration = GregTech_API.sRecipeFile.get( + "electrolyzer", + aFluidInput.getFluid() + .getName(), + aDuration)) <= 0)) { return false; } GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.addRecipe( @@ -395,8 +405,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { && ((aDuration = GregTech_API.sRecipeFile.get("chemicalreactor", aOutput, aDuration)) <= 0)) { return false; } - if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile - .get("chemicalreactor", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) { + if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get( + "chemicalreactor", + aFluidOutput.getFluid() + .getName(), + aDuration)) <= 0)) { return false; } if (aEUtick <= 0) { @@ -444,8 +457,17 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (aEUtick <= 0) { return false; } - GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes - .addRecipe(false, aInputs, aOutputs, null, null, aFluidInputs, aFluidOutputs, aDuration, aEUtick, 0); + GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.addRecipe( + false, + aInputs, + aOutputs, + null, + null, + aFluidInputs, + aFluidOutputs, + aDuration, + aEUtick, + 0); return true; } @@ -460,8 +482,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { && ((aDuration = GregTech_API.sRecipeFile.get("chemicalreactor", aOutput, aDuration)) <= 0)) { return false; } - if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile - .get("chemicalreactor", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) { + if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get( + "chemicalreactor", + aFluidOutput.getFluid() + .getName(), + aDuration)) <= 0)) { return false; } if (aEUtick <= 0) { @@ -861,7 +886,8 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInputs == null) || (aOutputs == null) || aInputs.length == 0 || aOutputs.length == 0) { return false; } - if (Arrays.stream(aOutputs).noneMatch(Objects::nonNull)) { + if (Arrays.stream(aOutputs) + .noneMatch(Objects::nonNull)) { return false; } if ((aDuration = GregTech_API.sRecipeFile.get("cutting", aInputs[0], aDuration)) <= 0) { @@ -992,7 +1018,8 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { } for (int oreID : OreDictionary.getOreIDs(aOutput1)) { - if (OreDictionary.getOreName(oreID).startsWith("circuit")) { + if (OreDictionary.getOreName(oreID) + .startsWith("circuit")) { return this.addAssemblerRecipeNonOD(aInputs, aFluidInput, aOutput1, aDuration, aEUt, aCleanroom); } } @@ -1676,8 +1703,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("fermenting", aOutput.getFluid().getUnlocalizedName(), aDuration)) - <= 0) { + if ((aDuration = GregTech_API.sRecipeFile.get( + "fermenting", + aOutput.getFluid() + .getUnlocalizedName(), + aDuration)) <= 0) { return false; } GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sFermentingRecipes.addRecipe( @@ -1707,8 +1737,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("distillery", aOutput.getFluid().getUnlocalizedName(), aDuration)) - <= 0) { + if ((aDuration = GregTech_API.sRecipeFile.get( + "distillery", + aOutput.getFluid() + .getUnlocalizedName(), + aDuration)) <= 0) { return false; } // reduce the batch size if fluid amount is exceeding @@ -2230,9 +2263,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("mixer", aOutput, aDuration)) <= 0)) { return false; } - if ((aFluidOutput != null) - && ((aDuration = GregTech_API.sRecipeFile.get("mixer", aFluidOutput.getFluid().getName(), aDuration)) - <= 0)) { + if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get( + "mixer", + aFluidOutput.getFluid() + .getName(), + aDuration)) <= 0)) { return false; } GT_Recipe.GT_Recipe_Map.sMixerRecipes.addRecipe( @@ -2274,8 +2309,17 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { oNumber++; } - GT_Recipe.GT_Recipe_Map.sMultiblockMixerRecipes - .addRecipe(false, itemInputs, itemOutputs, null, null, fluidInputs, fluidOutputs, aDuration, aEUt, 0); + GT_Recipe.GT_Recipe_Map.sMultiblockMixerRecipes.addRecipe( + false, + itemInputs, + itemOutputs, + null, + null, + fluidInputs, + fluidOutputs, + aDuration, + aEUt, + 0); return true; } @@ -2374,9 +2418,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aOutput1 != null) && ((aDuration = GregTech_API.sRecipeFile.get("mixer", aOutput1, aDuration)) <= 0)) { return false; } - if ((aFluidOutput != null) - && ((aDuration = GregTech_API.sRecipeFile.get("mixer", aFluidOutput.getFluid().getName(), aDuration)) - <= 0)) { + if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get( + "mixer", + aFluidOutput.getFluid() + .getName(), + aDuration)) <= 0)) { return false; } GT_Recipe.GT_Recipe_Map.sMixerRecipes.addRecipe( @@ -2418,8 +2464,17 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { oNumber++; } - GT_Recipe.GT_Recipe_Map.sMultiblockMixerRecipes - .addRecipe(false, itemInputs, itemOutputs, null, null, fluidInputs, fluidOutputs, aDuration, aEUt, 0); + GT_Recipe.GT_Recipe_Map.sMultiblockMixerRecipes.addRecipe( + false, + itemInputs, + itemOutputs, + null, + null, + fluidInputs, + fluidOutputs, + aDuration, + aEUt, + 0); return true; } @@ -2501,8 +2556,16 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((ItemInputArray == null) || (OutputItemArray == null)) { return false; } - GT_Recipe.GT_Recipe_Map.sPressRecipes - .addRecipe(true, ItemInputArray, OutputItemArray, null, null, null, aDuration, aEUt, 0); + GT_Recipe.GT_Recipe_Map.sPressRecipes.addRecipe( + true, + ItemInputArray, + OutputItemArray, + null, + null, + null, + aDuration, + aEUt, + 0); return true; } @@ -2511,8 +2574,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aItem == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile - .get("fluidheater", aOutput.getFluid().getUnlocalizedName(), aDuration)) <= 0) { + if ((aDuration = GregTech_API.sRecipeFile.get( + "fluidheater", + aOutput.getFluid() + .getUnlocalizedName(), + aDuration)) <= 0) { return false; } GT_Recipe.GT_Recipe_Map.sFluidHeaterRecipes.addRecipe( @@ -2534,8 +2600,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aInput == null) || (aOutput == null)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile - .get("fluidheater", aOutput.getFluid().getUnlocalizedName(), aDuration)) <= 0) { + if ((aDuration = GregTech_API.sRecipeFile.get( + "fluidheater", + aOutput.getFluid() + .getUnlocalizedName(), + aDuration)) <= 0) { return false; } GT_Recipe.GT_Recipe_Map.sFluidHeaterRecipes.addRecipe( @@ -2923,11 +2992,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { try { // sort the output, so the hash code is stable across launches tList.sort( - Comparator - .<ItemStack, String>comparing( - s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).modId) - .thenComparing(s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).name) - .thenComparingInt(Items.feather::getDamage).thenComparingInt(s -> s.stackSize)); + Comparator.<ItemStack, String>comparing( + s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).modId) + .thenComparing(s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).name) + .thenComparingInt(Items.feather::getDamage) + .thenComparingInt(s -> s.stackSize)); int tAmount = ((Number) objs[1]).intValue(); List<ItemStack> uList = new ArrayList<>(); for (ItemStack tStack : tList) { @@ -3023,7 +3092,8 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { } for (int oreID : OreDictionary.getOreIDs(aOutput)) { - if (OreDictionary.getOreName(oreID).startsWith("circuit")) { + if (OreDictionary.getOreName(oreID) + .startsWith("circuit")) { return this.addCircuitAssemblerRecipeNonOredicted( aInputs, aFluidInput, diff --git a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java index 2cd845fadf..a7a2f0d4ee 100644 --- a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java +++ b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java @@ -123,8 +123,9 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { private static final AspectList getAspectList(List<TC_Aspects.TC_AspectStack> aAspects) { AspectList rAspects = new AspectList(); TC_Aspects.TC_AspectStack tAspect; - for (Iterator i$ = aAspects.iterator(); i$.hasNext(); rAspects - .add((Aspect) tAspect.mAspect.mAspect, (int) tAspect.mAmount)) { + for (Iterator i$ = aAspects.iterator(); i$.hasNext(); rAspects.add( + (Aspect) tAspect.mAspect.mAspect, + (int) tAspect.mAmount)) { tAspect = (TC_Aspects.TC_AspectStack) i$.next(); } return rAspects; @@ -141,7 +142,8 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { if (tCategory == null) { return null; } - for (Iterator i$ = tCategory.research.values().iterator(); i$.hasNext();) { + for (Iterator i$ = tCategory.research.values() + .iterator(); i$.hasNext();) { ResearchItem tResearch = (ResearchItem) i$.next(); if ((tResearch.displayColumn == aX) && (tResearch.displayRow == aY)) { aX += (aX > 0 ? 5 : -5); diff --git a/src/main/java/gregtech/common/GT_UndergroundOil.java b/src/main/java/gregtech/common/GT_UndergroundOil.java index 482ff54c02..1372855926 100644 --- a/src/main/java/gregtech/common/GT_UndergroundOil.java +++ b/src/main/java/gregtech/common/GT_UndergroundOil.java @@ -41,7 +41,10 @@ public class GT_UndergroundOil { * @see #undergroundOil(World, int, int, float) */ public static FluidStack undergroundOilReadInformation(IGregTechTileEntity te) { - return undergroundOil(te.getWorld().getChunkFromBlockCoords(te.getXCoord(), te.getZCoord()), -1); + return undergroundOil( + te.getWorld() + .getChunkFromBlockCoords(te.getXCoord(), te.getZCoord()), + -1); } /** @@ -56,7 +59,8 @@ public class GT_UndergroundOil { /** @see #undergroundOil(World, int, int, float) */ public static FluidStack undergroundOil(IGregTechTileEntity te, float readOrDrainCoefficient) { return undergroundOil( - te.getWorld().getChunkFromBlockCoords(te.getXCoord(), te.getZCoord()), + te.getWorld() + .getChunkFromBlockCoords(te.getXCoord(), te.getZCoord()), readOrDrainCoefficient); } @@ -108,8 +112,8 @@ public class GT_UndergroundOil { chunkData.setAmount(0); } else { // get the expected current output - fluidInChunk.amount = (int) Math - .floor(chunkData.getAmount() * (double) -readOrDrainCoefficient / DIVIDER); + fluidInChunk.amount = (int) Math.floor( + chunkData.getAmount() * (double) -readOrDrainCoefficient / DIVIDER); } } return fluidInChunk; @@ -140,11 +144,19 @@ public class GT_UndergroundOil { } static void migrate(ChunkDataEvent.Load e) { - if (e.getData().hasKey("GTOIL") && e.getData().hasKey("GTOILFLUID")) { + if (e.getData() + .hasKey("GTOIL") + && e.getData() + .hasKey("GTOILFLUID")) { ChunkData chunkData = STORAGE.get(e.getChunk()); Fluid fluid = chunkData.getFluid(); - if (fluid != null && fluid.getID() == e.getData().getInteger("GTOILFLUID")) - chunkData.setAmount(Math.min(chunkData.getAmount(), e.getData().getInteger("GTOIL"))); + if (fluid != null && fluid.getID() == e.getData() + .getInteger("GTOILFLUID")) + chunkData.setAmount( + Math.min( + chunkData.getAmount(), + e.getData() + .getInteger("GTOIL"))); } } @@ -215,7 +227,8 @@ public class GT_UndergroundOil { if (hash == 0) return NIL_FLUID_STACK; return new GT_UndergroundOil.ChunkData( amount, - GT_Mod.gregtechproxy.mUndergroundOil.GetDimension(world.provider.dimensionId).getUOFluid(veinKey), + GT_Mod.gregtechproxy.mUndergroundOil.GetDimension(world.provider.dimensionId) + .getUOFluid(veinKey), veinKey); } diff --git a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java index 737cd530f7..f11d6d0640 100644 --- a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java +++ b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java @@ -67,22 +67,37 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { mMaxY = (short) (this.mMinY + 9); } this.mMaxY = mMaxY; - this.mWeight = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight)); - this.mDensity = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "Density", aDensity)); - this.mSize = ((short) Math - .max(1, GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize))); - this.mPrimaryMeta = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer", aPrimary)); - this.mSecondaryMeta = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OreSecondaryLayer", aSecondary)); - this.mBetweenMeta = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween", aBetween)); - this.mSporadicMeta = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OreSporaticlyAround", aSporadic)); - this.mRestrictBiome = GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None"); + this.mWeight = ((short) GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "RandomWeight", + aWeight)); + this.mDensity = ((short) GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "Density", + aDensity)); + this.mSize = ((short) Math.max( + 1, + GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize))); + this.mPrimaryMeta = ((short) GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "OrePrimaryLayer", + aPrimary)); + this.mSecondaryMeta = ((short) GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "OreSecondaryLayer", + aSecondary)); + this.mBetweenMeta = ((short) GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "OreSporadiclyInbetween", + aBetween)); + this.mSporadicMeta = ((short) GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "OreSporaticlyAround", + aSporadic)); + this.mRestrictBiome = GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "RestrictToBiomeName", + "None"); if (this.mEnabled) { sWeight += this.mWeight; @@ -125,22 +140,37 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { mMaxY = (short) (this.mMinY + 9); } this.mMaxY = mMaxY; - this.mWeight = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight)); - this.mDensity = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "Density", aDensity)); - this.mSize = ((short) Math - .max(1, GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize))); - this.mPrimaryMeta = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer", aPrimary.mMetaItemSubID)); - this.mSecondaryMeta = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OreSecondaryLayer", aSecondary.mMetaItemSubID)); - this.mBetweenMeta = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween", aBetween.mMetaItemSubID)); - this.mSporadicMeta = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "OreSporaticlyAround", aSporadic.mMetaItemSubID)); - this.mRestrictBiome = GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None"); + this.mWeight = ((short) GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "RandomWeight", + aWeight)); + this.mDensity = ((short) GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "Density", + aDensity)); + this.mSize = ((short) Math.max( + 1, + GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize))); + this.mPrimaryMeta = ((short) GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "OrePrimaryLayer", + aPrimary.mMetaItemSubID)); + this.mSecondaryMeta = ((short) GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "OreSecondaryLayer", + aSecondary.mMetaItemSubID)); + this.mBetweenMeta = ((short) GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "OreSporadiclyInbetween", + aBetween.mMetaItemSubID)); + this.mSporadicMeta = ((short) GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "OreSporaticlyAround", + aSporadic.mMetaItemSubID)); + this.mRestrictBiome = GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "RestrictToBiomeName", + "None"); if (this.mEnabled) { sWeight += this.mWeight; @@ -246,8 +276,8 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { // should always be max density due to truncation of Math.sqrt(). int localDensity = Math.max( 1, - this.mDensity / ((int) Math - .sqrt(2 + Math.pow(aChunkX / 16 - aSeedX / 16, 2) + Math.pow(aChunkZ / 16 - aSeedZ / 16, 2)))); + this.mDensity / ((int) Math.sqrt( + 2 + Math.pow(aChunkX / 16 - aSeedX / 16, 2) + Math.pow(aChunkZ / 16 - aSeedZ / 16, 2)))); // To allow for early exit due to no ore placed in the bottom layer (probably because we are in the sky), unroll // 1 pass through the loop @@ -255,22 +285,35 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { // Layer -1 Secondary and Sporadic int level = tMinY - 1; // Dunno why, but the first layer is actually played one below tMinY. Go figure. for (int tX = wX; tX < eX; tX++) { - int placeX = Math - .max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity); + int placeX = Math.max( + 1, + Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity); for (int tZ = nZ; tZ < sZ; tZ++) { int placeZ = Math.max( 1, Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity); if (((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSecondaryMeta > 0)) { - if (GT_TileEntity_Ores - .setOreBlock(aWorld, tX, level, tZ, this.mSecondaryMeta, false, isUnderdark)) { + if (GT_TileEntity_Ores.setOreBlock( + aWorld, + tX, + level, + tZ, + this.mSecondaryMeta, + false, + isUnderdark)) { placeCount[1]++; } } else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate - if (GT_TileEntity_Ores - .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark)) + if (GT_TileEntity_Ores.setOreBlock( + aWorld, + tX, + level, + tZ, + this.mSporadicMeta, + false, + isUnderdark)) placeCount[3]++; } } @@ -291,15 +334,27 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { Math.max(MathHelper.abs_int(sZVein - tZ), MathHelper.abs_int(nZVein - tZ)) / localDensity); if (((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSecondaryMeta > 0)) { - if (GT_TileEntity_Ores - .setOreBlock(aWorld, tX, level, tZ, this.mSecondaryMeta, false, isUnderdark)) { + if (GT_TileEntity_Ores.setOreBlock( + aWorld, + tX, + level, + tZ, + this.mSecondaryMeta, + false, + isUnderdark)) { placeCount[1]++; } } else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate - if (GT_TileEntity_Ores - .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark)) + if (GT_TileEntity_Ores.setOreBlock( + aWorld, + tX, + level, + tZ, + this.mSporadicMeta, + false, + isUnderdark)) placeCount[3]++; } } @@ -307,8 +362,9 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { } // Layer 2 is Secondary, in-between, and sporadic for (int tX = wX; tX < eX; tX++) { - int placeX = Math - .max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity); + int placeX = Math.max( + 1, + Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity); for (int tZ = nZ; tZ < sZ; tZ++) { int placeZ = Math.max( 1, @@ -320,15 +376,27 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { } } else if (((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSecondaryMeta > 0)) { - if (GT_TileEntity_Ores - .setOreBlock(aWorld, tX, level, tZ, this.mSecondaryMeta, false, isUnderdark)) { + if (GT_TileEntity_Ores.setOreBlock( + aWorld, + tX, + level, + tZ, + this.mSecondaryMeta, + false, + isUnderdark)) { placeCount[1]++; } } else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate - if (GT_TileEntity_Ores - .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark)) + if (GT_TileEntity_Ores.setOreBlock( + aWorld, + tX, + level, + tZ, + this.mSporadicMeta, + false, + isUnderdark)) placeCount[3]++; } } @@ -336,8 +404,9 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { level++; // Increment level to next layer // Layer 3 is In-between, and sporadic for (int tX = wX; tX < eX; tX++) { - int placeX = Math - .max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity); + int placeX = Math.max( + 1, + Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity); for (int tZ = nZ; tZ < sZ; tZ++) { int placeZ = Math.max( 1, @@ -350,8 +419,14 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { } else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate - if (GT_TileEntity_Ores - .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark)) + if (GT_TileEntity_Ores.setOreBlock( + aWorld, + tX, + level, + tZ, + this.mSporadicMeta, + false, + isUnderdark)) placeCount[3]++; } } @@ -359,8 +434,9 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { level++; // Increment level to next layer // Layer 4 is In-between, Primary and sporadic for (int tX = wX; tX < eX; tX++) { - int placeX = Math - .max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity); + int placeX = Math.max( + 1, + Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity); for (int tZ = nZ; tZ < sZ; tZ++) { int placeZ = Math.max( 1, @@ -372,15 +448,27 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { } } else if (((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mPrimaryMeta > 0)) { - if (GT_TileEntity_Ores - .setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, isUnderdark)) { + if (GT_TileEntity_Ores.setOreBlock( + aWorld, + tX, + level, + tZ, + this.mPrimaryMeta, + false, + isUnderdark)) { placeCount[1]++; } } else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate - if (GT_TileEntity_Ores - .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark)) + if (GT_TileEntity_Ores.setOreBlock( + aWorld, + tX, + level, + tZ, + this.mSporadicMeta, + false, + isUnderdark)) placeCount[3]++; } } @@ -388,8 +476,9 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { level++; // Increment level to next layer // Layer 5 is In-between, Primary and sporadic for (int tX = wX; tX < eX; tX++) { - int placeX = Math - .max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity); + int placeX = Math.max( + 1, + Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity); for (int tZ = nZ; tZ < sZ; tZ++) { int placeZ = Math.max( 1, @@ -401,15 +490,27 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { } } else if (((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mPrimaryMeta > 0)) { - if (GT_TileEntity_Ores - .setOreBlock(aWorld, tX, level, tZ, this.mPrimaryMeta, false, isUnderdark)) { + if (GT_TileEntity_Ores.setOreBlock( + aWorld, + tX, + level, + tZ, + this.mPrimaryMeta, + false, + isUnderdark)) { placeCount[1]++; } } else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate - if (GT_TileEntity_Ores - .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark)) + if (GT_TileEntity_Ores.setOreBlock( + aWorld, + tX, + level, + tZ, + this.mSporadicMeta, + false, + isUnderdark)) placeCount[3]++; } } @@ -417,8 +518,9 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { level++; // Increment level to next layer // Layer 6 is Primary and sporadic for (int tX = wX; tX < eX; tX++) { - int placeX = Math - .max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity); + int placeX = Math.max( + 1, + Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity); for (int tZ = nZ; tZ < sZ; tZ++) { int placeZ = Math.max( 1, @@ -430,8 +532,14 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { } else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate - if (GT_TileEntity_Ores - .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark)) + if (GT_TileEntity_Ores.setOreBlock( + aWorld, + tX, + level, + tZ, + this.mSporadicMeta, + false, + isUnderdark)) placeCount[3]++; } } @@ -439,8 +547,9 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { level++; // Increment level to next layer // Layer 7 is Primary and sporadic for (int tX = wX; tX < eX; tX++) { - int placeX = Math - .max(1, Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity); + int placeX = Math.max( + 1, + Math.max(MathHelper.abs_int(wXVein - tX), MathHelper.abs_int(eXVein - tX)) / localDensity); for (int tZ = nZ; tZ < sZ; tZ++) { int placeZ = Math.max( 1, @@ -452,8 +561,14 @@ public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { } else if ((aRandom.nextInt(7) == 0) && ((aRandom.nextInt(placeZ) == 0) || (aRandom.nextInt(placeX) == 0)) && (this.mSporadicMeta > 0)) { // Sporadics are reduce by 1/7 to compensate - if (GT_TileEntity_Ores - .setOreBlock(aWorld, tX, level, tZ, this.mSporadicMeta, false, isUnderdark)) + if (GT_TileEntity_Ores.setOreBlock( + aWorld, + tX, + level, + tZ, + this.mSporadicMeta, + false, + isUnderdark)) placeCount[3]++; } } diff --git a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java index ef8850638c..5387668dce 100644 --- a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java +++ b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java @@ -39,10 +39,13 @@ public class GT_Worldgen_GT_Ore_SmallPieces extends GT_Worldgen { this.mMaxY = ((short) Math.max( this.mMinY + 1, GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY))); - this.mAmount = ((short) Math - .max(1, GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Amount", aAmount))); - this.mMeta = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "Ore", aPrimary.mMetaItemSubID)); + this.mAmount = ((short) Math.max( + 1, + GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Amount", aAmount))); + this.mMeta = ((short) GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "Ore", + aPrimary.mMetaItemSubID)); this.mBiome = GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "BiomeName", "None"); sList.add(this); } @@ -58,10 +61,13 @@ public class GT_Worldgen_GT_Ore_SmallPieces extends GT_Worldgen { this.mMaxY = ((short) Math.max( this.mMinY + 1, GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY))); - this.mAmount = ((short) Math - .max(1, GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Amount", aAmount))); - this.mMeta = ((short) GregTech_API.sWorldgenFile - .get(aTextWorldgen + this.mWorldGenName, "Ore", aPrimary.mMetaItemSubID)); + this.mAmount = ((short) Math.max( + 1, + GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Amount", aAmount))); + this.mMeta = ((short) GregTech_API.sWorldgenFile.get( + aTextWorldgen + this.mWorldGenName, + "Ore", + aPrimary.mMetaItemSubID)); this.mBiome = GregTech_API.sWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "BiomeName", "None"); sList.add(this); } diff --git a/src/main/java/gregtech/common/GT_Worldgen_Stone.java b/src/main/java/gregtech/common/GT_Worldgen_Stone.java index c75d6d6ad4..22782d8231 100644 --- a/src/main/java/gregtech/common/GT_Worldgen_Stone.java +++ b/src/main/java/gregtech/common/GT_Worldgen_Stone.java @@ -176,7 +176,8 @@ public class GT_Worldgen_Stone extends GT_Worldgen_Ore { int tMaxZ = tZ + (int) (realSize / zSize + 2.0); // If the (tY-ySize) of the stoneseed is air in the current chunk, mark the seed empty and move on. - if (aWorld.getBlock(aChunkX + 8, tMinY, aChunkZ + 8).isAir(aWorld, aChunkX + 8, tMinY, aChunkZ + 8)) { + if (aWorld.getBlock(aChunkX + 8, tMinY, aChunkZ + 8) + .isAir(aWorld, aChunkX + 8, tMinY, aChunkZ + 8)) { if (debugStones) GT_Log.out.println( mWorldGenName + " tX=" + tX @@ -271,25 +272,42 @@ public class GT_Worldgen_Stone extends GT_Worldgen_Ore { if (tTargetedBlock != GregTech_API.sBlockOres1) { ((GT_TileEntity_Ores) tTileEntity).convertOreBlock(aWorld, iX, iY, iZ); } - ((GT_TileEntity_Ores) tTileEntity) - .overrideOreBlockMaterial(this.mBlock, (byte) this.mBlockMeta); + ((GT_TileEntity_Ores) tTileEntity).overrideOreBlockMaterial( + this.mBlock, + (byte) this.mBlockMeta); } - } else if (((this.mAllowToGenerateinVoid) - && (aWorld.getBlock(iX, iY, iZ).isAir(aWorld, iX, iY, iZ))) - || ((tTargetedBlock != null) && ((tTargetedBlock - .isReplaceableOreGen(aWorld, iX, iY, iZ, Blocks.stone)) + } else if (((this.mAllowToGenerateinVoid) && (aWorld.getBlock(iX, iY, iZ) + .isAir(aWorld, iX, iY, iZ))) + || ((tTargetedBlock != null) && ((tTargetedBlock.isReplaceableOreGen( + aWorld, + iX, + iY, + iZ, + Blocks.stone)) || (tTargetedBlock.isReplaceableOreGen( aWorld, iX, iY, iZ, Blocks.stained_hardened_clay)) - || (tTargetedBlock - .isReplaceableOreGen(aWorld, iX, iY, iZ, Blocks.cobblestone)) - || (tTargetedBlock - .isReplaceableOreGen(aWorld, iX, iY, iZ, Blocks.end_stone)) - || (tTargetedBlock - .isReplaceableOreGen(aWorld, iX, iY, iZ, Blocks.netherrack)) + || (tTargetedBlock.isReplaceableOreGen( + aWorld, + iX, + iY, + iZ, + Blocks.cobblestone)) + || (tTargetedBlock.isReplaceableOreGen( + aWorld, + iX, + iY, + iZ, + Blocks.end_stone)) + || (tTargetedBlock.isReplaceableOreGen( + aWorld, + iX, + iY, + iZ, + Blocks.netherrack)) || (tTargetedBlock.isReplaceableOreGen( aWorld, iX, diff --git a/src/main/java/gregtech/common/GT_Worldgenerator.java b/src/main/java/gregtech/common/GT_Worldgenerator.java index c14444a3af..2ac29036d0 100644 --- a/src/main/java/gregtech/common/GT_Worldgenerator.java +++ b/src/main/java/gregtech/common/GT_Worldgenerator.java @@ -440,7 +440,8 @@ public class GT_Worldgenerator implements IWorldGenerator { // Determine bounding box on how far out to check for oreveins affecting this chunk // For now, manually reducing oreveinMaxSize when not in the Underdark for performance - if (this.mWorld.provider.getDimensionName().equals("Underdark")) { + if (this.mWorld.provider.getDimensionName() + .equals("Underdark")) { oreveinMaxSize = 32; // Leave Deep Dark/Underdark max oregen at 32, instead of 64 } else { oreveinMaxSize = 32; @@ -519,7 +520,8 @@ public class GT_Worldgenerator implements IWorldGenerator { // } else if (tDimensionName.equals("Asteroids")) { // mSize = aRandom.nextInt((int) (gcMaxSize - gcMinSize)); } - if ((mWorld.getBlock(tX, tY, tZ).isAir(mWorld, tX, tY, tZ))) { + if ((mWorld.getBlock(tX, tY, tZ) + .isAir(mWorld, tX, tY, tZ))) { float randomRadian = aRandom.nextFloat() * (float) Math.PI; double xBase = tX + 8 + MathHelper.sin(randomRadian) * mSize / 8.0F; double xFactor = tX + 8 - MathHelper.sin(randomRadian) * mSize / 8.0F; @@ -551,20 +553,41 @@ public class GT_Worldgenerator implements IWorldGenerator { for (int eZ = tMinZ; eZ <= tMaxZ; eZ++) { double zChance = (eZ + 0.5D - zCenter) / (halfLength / 2.0D); if ((xChance * xChance + yChance * yChance + zChance * zChance < 1.0D) - && (mWorld.getBlock(tX, tY, tZ).isAir(mWorld, tX, tY, tZ))) { + && (mWorld.getBlock(tX, tY, tZ) + .isAir(mWorld, tX, tY, tZ))) { int ranOre = aRandom.nextInt(50); if (ranOre < 3) { - GT_TileEntity_Ores - .setOreBlock(mWorld, eX, eY, eZ, primaryMeta, false); + GT_TileEntity_Ores.setOreBlock( + mWorld, + eX, + eY, + eZ, + primaryMeta, + false); } else if (ranOre < 6) { - GT_TileEntity_Ores - .setOreBlock(mWorld, eX, eY, eZ, secondaryMeta, false); + GT_TileEntity_Ores.setOreBlock( + mWorld, + eX, + eY, + eZ, + secondaryMeta, + false); } else if (ranOre < 8) { - GT_TileEntity_Ores - .setOreBlock(mWorld, eX, eY, eZ, betweenMeta, false); + GT_TileEntity_Ores.setOreBlock( + mWorld, + eX, + eY, + eZ, + betweenMeta, + false); } else if (ranOre < 10) { - GT_TileEntity_Ores - .setOreBlock(mWorld, eX, eY, eZ, sporadicMeta, false); + GT_TileEntity_Ores.setOreBlock( + mWorld, + eX, + eY, + eZ, + sporadicMeta, + false); } else { mWorld.setBlock(eX, eY, eZ, Blocks.end_stone, 0, 0); } diff --git a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java index 9143536dbd..8c605f95c6 100644 --- a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java +++ b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java @@ -53,8 +53,9 @@ public class GT_AlleleHelper extends AlleleHelper { EnumBeeChromosome.FLOWER_PROVIDER, EnumButterflyChromosome.FLOWER_PROVIDER); - AlleleManager.alleleRegistry - .registerDeprecatedAlleleReplacement("forestry.speedNorm", get(EnumAllele.Speed.NORMAL)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( + "forestry.speedNorm", + get(EnumAllele.Speed.NORMAL)); } if (PluginManager.Module.ARBORICULTURE.isEnabled()) { @@ -65,30 +66,39 @@ public class GT_AlleleHelper extends AlleleHelper { createAlleles(EnumAllele.Maturation.class, EnumTreeChromosome.MATURATION); createAlleles(EnumAllele.Sappiness.class, EnumTreeChromosome.SAPPINESS); - AlleleManager.alleleRegistry - .registerDeprecatedAlleleReplacement("forestry.heightMax10", get(EnumAllele.Height.AVERAGE)); - AlleleManager.alleleRegistry - .registerDeprecatedAlleleReplacement("forestry.saplingsDefault", get(EnumAllele.Saplings.AVERAGE)); - AlleleManager.alleleRegistry - .registerDeprecatedAlleleReplacement("forestry.saplingsDouble", get(EnumAllele.Saplings.HIGH)); - AlleleManager.alleleRegistry - .registerDeprecatedAlleleReplacement("forestry.saplingsTriple", get(EnumAllele.Saplings.HIGHER)); - AlleleManager.alleleRegistry - .registerDeprecatedAlleleReplacement("forestry.yieldDefault", get(EnumAllele.Yield.AVERAGE)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( + "forestry.heightMax10", + get(EnumAllele.Height.AVERAGE)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( + "forestry.saplingsDefault", + get(EnumAllele.Saplings.AVERAGE)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( + "forestry.saplingsDouble", + get(EnumAllele.Saplings.HIGH)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( + "forestry.saplingsTriple", + get(EnumAllele.Saplings.HIGHER)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( + "forestry.yieldDefault", + get(EnumAllele.Yield.AVERAGE)); AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( "forestry.maturitySlowest", get(EnumAllele.Maturation.SLOWEST)); - AlleleManager.alleleRegistry - .registerDeprecatedAlleleReplacement("forestry.maturitySlower", get(EnumAllele.Maturation.SLOWER)); - AlleleManager.alleleRegistry - .registerDeprecatedAlleleReplacement("forestry.maturitySlow", get(EnumAllele.Maturation.SLOW)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( + "forestry.maturitySlower", + get(EnumAllele.Maturation.SLOWER)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( + "forestry.maturitySlow", + get(EnumAllele.Maturation.SLOW)); AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( "forestry.maturityAverage", get(EnumAllele.Maturation.AVERAGE)); - AlleleManager.alleleRegistry - .registerDeprecatedAlleleReplacement("forestry.maturityFast", get(EnumAllele.Maturation.FAST)); - AlleleManager.alleleRegistry - .registerDeprecatedAlleleReplacement("forestry.maturityFaster", get(EnumAllele.Maturation.FASTER)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( + "forestry.maturityFast", + get(EnumAllele.Maturation.FAST)); + AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( + "forestry.maturityFaster", + get(EnumAllele.Maturation.FASTER)); AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement( "forestry.maturityFastest", get(EnumAllele.Maturation.FASTEST)); @@ -151,7 +161,8 @@ public class GT_AlleleHelper extends AlleleHelper { return; } - if (!chromosomeType.getAlleleClass().isInstance(allele)) { + if (!chromosomeType.getAlleleClass() + .isInstance(allele)) { GT_Mod.GT_FML_LOGGER.info("chromosomeType is not an instance of allele!" + allele.getName()); return; } @@ -216,7 +227,8 @@ public class GT_AlleleHelper extends AlleleHelper { } private <K extends Enum<K> & IAlleleValue<V>, V> void createAlleles(Class<K> enumClass, IChromosomeType... types) { - String category = enumClass.getSimpleName().toLowerCase(Locale.ENGLISH); + String category = enumClass.getSimpleName() + .toLowerCase(Locale.ENGLISH); EnumMap<K, IAllele> map = new EnumMap<>(enumClass); for (K enumValue : enumClass.getEnumConstants()) { IAllele allele = createAllele(category, enumValue, types); @@ -229,7 +241,8 @@ public class GT_AlleleHelper extends AlleleHelper { IChromosomeType... types) { V value = enumValue.getValue(); boolean isDominant = enumValue.isDominant(); - String name = enumValue.toString().toLowerCase(Locale.ENGLISH); + String name = enumValue.toString() + .toLowerCase(Locale.ENGLISH); Class<?> valueClass = value.getClass(); if (Float.class.isAssignableFrom(valueClass)) { @@ -238,8 +251,15 @@ public class GT_AlleleHelper extends AlleleHelper { return AlleleManager.alleleFactory.createInteger(modId, category, name, (Integer) value, isDominant, types); } else if (IVect.class.isAssignableFrom(valueClass)) { IVect area = (IVect) value; - return AlleleManager.alleleFactory - .createArea(modId, category, name, area.getX(), area.getY(), area.getZ(), isDominant, types); + return AlleleManager.alleleFactory.createArea( + modId, + category, + name, + area.getX(), + area.getY(), + area.getZ(), + isDominant, + types); } else if (Boolean.class.isAssignableFrom(valueClass)) { return AlleleManager.alleleFactory.createBoolean(modId, category, (Boolean) value, isDominant, types); } else if (EnumTolerance.class.isAssignableFrom(valueClass)) { @@ -252,8 +272,13 @@ public class GT_AlleleHelper extends AlleleHelper { AlleleManager.alleleRegistry.registerAllele(alleleTolerance, types); return alleleTolerance; } else if (FlowerProvider.class.isAssignableFrom(valueClass)) { - return AlleleManager.alleleFactory - .createFlowers(modId, category, name, (FlowerProvider) value, isDominant, types); + return AlleleManager.alleleFactory.createFlowers( + modId, + category, + name, + (FlowerProvider) value, + isDominant, + types); } throw new RuntimeException("could not create allele for category: " + category + " and value " + valueClass); } diff --git a/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java b/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java index 7e78ef8fcd..b79fb98c73 100644 --- a/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java +++ b/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java @@ -47,7 +47,8 @@ public class GT_Bee_Mutation extends BeeMutation { } IBeeModifier beeHousingModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); - IBeeModifier beeModeModifier = BeeManager.beeRoot.getBeekeepingMode(world).getBeeModifier(); + IBeeModifier beeModeModifier = BeeManager.beeRoot.getBeekeepingMode(world) + .getBeeModifier(); processedChance *= beeHousingModifier.getMutationModifier(genome0, genome1, processedChance); processedChance *= beeModeModifier.getMutationModifier(genome0, genome1, processedChance); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java index 7d04a7bde3..e4d3e7e52a 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java @@ -33,8 +33,9 @@ public class GT_Block_Casings1 extends GT_Block_Casings_Abstract { GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "UHV Machine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Bronze Plated Bricks"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Heat Proof Machine Casing"); - GT_LanguageManager - .addStringLocalization(getUnlocalizedName() + ".12.name", "Dimensionally Transcendent Casing"); + GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + ".12.name", + "Dimensionally Transcendent Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Dimensional Injection Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Dimensional Bridge"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Superconducting Coil Block"); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java index 044806874b..c1cff0f346 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java @@ -20,7 +20,9 @@ public class GT_Block_Casings2 extends GT_Block_Casings_Abstract { super(GT_Item_Casings2.class, "gt.blockcasings2", GT_Material_Casings.INSTANCE, 96); // Special handler for Pyrolyse Oven Casing on hatches... Textures.BlockIcons.casingTexturePages[0][22] = TextureFactory.of( - Block.getBlockFromItem(ItemList.Casing_ULV.get(1).getItem()), + Block.getBlockFromItem( + ItemList.Casing_ULV.get(1) + .getItem()), 0, ForgeDirection.UNKNOWN, Dyes.MACHINE_METAL.mRGBa); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java index 087818d099..254b34b513 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java @@ -42,10 +42,12 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract { public GT_Block_Casings4() { super(GT_Item_Casings4.class, "gt.blockcasings4", GT_Material_Casings.INSTANCE, 16); - GT_LanguageManager - .addStringLocalization(getUnlocalizedName() + ".0.name", "Robust Tungstensteel Machine Casing"); - GT_LanguageManager - .addStringLocalization(getUnlocalizedName() + ".1.name", "Clean Stainless Steel Machine Casing"); + GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + ".0.name", + "Robust Tungstensteel Machine Casing"); + GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + ".1.name", + "Clean Stainless Steel Machine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Stable Titanium Machine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Titanium Firebox Casing"); // GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Fusion Casing"); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java index bda180b45d..a8d04cd10f 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java @@ -36,13 +36,15 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract { GT_LanguageManager.addStringLocalization( getUnlocalizedName() + ".6.name", "Advanced Rhodium Plated Palladium Machine Casing"); - GT_LanguageManager - .addStringLocalization(getUnlocalizedName() + ".7.name", "Advanced Iridium Plated Machine Casing"); + GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + ".7.name", + "Advanced Iridium Plated Machine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Magical Machine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "HSS-S Turbine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Radiant Naquadah Alloy Casing"); - GT_LanguageManager - .addStringLocalization(getUnlocalizedName() + ".11.name", "Basic Photolithographic Framework Casing"); + GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + ".11.name", + "Basic Photolithographic Framework Casing"); GT_LanguageManager.addStringLocalization( getUnlocalizedName() + ".12.name", "Reinforced Photolithographic Framework Casing"); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java index 55e0f508d5..118d92a81b 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java @@ -15,8 +15,9 @@ public class GT_Block_Casings9 extends GT_Block_Casings_Abstract { super(GT_Item_Casings9.class, "gt.blockcasings9", GT_Material_Casings.INSTANCE, 2); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "PBI Pipe Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Advanced Filter Casing"); - GT_LanguageManager - .addStringLocalization(getUnlocalizedName() + ".1.tooltip", "Less than five 0.1μm particles per m^3"); + GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + ".1.tooltip", + "Less than five 0.1μm particles per m^3"); ItemList.Casing_Pipe_Polybenzimidazole.set(new ItemStack(this, 1, 0)); ItemList.Casing_Vent_T2.set(new ItemStack(this, 1, 1)); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java index 6cd2700250..57e52b6137 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java @@ -126,7 +126,9 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 16; i++) { ItemStack aStack = new ItemStack(aItem, 1, i); - if (!aStack.getDisplayName().contains(".name")) aList.add(aStack); + if (!aStack.getDisplayName() + .contains(".name")) + aList.add(aStack); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java index 82e7ec61ac..e2a40aebc0 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java @@ -235,8 +235,14 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (tTileEntity instanceof IGregTechTileEntity && ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null) { - ((IGregTechTileEntity) tTileEntity) - .addCollisionBoxesToList(aWorld, aX, aY, aZ, inputAABB, outputAABB, collider); + ((IGregTechTileEntity) tTileEntity).addCollisionBoxesToList( + aWorld, + aX, + aY, + aZ, + inputAABB, + outputAABB, + collider); return; } super.addCollisionBoxesToList(aWorld, aX, aY, aZ, inputAABB, outputAABB, collider); @@ -268,8 +274,11 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo final TileEntity tTileEntity = blockAccess.getTileEntity(aX, aY, aZ); if (tTileEntity instanceof IGregTechTileEntity && (((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null)) { - final AxisAlignedBB bbb = ((IGregTechTileEntity) tTileEntity) - .getCollisionBoundingBoxFromPool(((IGregTechTileEntity) tTileEntity).getWorld(), 0, 0, 0); + final AxisAlignedBB bbb = ((IGregTechTileEntity) tTileEntity).getCollisionBoundingBoxFromPool( + ((IGregTechTileEntity) tTileEntity).getWorld(), + 0, + 0, + 0); minX = bbb.minX; // This essentially sets block bounds minY = bbb.minY; minZ = bbb.minZ; @@ -365,8 +374,12 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo if ((!aWorld.isRemote) && !((IGregTechTileEntity) tTileEntity).isUseableByPlayer(aPlayer)) { return true; } - return ((IGregTechTileEntity) tTileEntity) - .onRightclick(aPlayer, (byte) aSide, aOffsetX, aOffsetY, aOffsetZ); + return ((IGregTechTileEntity) tTileEntity).onRightclick( + aPlayer, + (byte) aSide, + aOffsetX, + aOffsetY, + aOffsetZ); } return false; } @@ -424,7 +437,10 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo aZ + XSTR_INSTANCE.nextFloat() * 0.8F + 0.1F, new ItemStack(tItem.getItem(), tItem.stackSize, tItem.getItemDamage())); if (tItem.hasTagCompound()) { - tItemEntity.getEntityItem().setTagCompound((NBTTagCompound) tItem.getTagCompound().copy()); + tItemEntity.getEntityItem() + .setTagCompound( + (NBTTagCompound) tItem.getTagCompound() + .copy()); } tItemEntity.motionX = (XSTR_INSTANCE.nextGaussian() * 0.05D); tItemEntity.motionY = (XSTR_INSTANCE.nextGaussian() * 0.25D); @@ -651,13 +667,15 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo final byte aSide = (byte) side; final CoverableTileEntity tile = (CoverableTileEntity) tTileEntity; if (side != -1) { - final Block facadeBlock = tile.getCoverInfoAtSide(aSide).getFacadeBlock(); + final Block facadeBlock = tile.getCoverInfoAtSide(aSide) + .getFacadeBlock(); if (facadeBlock != null) return facadeBlock; } else { // we do not allow more than one type of facade per block, so no need to check every side // see comment in gregtech.common.covers.GT_Cover_FacadeBase.isCoverPlaceable for (byte tSide : ALL_VALID_SIDES) { - final Block facadeBlock = tile.getCoverInfoAtSide(tSide).getFacadeBlock(); + final Block facadeBlock = tile.getCoverInfoAtSide(tSide) + .getFacadeBlock(); if (facadeBlock != null) { return facadeBlock; } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java index 942441b0ba..4db556ac10 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java @@ -123,10 +123,22 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract { Arrays.fill(rTextures, TextureFactory.of(Blocks.stone)); rTextures[1] = TextureFactory.of(Blocks.netherrack); rTextures[2] = TextureFactory.of(Blocks.end_stone); - rTextures[3] = TextureFactory.builder().addIcon(GRANITE_BLACK_STONE).stdOrient().build(); - rTextures[4] = TextureFactory.builder().addIcon(GRANITE_RED_STONE).stdOrient().build(); - rTextures[5] = TextureFactory.builder().addIcon(MARBLE_STONE).stdOrient().build(); - rTextures[6] = TextureFactory.builder().addIcon(BASALT_STONE).stdOrient().build(); + rTextures[3] = TextureFactory.builder() + .addIcon(GRANITE_BLACK_STONE) + .stdOrient() + .build(); + rTextures[4] = TextureFactory.builder() + .addIcon(GRANITE_RED_STONE) + .stdOrient() + .build(); + rTextures[5] = TextureFactory.builder() + .addIcon(MARBLE_STONE) + .stdOrient() + .build(); + rTextures[6] = TextureFactory.builder() + .addIcon(BASALT_STONE) + .stdOrient() + .build(); return rTextures; } } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java index fbe0516e6c..566e2486dc 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java @@ -325,7 +325,8 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements return ((GT_TileEntity_Ores) tTileEntity).getDrops(getDroppedBlock(), aFortune); } return mTemporaryTileEntity.get() == null ? new ArrayList<>() - : mTemporaryTileEntity.get().getDrops(getDroppedBlock(), aFortune); + : mTemporaryTileEntity.get() + .getDrops(getDroppedBlock(), aFortune); } @Override @@ -343,7 +344,8 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements Materials tMaterial = GregTech_API.sGeneratedMaterials[i]; if ((tMaterial != null) && ((tMaterial.mTypes & 0x8) != 0) && !aBlockedOres.contains(tMaterial)) { for (int meta = i; meta < 23000 + i; meta += 1000) { - if (!(new ItemStack(aItem, 1, meta).getDisplayName().contains(DOT_NAME))) + if (!(new ItemStack(aItem, 1, meta).getDisplayName() + .contains(DOT_NAME))) aList.add(new ItemStack(aItem, 1, meta)); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java index f446bc7518..345b0385b0 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java @@ -54,19 +54,84 @@ public class GT_Block_Reinforced extends GT_Generic_Block { GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Naquadah Reinforced Block"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Neutronium Reinforced Block"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Raw Deep Dark Portal Block"); - ItemList.Block_BronzePlate.set(new ItemStack(this.setHardness(60.0f).setResistance(150.0f), 1, 0)); - ItemList.Block_IridiumTungstensteel.set(new ItemStack(this.setHardness(400.0f).setResistance(600.0f), 1, 1)); - ItemList.Block_Plascrete.set(new ItemStack(this.setHardness(5.0f).setResistance(6.0f), 1, 2)); - ItemList.Block_TungstenSteelReinforced.set(new ItemStack(this.setHardness(250.0f).setResistance(400.0f), 1, 3)); - ItemList.Block_BrittleCharcoal.set(new ItemStack(this.setHardness(0.5f).setResistance(8.0f), 1, 4)); - ItemList.Block_Powderbarrel.set(new ItemStack(this.setHardness(2.5f).setResistance(2.0f), 1, 5)); - ItemList.Block_SSFUEL.set(new ItemStack(this.setHardness(2.5f).setResistance(2.0f), 1, 6)); - ItemList.Block_MSSFUEL.set(new ItemStack(this.setHardness(2.5f).setResistance(2.0f), 1, 7)); - ItemList.Block_SteelPlate.set(new ItemStack(this.setHardness(150.0f).setResistance(200.0f), 1, 8)); - ItemList.Block_TitaniumPlate.set(new ItemStack(this.setHardness(200.0f).setResistance(300.0f), 1, 9)); - ItemList.Block_NaquadahPlate.set(new ItemStack(this.setHardness(500.0f).setResistance(1000.0f), 1, 10)); - ItemList.Block_NeutroniumPlate.set(new ItemStack(this.setHardness(750.0f).setResistance(2500.0f), 1, 11)); - ItemList.Block_BedrockiumCompressed.set(new ItemStack(this.setHardness(1500.0f).setResistance(5000.0f), 1, 12)); + ItemList.Block_BronzePlate.set( + new ItemStack( + this.setHardness(60.0f) + .setResistance(150.0f), + 1, + 0)); + ItemList.Block_IridiumTungstensteel.set( + new ItemStack( + this.setHardness(400.0f) + .setResistance(600.0f), + 1, + 1)); + ItemList.Block_Plascrete.set( + new ItemStack( + this.setHardness(5.0f) + .setResistance(6.0f), + 1, + 2)); + ItemList.Block_TungstenSteelReinforced.set( + new ItemStack( + this.setHardness(250.0f) + .setResistance(400.0f), + 1, + 3)); + ItemList.Block_BrittleCharcoal.set( + new ItemStack( + this.setHardness(0.5f) + .setResistance(8.0f), + 1, + 4)); + ItemList.Block_Powderbarrel.set( + new ItemStack( + this.setHardness(2.5f) + .setResistance(2.0f), + 1, + 5)); + ItemList.Block_SSFUEL.set( + new ItemStack( + this.setHardness(2.5f) + .setResistance(2.0f), + 1, + 6)); + ItemList.Block_MSSFUEL.set( + new ItemStack( + this.setHardness(2.5f) + .setResistance(2.0f), + 1, + 7)); + ItemList.Block_SteelPlate.set( + new ItemStack( + this.setHardness(150.0f) + .setResistance(200.0f), + 1, + 8)); + ItemList.Block_TitaniumPlate.set( + new ItemStack( + this.setHardness(200.0f) + .setResistance(300.0f), + 1, + 9)); + ItemList.Block_NaquadahPlate.set( + new ItemStack( + this.setHardness(500.0f) + .setResistance(1000.0f), + 1, + 10)); + ItemList.Block_NeutroniumPlate.set( + new ItemStack( + this.setHardness(750.0f) + .setResistance(2500.0f), + 1, + 11)); + ItemList.Block_BedrockiumCompressed.set( + new ItemStack( + this.setHardness(1500.0f) + .setResistance(5000.0f), + 1, + 12)); GT_ModHandler.addShapelessCraftingRecipe( new ItemStack(Items.coal, 1, 1), new Object[] { ItemList.Block_BrittleCharcoal.get(1) }); @@ -257,8 +322,12 @@ public class GT_Block_Reinforced extends GT_Generic_Block { if (!world.isRemote && world.getBlockMetadata(x, y, z) == 5) { EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, x + 0.5F, y + 0.5F, z + 0.5F, player); world.spawnEntityInWorld(entitytntprimed); - new WorldSpawnedEventBuilder.SoundAtEntityEventBuilder().setPitch(1f).setVolume(1f) - .setIdentifier(SoundResource.GAME_TNT_PRIMED).setEntity(entitytntprimed).setWorld(world).run(); + new WorldSpawnedEventBuilder.SoundAtEntityEventBuilder().setPitch(1f) + .setVolume(1f) + .setIdentifier(SoundResource.GAME_TNT_PRIMED) + .setEntity(entitytntprimed) + .setWorld(world) + .run(); world.setBlockToAir(x, y, z); return false; } @@ -298,9 +367,9 @@ public class GT_Block_Reinforced extends GT_Generic_Block { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float xOffset, float yOffset, float zOffset) { - if ((player.getCurrentEquippedItem() != null) - && (player.getCurrentEquippedItem().getItem() == Items.flint_and_steel) - && world.getBlockMetadata(x, y, z) == 5) { + if ((player.getCurrentEquippedItem() != null) && (player.getCurrentEquippedItem() + .getItem() + == Items.flint_and_steel) && world.getBlockMetadata(x, y, z) == 5) { removedByPlayer(world, player, x, y, z); return true; @@ -317,7 +386,9 @@ public class GT_Block_Reinforced extends GT_Generic_Block { public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 16; i++) { ItemStack aStack = new ItemStack(aItem, 1, i); - if (!aStack.getDisplayName().contains(".name")) aList.add(aStack); + if (!aStack.getDisplayName() + .contains(".name")) + aList.add(aStack); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java b/src/main/java/gregtech/common/blocks/GT_Block_Storage.java index 967d98c080..e8e36a2b56 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Storage.java @@ -96,7 +96,9 @@ public class GT_Block_Storage extends GT_Generic_Block { @SideOnly(Side.CLIENT) public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 16; i++) { - if (!(new ItemStack(aItem, 1, i).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i)); + if (!(new ItemStack(aItem, 1, i).getDisplayName() + .contains(".name"))) + aList.add(new ItemStack(aItem, 1, i)); } } } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java index b7fe3298ec..57b2ccae3e 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java @@ -17,10 +17,12 @@ public class GT_Item_Casings5 extends GT_Item_Casings_Abstract { super(block); } - protected static final String mCoilHeatTooltip = GT_LanguageManager - .addStringLocalization("gt.coilheattooltip", "Base Heating Capacity = "); - protected static final String mCoilUnitTooltip = GT_LanguageManager - .addStringLocalization("gt.coilunittooltip", " Kelvin"); + protected static final String mCoilHeatTooltip = GT_LanguageManager.addStringLocalization( + "gt.coilheattooltip", + "Base Heating Capacity = "); + protected static final String mCoilUnitTooltip = GT_LanguageManager.addStringLocalization( + "gt.coilunittooltip", + " Kelvin"); @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java index bd6b12c23a..12c6619bcb 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java @@ -12,30 +12,42 @@ import gregtech.api.util.GT_LanguageManager; public abstract class GT_Item_Casings_Abstract extends ItemBlock { - protected final String mNoMobsToolTip = GT_LanguageManager - .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); - protected final String mNoTileEntityToolTip = GT_LanguageManager - .addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); - protected final String mCoil01Tooltip = GT_LanguageManager - .addStringLocalization("gt.coil01tooltip", "Base Heating Capacity = 1800 Kelvin"); - protected final String mCoil02Tooltip = GT_LanguageManager - .addStringLocalization("gt.coil02tooltip", "Base Heating Capacity = 2700 Kelvin"); - protected final String mCoil03Tooltip = GT_LanguageManager - .addStringLocalization("gt.coil03tooltip", "Base Heating Capacity = 3600 Kelvin"); - protected final String mCoil04Tooltip = GT_LanguageManager - .addStringLocalization("gt.coil04tooltip", "Base Heating Capacity = 4500 Kelvin"); - protected final String mCoil05Tooltip = GT_LanguageManager - .addStringLocalization("gt.coil05tooltip", "Base Heating Capacity = 5400 Kelvin"); - protected final String mCoil06Tooltip = GT_LanguageManager - .addStringLocalization("gt.coil06tooltip", "Base Heating Capacity = 7200 Kelvin"); - protected final String mCoil07Tooltip = GT_LanguageManager - .addStringLocalization("gt.coil07tooltip", "Base Heating Capacity = 9001 Kelvin"); - protected final String mCoil08Tooltip = GT_LanguageManager - .addStringLocalization("gt.coil08tooltip", "Base Heating Capacity = 9900 Kelvin"); - protected final String mCoil09Tooltip = GT_LanguageManager - .addStringLocalization("gt.coil09tooltip", "Base Heating Capacity = 10800 Kelvin"); - protected final String mBlastProofTooltip = GT_LanguageManager - .addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof"); + protected final String mNoMobsToolTip = GT_LanguageManager.addStringLocalization( + "gt.nomobspawnsonthisblock", + "Mobs cannot Spawn on this Block"); + protected final String mNoTileEntityToolTip = GT_LanguageManager.addStringLocalization( + "gt.notileentityinthisblock", + "This is NOT a TileEntity!"); + protected final String mCoil01Tooltip = GT_LanguageManager.addStringLocalization( + "gt.coil01tooltip", + "Base Heating Capacity = 1800 Kelvin"); + protected final String mCoil02Tooltip = GT_LanguageManager.addStringLocalization( + "gt.coil02tooltip", + "Base Heating Capacity = 2700 Kelvin"); + protected final String mCoil03Tooltip = GT_LanguageManager.addStringLocalization( + "gt.coil03tooltip", + "Base Heating Capacity = 3600 Kelvin"); + protected final String mCoil04Tooltip = GT_LanguageManager.addStringLocalization( + "gt.coil04tooltip", + "Base Heating Capacity = 4500 Kelvin"); + protected final String mCoil05Tooltip = GT_LanguageManager.addStringLocalization( + "gt.coil05tooltip", + "Base Heating Capacity = 5400 Kelvin"); + protected final String mCoil06Tooltip = GT_LanguageManager.addStringLocalization( + "gt.coil06tooltip", + "Base Heating Capacity = 7200 Kelvin"); + protected final String mCoil07Tooltip = GT_LanguageManager.addStringLocalization( + "gt.coil07tooltip", + "Base Heating Capacity = 9001 Kelvin"); + protected final String mCoil08Tooltip = GT_LanguageManager.addStringLocalization( + "gt.coil08tooltip", + "Base Heating Capacity = 9900 Kelvin"); + protected final String mCoil09Tooltip = GT_LanguageManager.addStringLocalization( + "gt.coil09tooltip", + "Base Heating Capacity = 10800 Kelvin"); + protected final String mBlastProofTooltip = GT_LanguageManager.addStringLocalization( + "gt.blastprooftooltip", + "This Block is Blast Proof"); public GT_Item_Casings_Abstract(Block block) { super(block); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java b/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java index c659d153d9..13b4ba2d25 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java @@ -10,8 +10,9 @@ import gregtech.api.util.GT_LanguageManager; public class GT_Item_Concretes extends GT_Item_Stones_Abstract { - private final String mRunFasterToolTip = GT_LanguageManager - .addStringLocalization("gt.runfastertooltip", "You can walk faster on this Block"); + private final String mRunFasterToolTip = GT_LanguageManager.addStringLocalization( + "gt.runfastertooltip", + "You can walk faster on this Block"); public GT_Item_Concretes(Block block) { super(block); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java b/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java index 5ce04103ab..66c8abc3e2 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java @@ -12,10 +12,12 @@ import gregtech.api.util.GT_LanguageManager; public class GT_Item_LongDistancePipe extends ItemBlock { - protected final String mNoMobsToolTip = GT_LanguageManager - .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); - protected final String mNoTileEntityToolTip = GT_LanguageManager - .addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); + protected final String mNoMobsToolTip = GT_LanguageManager.addStringLocalization( + "gt.nomobspawnsonthisblock", + "Mobs cannot Spawn on this Block"); + protected final String mNoTileEntityToolTip = GT_LanguageManager.addStringLocalization( + "gt.notileentityinthisblock", + "This is NOT a TileEntity!"); public GT_Item_LongDistancePipe(Block block) { super(block); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java index f7ce8942c0..6965ffda2f 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java @@ -67,8 +67,7 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem { final IGregTechTileEntity tTileEntity = GregTech_API.METATILEENTITIES[tDamage].getBaseMetaTileEntity(); if (!GregTech_API.sPostloadFinished && tTileEntity.getMetaTileEntity() instanceof ISecondaryDescribable) { - final String[] tSecondaryDescription = ((ISecondaryDescribable) tTileEntity.getMetaTileEntity()) - .getSecondaryDescription(); + final String[] tSecondaryDescription = ((ISecondaryDescribable) tTileEntity.getMetaTileEntity()).getSecondaryDescription(); addDescription(null, tSecondaryDescription, tDamage, "_Secondary", true); } { @@ -133,8 +132,8 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem { if (GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaTileEntity_QuantumTank || GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaTileEntity_SuperTank) { if (aStack.hasTagCompound() && aStack.stackTagCompound.hasKey("mFluid")) { - final FluidStack tContents = FluidStack - .loadFluidStackFromNBT(aStack.stackTagCompound.getCompoundTag("mFluid")); + final FluidStack tContents = FluidStack.loadFluidStackFromNBT( + aStack.stackTagCompound.getCompoundTag("mFluid")); if (tContents != null && tContents.amount > 0) { aList.add( GT_LanguageManager.addStringLocalization( @@ -156,8 +155,8 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem { } if (GregTech_API.METATILEENTITIES[tDamage] instanceof GT_MetaTileEntity_DigitalChestBase) { if (aStack.hasTagCompound() && aStack.stackTagCompound.hasKey("mItemStack")) { - final ItemStack tContents = ItemStack - .loadItemStackFromNBT(aStack.stackTagCompound.getCompoundTag("mItemStack")); + final ItemStack tContents = ItemStack.loadItemStackFromNBT( + aStack.stackTagCompound.getCompoundTag("mItemStack")); final int tSize = aStack.stackTagCompound.getInteger("mItemCount"); if (tContents != null && tSize > 0) { aList.add( @@ -244,10 +243,9 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem { if (aDamage >= GregTech_API.METATILEENTITIES.length) return; if (GregTech_API.METATILEENTITIES[aDamage] != null) { final IMetaTileEntity tMetaTileEntity = GregTech_API.METATILEENTITIES[aDamage].getBaseMetaTileEntity() - .getMetaTileEntity(); + .getMetaTileEntity(); if (tMetaTileEntity instanceof ISecondaryDescribable) { - final String[] tSecondaryDescription = ((ISecondaryDescribable) tMetaTileEntity) - .getSecondaryDescription(); + final String[] tSecondaryDescription = ((ISecondaryDescribable) tMetaTileEntity).getSecondaryDescription(); addDescription(null, tSecondaryDescription, aDamage, "_Secondary", true); } addDescription(null, tMetaTileEntity.getDescription(), aDamage, "", true); @@ -332,7 +330,8 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem { tTileEntity.setOwnerName(aPlayer.getDisplayName()); tTileEntity.setOwnerUuid(aPlayer.getUniqueID()); } - tTileEntity.getMetaTileEntity().initDefaultModes(aStack.getTagCompound()); + tTileEntity.getMetaTileEntity() + .initDefaultModes(aStack.getTagCompound()); final byte aSide = GT_Utility.getOppositeSide(side); if (tTileEntity.getMetaTileEntity() instanceof IConnectable) { // If we're connectable, try connecting to whatever we're up against diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java index e32558795c..f3cdaab1ba 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java @@ -74,8 +74,8 @@ public class GT_Item_Ores extends ItemBlock { @Override public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { - String formula = StatCollector - .translateToLocal(field_150939_a.getUnlocalizedName() + '.' + getDamage(aStack) + ".tooltip"); + String formula = StatCollector.translateToLocal( + field_150939_a.getUnlocalizedName() + '.' + getDamage(aStack) + ".tooltip"); if (!StringUtils.isBlank(formula)) aList.add(formula); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java index db6356b173..5a75f28dae 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java @@ -12,8 +12,9 @@ import gregtech.api.util.GT_LanguageManager; public class GT_Item_Stones_Abstract extends ItemBlock { - private final String mNoMobsToolTip = GT_LanguageManager - .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); + private final String mNoMobsToolTip = GT_LanguageManager.addStringLocalization( + "gt.nomobspawnsonthisblock", + "Mobs cannot Spawn on this Block"); public GT_Item_Stones_Abstract(Block block) { super(block); diff --git a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java index 92596a6c1a..099ccf2e65 100644 --- a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java +++ b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java @@ -35,8 +35,9 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit public static byte getHarvestData(short aMetaData, int aBaseBlockHarvestLevel) { Materials aMaterial = GregTech_API.sGeneratedMaterials[(aMetaData % 1000)]; byte tByte = aMaterial == null ? 0 - : (byte) Math - .max(aBaseBlockHarvestLevel, Math.min(7, aMaterial.mToolQuality - (aMetaData < 16000 ? 0 : 1))); + : (byte) Math.max( + aBaseBlockHarvestLevel, + Math.min(7, aMaterial.mToolQuality - (aMetaData < 16000 ? 0 : 1))); if (GT_Mod.gregtechproxy.mChangeHarvestLevels) { tByte = aMaterial == null ? 0 : (byte) Math.max( @@ -218,11 +219,19 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit public void overrideOreBlockMaterial(Block aOverridingStoneBlock, byte aOverridingStoneMeta) { if (this.worldObj == null || blockType == null) return; this.mMetaData = ((short) (int) (this.mMetaData % 1000L + this.mMetaData / 16000L * 16000L)); - if (aOverridingStoneBlock - .isReplaceableOreGen(this.worldObj, this.xCoord, this.yCoord, this.zCoord, Blocks.netherrack)) { + if (aOverridingStoneBlock.isReplaceableOreGen( + this.worldObj, + this.xCoord, + this.yCoord, + this.zCoord, + Blocks.netherrack)) { this.mMetaData = ((short) (this.mMetaData + 1000)); - } else if (aOverridingStoneBlock - .isReplaceableOreGen(this.worldObj, this.xCoord, this.yCoord, this.zCoord, Blocks.end_stone)) { + } else if (aOverridingStoneBlock.isReplaceableOreGen( + this.worldObj, + this.xCoord, + this.yCoord, + this.zCoord, + Blocks.end_stone)) { this.mMetaData = ((short) (this.mMetaData + 2000)); } else if (aOverridingStoneBlock.isReplaceableOreGen( @@ -279,8 +288,8 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit this.zCoord, getHarvestData( aMeta, - ((GT_Block_Ores_Abstract) tTileEntity.blockType) - .getBaseBlockHarvestLevel(aMeta % 16000 / 1000)), + ((GT_Block_Ores_Abstract) tTileEntity.blockType).getBaseBlockHarvestLevel( + aMeta % 16000 / 1000)), 0); } } @@ -389,8 +398,10 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit Materials dustMat = ((GT_Block_Ores_Abstract) aDroppedOre).getDroppedDusts()[this.mMetaData / 1000 % 16]; if (dustMat != null) rList.add( - GT_OreDictUnificator - .get(tRandom.nextInt(3) > 0 ? OrePrefixes.dustImpure : OrePrefixes.dust, dustMat, 1L)); + GT_OreDictUnificator.get( + tRandom.nextInt(3) > 0 ? OrePrefixes.dustImpure : OrePrefixes.dust, + dustMat, + 1L)); } } return rList; @@ -401,16 +412,22 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit Materials aMaterial = GregTech_API.sGeneratedMaterials[(this.mMetaData % 1000)]; if ((aMaterial != null) && (this.mMetaData < 32000)) { ITexture iTexture = TextureFactory.builder() - .addIcon( - aMaterial.mIconSet.mTextures[this.mMetaData / 16000 == 0 ? OrePrefixes.ore.mTextureIndex - : OrePrefixes.oreSmall.mTextureIndex]) - .setRGBA(aMaterial.mRGBa).stdOrient().build(); + .addIcon( + aMaterial.mIconSet.mTextures[this.mMetaData / 16000 == 0 + ? OrePrefixes.ore.mTextureIndex + : OrePrefixes.oreSmall.mTextureIndex]) + .setRGBA(aMaterial.mRGBa) + .stdOrient() + .build(); if (aBlock instanceof GT_Block_Ores_Abstract) { return new ITexture[] { ((GT_Block_Ores_Abstract) aBlock).getTextureSet()[((this.mMetaData / 1000) % 16)], iTexture }; } } return new ITexture[] { TextureFactory.of(Blocks.stone, 0), TextureFactory.builder() - .addIcon(SET_NONE.mTextures[OrePrefixes.ore.mTextureIndex]).stdOrient().build() }; + .addIcon( + SET_NONE.mTextures[OrePrefixes.ore.mTextureIndex]) + .stdOrient() + .build() }; } } diff --git a/src/main/java/gregtech/common/covers/CoverInfo.java b/src/main/java/gregtech/common/covers/CoverInfo.java index 206a82ca2e..cc6d2db1e9 100644 --- a/src/main/java/gregtech/common/covers/CoverInfo.java +++ b/src/main/java/gregtech/common/covers/CoverInfo.java @@ -136,8 +136,13 @@ public final class CoverInfo { } public ISerializableObject doCoverThings(long aTickTimer, byte aRedstone) { - return getCoverBehavior() - .doCoverThings(coverSide, aRedstone, coverID, coverData, coveredTile.get(), aTickTimer); + return getCoverBehavior().doCoverThings( + coverSide, + aRedstone, + coverID, + coverData, + coveredTile.get(), + aTickTimer); } public void onBaseTEDestroyed() { @@ -219,8 +224,15 @@ public final class CoverInfo { } public boolean onCoverRightClick(EntityPlayer aPlayer, float aX, float aY, float aZ) { - return getCoverBehavior() - .onCoverRightClick(coverSide, coverID, coverData, coveredTile.get(), aPlayer, aX, aY, aZ); + return getCoverBehavior().onCoverRightClick( + coverSide, + coverID, + coverData, + coveredTile.get(), + aPlayer, + aX, + aY, + aZ); } public boolean onCoverShiftRightClick(EntityPlayer aPlayer) { @@ -228,8 +240,15 @@ public final class CoverInfo { } public ISerializableObject onCoverScrewdriverClick(EntityPlayer aPlayer, float aX, float aY, float aZ) { - return getCoverBehavior() - .onCoverScrewdriverClick(coverSide, coverID, coverData, coveredTile.get(), aPlayer, aX, aY, aZ); + return getCoverBehavior().onCoverScrewdriverClick( + coverSide, + coverID, + coverData, + coveredTile.get(), + aPlayer, + aX, + aY, + aZ); } public Block getFacadeBlock() { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java index 845e74d1ab..83cf48386d 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java @@ -305,8 +305,10 @@ public class GT_Cover_Arm extends GT_CoverBehavior { protected void addUIWidgets(ModularWindow.Builder builder) { maxSlot = getMaxSlot(); builder.widget( - new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_Arm.this) - .addFollower( + new CoverDataControllerWidget<>( + this::getCoverData, + this::setCoverData, + GT_Cover_Arm.this).addFollower( CoverDataFollower_ToggleButtonWidget.ofDisableable(), coverData -> getFlagExport(convert(coverData)) > 0, (coverData, state) -> { @@ -319,95 +321,118 @@ public class GT_Cover_Arm extends GT_CoverBehavior { } }, widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) - .addTooltip(GT_Utility.trans("006", "Export")) - .setPos(spaceX * 0, spaceY * 0)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> getFlagExport(convert(coverData)) == 0, - (coverData, state) -> { - if (state) { - return new ISerializableObject.LegacyCoverData( - convert(coverData) & ~EXPORT_MASK | CONVERTED_BIT); - } else { - return new ISerializableObject.LegacyCoverData( - convert(coverData) | EXPORT_MASK | CONVERTED_BIT); - } - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT) - .addTooltip(GT_Utility.trans("007", "Import")) - .setPos(spaceX * 1, spaceY * 0)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> getTextFieldContent(getFlagInternalSlot(convert(coverData)) - 1), - (coverData, state) -> { - final int coverVariable = convert(coverData); - return new ISerializableObject.LegacyCoverData( - getFlagExport(coverVariable) - | ((getIntFromText(state) + 1) & SLOT_ID_MASK) - | (getFlagAdjacentSlot(coverVariable) << 14) - | CONVERTED_BIT); - }, - widget -> widget.setOnScrollText().setValidator(val -> { - final int valSlot = getIntFromText(val); - if (valSlot > -1) { - return TextFieldWidget.format.format(Math.min(valSlot, maxSlot)); - } else { - return ANY_TEXT; - } - }).setPattern(BaseTextFieldWidget.NATURAL_NUMS).setFocusOnGuiOpen(true) - .setPos(spaceX * 0, spaceY * 1 + 2).setSize(spaceX * 2 + 5, 12)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> getTextFieldContent(getFlagAdjacentSlot(convert(coverData)) - 1), - (coverData, state) -> { - final int coverVariable = convert(coverData); - return new ISerializableObject.LegacyCoverData( - getFlagExport(coverVariable) | getFlagInternalSlot(coverVariable) - | (((getIntFromText(state) + 1) & SLOT_ID_MASK) << 14) - | CONVERTED_BIT); - }, - widget -> widget.setValidator(val -> { - final int valSlot = getIntFromText(val); - final int adjacentMaxSlot; - final ICoverable tile = getUIBuildContext().getTile(); - if (tile instanceof TileEntity && !tile.isDead()) { - TileEntity adj = tile - .getTileEntityAtSide(getUIBuildContext().getCoverSide()); - if (adj instanceof IInventory) - adjacentMaxSlot = ((IInventory) adj).getSizeInventory() - 1; - else adjacentMaxSlot = -1; - } else { - adjacentMaxSlot = -1; - } - if (valSlot > -1) { - return TextFieldWidget.format.format(Math.min(valSlot, adjacentMaxSlot)); - } else { - return ANY_TEXT; - } - }).setOnScroll((text, direction) -> { - final int val = getIntFromText(text); - int step = (GuiScreen.isShiftKeyDown() ? 50 : GuiScreen.isCtrlKeyDown() ? 5 : 1) - * direction; - return TextFieldWidget.format.format(val + step); - }).setPattern(BaseTextFieldWidget.NATURAL_NUMS).setPos(spaceX * 0, spaceY * 2 + 2) - .setSize(spaceX * 2 + 5, 12)) - .setPos(startX, startY)) - .widget( - TextWidget - .dynamicString( - () -> (convert(getCoverData()) & EXPORT_MASK) > 0 - ? GT_Utility.trans("006", "Export") - : GT_Utility.trans("007", "Import")) - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("254.1", "Internal slot#")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("255", "Adjacent slot#")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 4 + startY + spaceY * 2)); + .addTooltip(GT_Utility.trans("006", "Export")) + .setPos(spaceX * 0, spaceY * 0)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> getFlagExport(convert(coverData)) == 0, + (coverData, state) -> { + if (state) { + return new ISerializableObject.LegacyCoverData( + convert(coverData) & ~EXPORT_MASK + | CONVERTED_BIT); + } else { + return new ISerializableObject.LegacyCoverData( + convert(coverData) | EXPORT_MASK | CONVERTED_BIT); + } + }, + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_IMPORT) + .addTooltip(GT_Utility.trans("007", "Import")) + .setPos(spaceX * 1, spaceY * 0)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> getTextFieldContent( + getFlagInternalSlot(convert(coverData)) - 1), + (coverData, state) -> { + final int coverVariable = convert(coverData); + return new ISerializableObject.LegacyCoverData( + getFlagExport(coverVariable) + | ((getIntFromText(state) + 1) & SLOT_ID_MASK) + | (getFlagAdjacentSlot(coverVariable) << 14) + | CONVERTED_BIT); + }, + widget -> widget.setOnScrollText() + .setValidator(val -> { + final int valSlot = getIntFromText(val); + if (valSlot > -1) { + return TextFieldWidget.format.format( + Math.min(valSlot, maxSlot)); + } else { + return ANY_TEXT; + } + }) + .setPattern(BaseTextFieldWidget.NATURAL_NUMS) + .setFocusOnGuiOpen(true) + .setPos(spaceX * 0, spaceY * 1 + 2) + .setSize(spaceX * 2 + 5, 12)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> getTextFieldContent( + getFlagAdjacentSlot(convert(coverData)) - 1), + (coverData, state) -> { + final int coverVariable = convert(coverData); + return new ISerializableObject.LegacyCoverData( + getFlagExport(coverVariable) + | getFlagInternalSlot(coverVariable) + | (((getIntFromText(state) + 1) + & SLOT_ID_MASK) << 14) + | CONVERTED_BIT); + }, + widget -> widget.setValidator(val -> { + final int valSlot = getIntFromText(val); + final int adjacentMaxSlot; + final ICoverable tile = getUIBuildContext().getTile(); + if (tile instanceof TileEntity && !tile.isDead()) { + TileEntity adj = tile.getTileEntityAtSide( + getUIBuildContext().getCoverSide()); + if (adj instanceof IInventory) + adjacentMaxSlot = ((IInventory) adj).getSizeInventory() + - 1; + else adjacentMaxSlot = -1; + } else { + adjacentMaxSlot = -1; + } + if (valSlot > -1) { + return TextFieldWidget.format.format( + Math.min(valSlot, adjacentMaxSlot)); + } else { + return ANY_TEXT; + } + }) + .setOnScroll((text, direction) -> { + final int val = getIntFromText(text); + int step = (GuiScreen.isShiftKeyDown() ? 50 + : GuiScreen.isCtrlKeyDown() ? 5 : 1) + * direction; + return TextFieldWidget.format.format( + val + step); + }) + .setPattern(BaseTextFieldWidget.NATURAL_NUMS) + .setPos(spaceX * 0, spaceY * 2 + 2) + .setSize(spaceX * 2 + 5, 12)) + .setPos(startX, startY)) + .widget( + TextWidget.dynamicString( + () -> (convert(getCoverData()) & EXPORT_MASK) > 0 ? GT_Utility.trans("006", "Export") + : GT_Utility.trans("007", "Import")) + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 3, 4 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("254.1", "Internal slot#")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 4 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("255", "Adjacent slot#")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 4 + startY + spaceY * 2)); } private int getMaxSlot() { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java index f3176896f8..6ed09dbf06 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java @@ -212,47 +212,64 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls 0, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON) - .setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) - .setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CROSS) - .setPos(spaceX * 0, spaceY * 2)) - .setPos(startX, startY)) - .widget( - new CoverDataControllerWidget<>( - this::getCoverData, - this::setCoverData, - GT_Cover_ControlsWork.this) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), - coverData -> convert(coverData) > 2, - (coverData, state) -> new ISerializableObject.LegacyCoverData( - adjustCoverVariable(state, convert(coverData))), - widget -> widget.setPos(spaceX * 0, spaceY * 3)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("243", "Enable with Redstone")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("244", "Disable with Redstone")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("245", "Disable machine")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 2)) - .widget( - new TextWidget(GT_Utility.trans("507", "Safe Mode")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 3)); + .setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) + .setPos( + spaceX * 0, + spaceY * 1)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_CROSS) + .setPos( + spaceX * 0, + spaceY * 2)) + .setPos(startX, startY)) + .widget( + new CoverDataControllerWidget<>( + this::getCoverData, + this::setCoverData, + GT_Cover_ControlsWork.this).addFollower( + CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), + coverData -> convert(coverData) > 2, + (coverData, state) -> new ISerializableObject.LegacyCoverData( + adjustCoverVariable(state, convert(coverData))), + widget -> widget.setPos(spaceX * 0, spaceY * 3)) + .setPos(startX, startY)) + .widget( + new TextWidget(GT_Utility.trans("243", "Enable with Redstone")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + + spaceX * 1, + 4 + startY + + spaceY * 0)) + .widget( + new TextWidget( + GT_Utility.trans("244", "Disable with Redstone")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("245", "Disable machine")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 2)) + .widget( + new TextWidget(GT_Utility.trans("507", "Safe Mode")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 3)); } private int getNewCoverVariable(int id, int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java index a2a0fcb8cf..e056c1c02d 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java @@ -223,69 +223,100 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior { 0, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) - .addTooltip(GT_Utility.trans("006", "Export")) - .setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT) - .addTooltip(GT_Utility.trans("007", "Import")) - .setPos(spaceX * 1, spaceY * 0)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK) - .addTooltip(GT_Utility.trans("224", "Always On")) - .setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 3, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON) - .addTooltip( - GT_Utility.trans( - "225", - "Active with Redstone Signal")) - .setPos(spaceX * 1, spaceY * 1)) - .addToggleButton( - 4, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) - .addTooltip( - GT_Utility.trans( - "226", - "Inactive with Redstone Signal")) - .setPos(spaceX * 2, spaceY * 1)) - .addToggleButton( - 5, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT) - .addTooltip(GT_Utility.trans("227", "Allow Input")) - .setPos(spaceX * 0, spaceY * 2)) - .addToggleButton( - 6, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT) - .addTooltip(GT_Utility.trans("228", "Block Input")) - .setPos(spaceX * 1, spaceY * 2)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("229", "Import/Export")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 3 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("230", "Conditional")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 3 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("231", "Enable Input")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 3 + startY + spaceY * 2)); + .addTooltip(GT_Utility.trans("006", "Export")) + .setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_IMPORT) + .addTooltip( + GT_Utility.trans( + "007", + "Import")) + .setPos( + spaceX * 1, + spaceY * 0)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_CHECKMARK) + .addTooltip( + GT_Utility.trans( + "224", + "Always On")) + .setPos( + spaceX * 0, + spaceY * 1)) + .addToggleButton( + 3, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON) + .addTooltip( + GT_Utility.trans( + "225", + "Active with Redstone Signal")) + .setPos( + spaceX * 1, + spaceY * 1)) + .addToggleButton( + 4, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) + .addTooltip( + GT_Utility.trans( + "226", + "Inactive with Redstone Signal")) + .setPos( + spaceX * 2, + spaceY * 1)) + .addToggleButton( + 5, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT) + .addTooltip( + GT_Utility.trans( + "227", + "Allow Input")) + .setPos( + spaceX * 0, + spaceY * 2)) + .addToggleButton( + 6, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT) + .addTooltip( + GT_Utility.trans( + "228", + "Block Input")) + .setPos( + spaceX * 1, + spaceY * 2)) + .setPos(startX, startY)) + .widget( + new TextWidget(GT_Utility.trans("229", "Import/Export")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 3 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 3 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("231", "Enable Input")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 3 + startY + spaceY * 2)); } private int getNewCoverVariable(int id, int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java index ff6741067c..c4d3364ba0 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java @@ -170,34 +170,37 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior { 0, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_PROGRESS) - .setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK) - .setPos(spaceX * 1, spaceY * 0)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofRedstone(), - widget -> widget.setPos(spaceX * 0, spaceY * 1)) - .setPos(startX, startY)) - .widget( - TextWidget - .dynamicString( - () -> ((convert(getCoverData()) & 0x2) > 0) - ? GT_Utility.trans("242", "Machine idle") - : GT_Utility.trans("241", "Recipe progress")) - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 4 + startY + spaceY * 0)) - .widget( - TextWidget - .dynamicString( - () -> ((convert(getCoverData()) & 0x1) > 0) - ? GT_Utility.trans("INVERTED", "Inverted") - : GT_Utility.trans("NORMAL", "Normal")) - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 4 + startY + spaceY * 1)); + .setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_CHECKMARK) + .setPos( + spaceX * 1, + spaceY * 0)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofRedstone(), + widget -> widget.setPos( + spaceX * 0, + spaceY * 1)) + .setPos(startX, startY)) + .widget( + TextWidget.dynamicString( + () -> ((convert(getCoverData()) & 0x2) > 0) ? GT_Utility.trans("242", "Machine idle") + : GT_Utility.trans("241", "Recipe progress")) + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 3, 4 + startY + spaceY * 0)) + .widget( + TextWidget.dynamicString( + () -> ((convert(getCoverData()) & 0x1) > 0) + ? GT_Utility.trans("INVERTED", "Inverted") + : GT_Utility.trans("NORMAL", "Normal")) + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 3, 4 + startY + spaceY * 1)); } private int getNewCoverVariable(int id, int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java index a103234fea..4a08925ca4 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java @@ -47,15 +47,18 @@ public class GT_Cover_Drain extends GT_CoverBehavior { if (aSide != 6) { Block tBlock = aTileEntity.getBlockAtSide(aSide); if ((aCoverVariable < 3) && ((aTileEntity instanceof IFluidHandler))) { - if ((aSide == 1) && (aTileEntity.getWorld().isRaining()) + if ((aSide == 1) && (aTileEntity.getWorld() + .isRaining()) && (aTileEntity.getWorld() - .getPrecipitationHeight(aTileEntity.getXCoord(), aTileEntity.getZCoord()) - 2 - < aTileEntity.getYCoord())) { + .getPrecipitationHeight(aTileEntity.getXCoord(), aTileEntity.getZCoord()) + - 2 < aTileEntity.getYCoord())) { int tAmount = (int) (aTileEntity.getBiome().rainfall * 10.0F); if (tAmount > 0) { ((IFluidHandler) aTileEntity).fill( ForgeDirection.getOrientation(aSide), - Materials.Water.getFluid(aTileEntity.getWorld().isThundering() ? tAmount * 2 : tAmount), + Materials.Water.getFluid( + aTileEntity.getWorld() + .isThundering() ? tAmount * 2 : tAmount), true); } } @@ -77,15 +80,20 @@ public class GT_Cover_Drain extends GT_CoverBehavior { false); } if ((tLiquid != null) && (tLiquid.getFluid() != null) - && ((aSide > 1) || ((aSide == 0) && (tLiquid.getFluid().getDensity() <= 0)) - || ((aSide == 1) && (tLiquid.getFluid().getDensity() >= 0))) + && ((aSide > 1) || ((aSide == 0) && (tLiquid.getFluid() + .getDensity() + <= 0)) + || ((aSide == 1) && (tLiquid.getFluid() + .getDensity() + >= 0))) && (((IFluidHandler) aTileEntity).fill(ForgeDirection.getOrientation(aSide), tLiquid, false) == tLiquid.amount)) { ((IFluidHandler) aTileEntity).fill(ForgeDirection.getOrientation(aSide), tLiquid, true); - aTileEntity.getWorld().setBlockToAir( - aTileEntity.getXCoord() + ForgeDirection.getOrientation(aSide).offsetX, - aTileEntity.getYCoord() + ForgeDirection.getOrientation(aSide).offsetY, - aTileEntity.getZCoord() + ForgeDirection.getOrientation(aSide).offsetZ); + aTileEntity.getWorld() + .setBlockToAir( + aTileEntity.getXCoord() + ForgeDirection.getOrientation(aSide).offsetX, + aTileEntity.getYCoord() + ForgeDirection.getOrientation(aSide).offsetY, + aTileEntity.getZCoord() + ForgeDirection.getOrientation(aSide).offsetZ); } } } @@ -94,13 +102,14 @@ public class GT_Cover_Drain extends GT_CoverBehavior { || (tBlock == Blocks.water) || (tBlock == Blocks.flowing_water) || ((tBlock instanceof IFluidBlock)))) { - aTileEntity.getWorld().setBlock( - aTileEntity.getOffsetX(aSide, 1), - aTileEntity.getOffsetY(aSide, 1), - aTileEntity.getOffsetZ(aSide, 1), - Blocks.air, - 0, - 0); + aTileEntity.getWorld() + .setBlock( + aTileEntity.getOffsetX(aSide, 1), + aTileEntity.getOffsetY(aSide, 1), + aTileEntity.getOffsetZ(aSide, 1), + Blocks.air, + 0, + 0); } } return aCoverVariable; diff --git a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java index 53ce2bcbb3..0ded299507 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java @@ -229,8 +229,10 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe final String NORMAL = GT_Utility.trans("NORMAL", "Normal"); builder.widget( - new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_EUMeter.this) - .addFollower( + new CoverDataControllerWidget<>( + this::getCoverData, + this::setCoverData, + GT_Cover_EUMeter.this).addFollower( new CoverDataFollower_CycleButtonWidget<>(), coverData -> coverData.type.ordinal(), (coverData, state) -> { @@ -238,42 +240,56 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe return coverData; }, widget -> widget.setLength(EnergyType.values().length) - .addTooltip(state -> EnergyType.getEnergyType(state).getTooltip()) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CYCLIC) - .setPos(spaceX * 0, spaceY * 0)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofRedstone(), - coverData -> coverData.inverted, - (coverData, state) -> { - coverData.inverted = state; - return coverData; - }, - widget -> widget.addTooltip(0, NORMAL).addTooltip(1, INVERTED) - .setPos(spaceX * 0, spaceY * 1)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(coverData.threshold), - (coverData, state) -> { - coverData.threshold = (long) MathExpression.parseMathExpression(state); - return coverData; - }, - widget -> widget.setOnScrollNumbersLong(1000, 100, 100000) - .setNumbersLong(() -> 0L, () -> Long.MAX_VALUE).setFocusOnGuiOpen(true) - .setPos(spaceX * 0, spaceY * 2 + 2).setSize(spaceX * 8, 12)) - .setPos(startX, startY)) - .widget( - TextWidget.dynamicString(() -> getCoverData() != null ? getCoverData().type.getTitle() : "") - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()).setPos( - startX + spaceX, - 4 + startY)) - .widget( - TextWidget.dynamicString( - () -> getCoverData() != null ? getCoverData().inverted ? INVERTED : NORMAL : "") - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX, 4 + startY + spaceY)) - .widget( - new TextWidget(GT_Utility.trans("222.1", "Energy threshold")) - .setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(startX, startY + spaceY * 3 + 4)); + .addTooltip( + state -> EnergyType.getEnergyType(state) + .getTooltip()) + .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CYCLIC) + .setPos(spaceX * 0, spaceY * 0)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofRedstone(), + coverData -> coverData.inverted, + (coverData, state) -> { + coverData.inverted = state; + return coverData; + }, + widget -> widget.addTooltip(0, NORMAL) + .addTooltip(1, INVERTED) + .setPos(spaceX * 0, spaceY * 1)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> String.valueOf(coverData.threshold), + (coverData, state) -> { + coverData.threshold = (long) MathExpression.parseMathExpression( + state); + return coverData; + }, + widget -> widget.setOnScrollNumbersLong(1000, 100, 100000) + .setNumbersLong( + () -> 0L, + () -> Long.MAX_VALUE) + .setFocusOnGuiOpen(true) + .setPos(spaceX * 0, spaceY * 2 + 2) + .setSize(spaceX * 8, 12)) + .setPos(startX, startY)) + .widget( + TextWidget.dynamicString(() -> getCoverData() != null ? getCoverData().type.getTitle() : "") + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX, 4 + startY)) + .widget( + TextWidget.dynamicString( + () -> getCoverData() != null ? getCoverData().inverted ? INVERTED : NORMAL : "") + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX, 4 + startY + spaceY)) + .widget( + new TextWidget(GT_Utility.trans("222.1", "Energy threshold")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX, + startY + spaceY * 3 + + 4)); } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java index 0ac4a25fa1..80eeead660 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java @@ -122,12 +122,13 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ GT_Utility.stackToInt(aCover), new FacadeData(GT_Utility.copyAmount(1, aCover), 0)); - if (aTileEntity.isClientSide()) GT_RenderingWorld.getInstance().register( - aTileEntity.getXCoord(), - aTileEntity.getYCoord(), - aTileEntity.getZCoord(), - getTargetBlock(aCover), - getTargetMeta(aCover)); + if (aTileEntity.isClientSide()) GT_RenderingWorld.getInstance() + .register( + aTileEntity.getXCoord(), + aTileEntity.getYCoord(), + aTileEntity.getZCoord(), + getTargetBlock(aCover), + getTargetMeta(aCover)); } @Override @@ -149,8 +150,11 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ if (block == null) return Textures.BlockIcons.ERROR_RENDERING[0]; // TODO: change this when *someone* made the block render in both pass if (block.getRenderBlockPass() != 0) return Textures.BlockIcons.ERROR_RENDERING[0]; - return TextureFactory.builder().setFromBlock(block, getTargetMeta(aCoverVariable.mStack)).useWorldCoord() - .setFromSide(ForgeDirection.getOrientation(aSide)).build(); + return TextureFactory.builder() + .setFromBlock(block, getTargetMeta(aCoverVariable.mStack)) + .useWorldCoord() + .setFromSide(ForgeDirection.getOrientation(aSide)) + .build(); } @Override @@ -177,12 +181,13 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ @Override protected void onDataChangedImpl(byte aSide, int aCoverID, FacadeData aCoverVariable, ICoverable aTileEntity) { - if (aTileEntity.isClientSide()) GT_RenderingWorld.getInstance().register( - aTileEntity.getXCoord(), - aTileEntity.getYCoord(), - aTileEntity.getZCoord(), - getTargetBlock(aCoverVariable.mStack), - getTargetMeta(aCoverVariable.mStack)); + if (aTileEntity.isClientSide()) GT_RenderingWorld.getInstance() + .register( + aTileEntity.getXCoord(), + aTileEntity.getYCoord(), + aTileEntity.getZCoord(), + getTargetBlock(aCoverVariable.mStack), + getTargetMeta(aCoverVariable.mStack)); } @Override @@ -195,12 +200,13 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ } if (aCoverVariable.mStack != null) // mStack == null -> cover removed before data reach client - GT_RenderingWorld.getInstance().unregister( - aTileEntity.getXCoord(), - aTileEntity.getYCoord(), - aTileEntity.getZCoord(), - getTargetBlock(aCoverVariable.mStack), - getTargetMeta(aCoverVariable.mStack)); + GT_RenderingWorld.getInstance() + .unregister( + aTileEntity.getXCoord(), + aTileEntity.getYCoord(), + aTileEntity.getZCoord(), + getTargetBlock(aCoverVariable.mStack), + getTargetMeta(aCoverVariable.mStack)); } } @@ -329,39 +335,51 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ 0, CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), widget -> widget.setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), - widget -> widget.setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), - widget -> widget.setPos(spaceX * 0, spaceY * 2)) - .addToggleButton( - 3, - CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), - widget -> widget.setPos(spaceX * 0, spaceY * 3)) - .setPos(startX, startY)) - .widget( - new ItemDrawable(() -> getCoverData() != null ? getCoverData().mStack : null).asWidget() - .setPos(5, 5).setSize(16, 16)) - .widget( - TextWidget - .dynamicString( - () -> getCoverData() != null ? getCoverData().mStack.getDisplayName() : "") - .setSynced(false).setDefaultColor(COLOR_TITLE.get()).setPos(25, 9)) - .widget( - new TextWidget(GT_Utility.trans("128", "Redstone")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("129", "Energy")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("130", "Fluids")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 2)) - .widget( - new TextWidget(GT_Utility.trans("131", "Items")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 3)); + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), + widget -> widget.setPos(spaceX * 0, spaceY * 1)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), + widget -> widget.setPos(spaceX * 0, spaceY * 2)) + .addToggleButton( + 3, + CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(), + widget -> widget.setPos(spaceX * 0, spaceY * 3)) + .setPos(startX, startY)) + .widget( + new ItemDrawable(() -> getCoverData() != null ? getCoverData().mStack : null).asWidget() + .setPos(5, 5) + .setSize( + 16, + 16)) + .widget( + TextWidget.dynamicString( + () -> getCoverData() != null ? getCoverData().mStack.getDisplayName() : "") + .setSynced(false) + .setDefaultColor(COLOR_TITLE.get()) + .setPos(25, 9)) + .widget( + new TextWidget(GT_Utility.trans("128", "Redstone")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("129", "Energy")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("130", "Fluids")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 2)) + .widget( + new TextWidget(GT_Utility.trans("131", "Items")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 3)); } @Override diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java index 53eb3406d4..68bf59b5df 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java @@ -197,19 +197,23 @@ public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLi @Override protected void addUIWidgets(ModularWindow.Builder builder) { builder.widget( - new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_FluidLimiter.this) - .addFollower( + new CoverDataControllerWidget<>( + this::getCoverData, + this::setCoverData, + GT_Cover_FluidLimiter.this).addFollower( new CoverDataFollower_TextFieldWidget<>(), coverData -> String.valueOf(Math.round(coverData.threshold * 100)), (coverData, val) -> { coverData.threshold = (float) (MathExpression.parseMathExpression(val) / 100); return coverData; }, - widget -> widget.setNumbers(0, 100).setFocusOnGuiOpen(true) - .setPos(startX, startY + spaceY * 2 - 24).setSize(spaceX * 4 - 3, 12))) - .widget( - new TextWidget("Percent threshold").setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX, startY + spaceY * 2 - 35)); + widget -> widget.setNumbers(0, 100) + .setFocusOnGuiOpen(true) + .setPos(startX, startY + spaceY * 2 - 24) + .setSize(spaceX * 4 - 3, 12))) + .widget( + new TextWidget("Percent threshold").setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX, startY + spaceY * 2 - 35)); } } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java index b02610ebf4..d02f098e3b 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java @@ -113,11 +113,13 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid tTank2 = aTileEntity.getITankContainerAtSide(aSide); tTank1 = (IFluidHandler) aTileEntity; directionFrom = ForgeDirection.getOrientation(aSide); - directionTo = ForgeDirection.getOrientation(aSide).getOpposite(); + directionTo = ForgeDirection.getOrientation(aSide) + .getOpposite(); } else { tTank1 = aTileEntity.getITankContainerAtSide(aSide); tTank2 = (IFluidHandler) aTileEntity; - directionFrom = ForgeDirection.getOrientation(aSide).getOpposite(); + directionFrom = ForgeDirection.getOrientation(aSide) + .getOpposite(); directionTo = ForgeDirection.getOrientation(aSide); } if (tTank1 != null && tTank2 != null) { @@ -284,130 +286,179 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid new CoverDataControllerWidget<>( this::getCoverData, this::setCoverData, - GT_Cover_FluidRegulator.this) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.speed >= 0, - (coverData, state) -> { - coverData.speed = Math.abs(coverData.speed); - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) + GT_Cover_FluidRegulator.this).addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.speed >= 0, + (coverData, state) -> { + coverData.speed = Math.abs(coverData.speed); + return coverData; + }, + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) .addTooltip(GT_Utility.trans("006", "Export")) .setPos(spaceX * 0, spaceY * 0)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.speed <= 0, - (coverData, state) -> { - coverData.speed = -Math.abs(coverData.speed); - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT) - .addTooltip(GT_Utility.trans("007", "Import")) - .setPos(spaceX * 1, spaceY * 0)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.condition == Conditional.Always, - (coverData, state) -> { - coverData.condition = Conditional.Always; - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK) - .addTooltip(GT_Utility.trans("224", "Always On")) - .setPos(spaceX * 0, spaceY * 1)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.condition == Conditional.Conditional, - (coverData, state) -> { - coverData.condition = Conditional.Conditional; - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON) - .addTooltip(GT_Utility.trans("225", "Active with Redstone Signal")) - .setPos(spaceX * 1, spaceY * 1)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.condition == Conditional.Inverted, - (coverData, state) -> { - coverData.condition = Conditional.Inverted; - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) - .addTooltip( - GT_Utility.trans("226", "Inactive with Redstone Signal")) - .setPos(spaceX * 2, spaceY * 1)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(coverData.speed), - (coverData, state) -> { - coverData.speed = (int) MathExpression.parseMathExpression(state); - return coverData; - }, - widget -> widget.setOnScrollNumbersLong(1, 5, 50).setNumbersLong(val -> { - final int tickRate = getCoverData() != null ? getCoverData().tickRate - : 0; - final long maxFlow = (long) mTransferRate - * GT_Utility.clamp(tickRate, TICK_RATE_MIN, TICK_RATE_MAX); - warn.set(false); - if (val > maxFlow) { - val = maxFlow; - warn.set(true); - } else if (val < -maxFlow) { - val = -maxFlow; - warn.set(true); - } - return val; - }).setPattern(BaseTextFieldWidget.WHOLE_NUMS).setFocusOnGuiOpen(true) - .setPos(spaceX * 0, spaceY * 2 + 2).setSize(spaceX * 4 - 3, 12)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(coverData.tickRate), - (coverData, state) -> { - coverData.tickRate = (int) MathExpression.parseMathExpression(state); - return coverData; - }, - widget -> widget.setOnScrollNumbersLong(1, 5, 50).setNumbersLong(val -> { - final int speed = getCoverData() != null ? getCoverData().speed : 0; - warn.set(false); - if (val > TICK_RATE_MAX) { - val = (long) TICK_RATE_MAX; - warn.set(true); - } else if (Math.abs(speed) > mTransferRate * val) { - val = (long) Math.min( - TICK_RATE_MAX, - (Math.abs(speed) + mTransferRate - 1) / mTransferRate); - warn.set(true); - } else if (val < TICK_RATE_MIN) { - val = 1L; - } - return val; - }).setPattern(BaseTextFieldWidget.WHOLE_NUMS) - .setPos(spaceX * 5, spaceY * 2 + 2).setSize(spaceX * 2 - 3, 12)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("229", "Import/Export")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 4, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("230", "Conditional")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 4, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("208", " L")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 4, 4 + startY + spaceY * 2)) - .widget( - new TextWidget(GT_Utility.trans("209", " ticks")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 7, 4 + startY + spaceY * 2)) - .widget(TextWidget.dynamicText(() -> { - FluidRegulatorData coverVariable = getCoverData(); - if (coverVariable == null) return new Text(""); - return new Text( - String.format( - GT_Utility.trans("210", "Average: %.2f L/sec"), - coverVariable.tickRate == 0 ? 0 - : coverVariable.speed * 20d / coverVariable.tickRate)).color( - warn.get() ? COLOR_TEXT_WARN.get() : COLOR_TEXT_GRAY.get()); - }).setSynced(false).setPos(startX + spaceX * 0, 4 + startY + spaceY * 3)); + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.speed <= 0, + (coverData, state) -> { + coverData.speed = -Math.abs(coverData.speed); + return coverData; + }, + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_IMPORT) + .addTooltip( + GT_Utility.trans( + "007", + "Import")) + .setPos(spaceX * 1, spaceY * 0)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.condition == Conditional.Always, + (coverData, state) -> { + coverData.condition = Conditional.Always; + return coverData; + }, + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_CHECKMARK) + .addTooltip( + GT_Utility.trans( + "224", + "Always On")) + .setPos(spaceX * 0, spaceY * 1)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.condition + == Conditional.Conditional, + (coverData, state) -> { + coverData.condition = Conditional.Conditional; + return coverData; + }, + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON) + .addTooltip( + GT_Utility.trans( + "225", + "Active with Redstone Signal")) + .setPos(spaceX * 1, spaceY * 1)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.condition + == Conditional.Inverted, + (coverData, state) -> { + coverData.condition = Conditional.Inverted; + return coverData; + }, + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) + .addTooltip( + GT_Utility.trans( + "226", + "Inactive with Redstone Signal")) + .setPos(spaceX * 2, spaceY * 1)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> String.valueOf(coverData.speed), + (coverData, state) -> { + coverData.speed = (int) MathExpression.parseMathExpression( + state); + return coverData; + }, + widget -> widget.setOnScrollNumbersLong(1, 5, 50) + .setNumbersLong(val -> { + final int tickRate = getCoverData() + != null ? getCoverData().tickRate + : 0; + final long maxFlow = (long) mTransferRate + * GT_Utility.clamp( + tickRate, + TICK_RATE_MIN, + TICK_RATE_MAX); + warn.set(false); + if (val > maxFlow) { + val = maxFlow; + warn.set(true); + } else if (val < -maxFlow) { + val = -maxFlow; + warn.set(true); + } + return val; + }) + .setPattern( + BaseTextFieldWidget.WHOLE_NUMS) + .setFocusOnGuiOpen(true) + .setPos(spaceX * 0, spaceY * 2 + 2) + .setSize(spaceX * 4 - 3, 12)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> String.valueOf(coverData.tickRate), + (coverData, state) -> { + coverData.tickRate = (int) MathExpression.parseMathExpression( + state); + return coverData; + }, + widget -> widget.setOnScrollNumbersLong(1, 5, 50) + .setNumbersLong(val -> { + final int speed = getCoverData() + != null ? getCoverData().speed + : 0; + warn.set(false); + if (val > TICK_RATE_MAX) { + val = (long) TICK_RATE_MAX; + warn.set(true); + } else if (Math.abs(speed) + > mTransferRate * val) { + val = (long) Math.min( + TICK_RATE_MAX, + (Math.abs( + speed) + + mTransferRate + - 1) + / mTransferRate); + warn.set(true); + } else + if (val < TICK_RATE_MIN) { + val = 1L; + } + return val; + }) + .setPattern( + BaseTextFieldWidget.WHOLE_NUMS) + .setPos(spaceX * 5, spaceY * 2 + 2) + .setSize(spaceX * 2 - 3, 12)) + .setPos(startX, startY)) + .widget( + new TextWidget(GT_Utility.trans("229", "Import/Export")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 4, + 4 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 4, + 4 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("208", " L")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 4, + 4 + startY + spaceY * 2)) + .widget( + new TextWidget(GT_Utility.trans("209", " ticks")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 7, + 4 + startY + spaceY * 2)) + .widget(TextWidget.dynamicText(() -> { + FluidRegulatorData coverVariable = getCoverData(); + if (coverVariable == null) return new Text(""); + return new Text( + String.format( + GT_Utility.trans("210", "Average: %.2f L/sec"), + coverVariable.tickRate == 0 ? 0 + : coverVariable.speed * 20d / coverVariable.tickRate)).color( + warn.get() ? COLOR_TEXT_WARN.get() : COLOR_TEXT_GRAY.get()); + }) + .setSynced(false) + .setPos(startX + spaceX * 0, 4 + startY + spaceY * 3)); } } @@ -499,7 +550,9 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid @Override public void writeToByteBuf(ByteBuf aBuf) { - aBuf.writeInt(tickRate).writeInt(speed).writeByte(condition.ordinal()); + aBuf.writeInt(tickRate) + .writeInt(speed) + .writeByte(condition.ordinal()); } @Override diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java index 184eb8705e..bb140b37a8 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java @@ -81,7 +81,8 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ FluidStorageData aCoverVariable, ICoverable aTileEntity, long aTimer) { final FluidTankInfo[] tanks = getValidFluidTankInfos(aTileEntity, aCoverVariable.side); if (tanks == null) { - return aCoverVariable.disable().issueCoverUpdateIfNeeded(aTileEntity, aSide); + return aCoverVariable.disable() + .issueCoverUpdateIfNeeded(aTileEntity, aSide); } assert 0 < tanks.length; @@ -91,11 +92,13 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ final FluidTankInfo tank = tanks[aCoverVariable.slot]; if (tank == null) { - return aCoverVariable.setNullTank().issueCoverUpdateIfNeeded(aTileEntity, aSide); + return aCoverVariable.setNullTank() + .issueCoverUpdateIfNeeded(aTileEntity, aSide); } - return aCoverVariable.setFluid(tank.fluid).setScale(getTankScale(tank)) - .issueCoverUpdateIfNeeded(aTileEntity, aSide); + return aCoverVariable.setFluid(tank.fluid) + .setScale(getTankScale(tank)) + .issueCoverUpdateIfNeeded(aTileEntity, aSide); } @Override @@ -129,7 +132,9 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ }; final short[] fluidRGBA = colorToRGBA(aCoverVariable.fluid.getColor()); - final ITextureBuilder fluidTextureBuilder = TextureFactory.builder().addIcon(fluidIcon).setRGBA(fluidRGBA); + final ITextureBuilder fluidTextureBuilder = TextureFactory.builder() + .addIcon(fluidIcon) + .setRGBA(fluidRGBA); if (aCoverVariable.fluid.getLuminosity() > 0) fluidTextureBuilder.glow(); return TextureFactory.of(fluidTextureBuilder.build(), TextureFactory.of(icons[aCoverVariable.scale])); } @@ -221,7 +226,9 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ side, new FluidStack(tankInfo.fluid.getFluid(), containerItem.getCapacity(container)), false)) - .filter(fs -> GT_Utility.areFluidsEqual(fs, tankInfo.fluid)).map(fs -> fs.amount).orElse(0), + .filter(fs -> GT_Utility.areFluidsEqual(fs, tankInfo.fluid)) + .map(fs -> fs.amount) + .orElse(0), containerItem.fill( container, new FluidStack(tankInfo.fluid.getFluid(), containerItem.getCapacity(container)), @@ -242,7 +249,9 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ return null; } if (Optional.ofNullable(tank.drain(side, filledFluid, false)) - .filter(fs -> GT_Utility.areFluidsEqual(fs, filledFluid)).map(fs -> fs.amount).orElse(0) + .filter(fs -> GT_Utility.areFluidsEqual(fs, filledFluid)) + .map(fs -> fs.amount) + .orElse(0) != filledFluid.amount) { return null; } @@ -264,7 +273,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ if (aPlayer.isSneaking()) { aCoverVariable.setSide( ForgeDirection.values()[(aCoverVariable.side.ordinal() + 1) % ForgeDirection.values().length]) - .setSlot(0); + .setSlot(0); GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("SIDE", "Side: ") + aCoverVariable.side.name()); return aCoverVariable; } @@ -276,8 +285,8 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ if (aCoverVariable.slot < 0 || tanks.length <= aCoverVariable.slot) { aCoverVariable.setSlot(0); } else { - aCoverVariable - .setSlot((aCoverVariable.slot + tanks.length + (aPlayer.isSneaking() ? -1 : 1)) % tanks.length); + aCoverVariable.setSlot( + (aCoverVariable.slot + tanks.length + (aPlayer.isSneaking() ? -1 : 1)) % tanks.length); } GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("053", "Slot: ") + aCoverVariable.slot); return aCoverVariable; @@ -397,7 +406,8 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ } public FluidStorageData setNullTank() { - return this.setFluid((Fluid) null).setScale(0); + return this.setFluid((Fluid) null) + .setScale(0); } public FluidStorageData issueCoverUpdateIfNeeded(ICoverable tileEntity, byte side) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java index 09239c0a07..65e036a110 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java @@ -273,94 +273,101 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil 0, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT) - .addTooltip(GT_Utility.trans("232", "Filter Input")) - .setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) - .addTooltip(GT_Utility.trans("233", "Filter Output")) - .setPos(spaceX * 1, spaceY * 0)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT) - .addTooltip(GT_Utility.trans("234", "Block Output")) - .setPos(spaceX * 0, spaceY * 2)) - .addToggleButton( - 3, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT) - .addTooltip(GT_Utility.trans("235", "Allow Output")) - .setPos(spaceX * 1, spaceY * 2)) - .addToggleButton( - 4, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_WHITELIST) - .addTooltip(GT_Utility.trans("236", "Whitelist Fluid")) - .setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 5, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLACKLIST) - .addTooltip(GT_Utility.trans("237", "Blacklist Fluid")) - .setPos(spaceX * 1, spaceY * 1)) - .addFollower( - new CoverDataFollower_SlotWidget<FluidFilterData>( - new ItemStackHandler(), - 0, - true) { - - @Override - protected void putClickedStack(ItemStack stack, int mouseButton) { - if (stack != null - && GT_Utility.getFluidFromContainerOrFluidDisplay(stack) - == null) - return; - super.putClickedStack( - GT_Utility.getFluidDisplayStack( - GT_Utility - .getFluidFromContainerOrFluidDisplay(stack), - false), - mouseButton); - } - }, - this::getFluidDisplayItem, - (coverData, stack) -> { - if (stack == null) { - coverData.mFluidID = -1; - } else { - FluidStack fluid = GT_Utility.getFluidFromDisplayStack(stack); - if (fluid != null && fluid.getFluid() != null) { - coverData.mFluidID = fluid.getFluid().getID(); - } - } - return coverData; - }, - widget -> widget.setBackground(ModularUITextures.FLUID_SLOT) - .setPos(0, spaceY * 3 + 2)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("238", "Filter Direction")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 2, 3 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("239", "Filter Type")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 2, 3 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("240", "Block Flow")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 2, 3 + startY + spaceY * 2)) - .widget(TextWidget.dynamicString(() -> { - if (getCoverData() != null) { - ItemStack fluidDisplay = getFluidDisplayItem(getCoverData()); - if (fluidDisplay != null) { - return fluidDisplay.getDisplayName(); - } - } - return GT_Utility.trans("315", "Filter Empty"); - }).setSynced(false).setDefaultColor(COLOR_TITLE.get()) - .setPos(startX + spaceX + 3, 4 + startY + spaceY * 3)); + .addTooltip(GT_Utility.trans("232", "Filter Input")) + .setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) + .addTooltip(GT_Utility.trans("233", "Filter Output")) + .setPos(spaceX * 1, spaceY * 0)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT) + .addTooltip(GT_Utility.trans("234", "Block Output")) + .setPos(spaceX * 0, spaceY * 2)) + .addToggleButton( + 3, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT) + .addTooltip(GT_Utility.trans("235", "Allow Output")) + .setPos(spaceX * 1, spaceY * 2)) + .addToggleButton( + 4, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_WHITELIST) + .addTooltip(GT_Utility.trans("236", "Whitelist Fluid")) + .setPos(spaceX * 0, spaceY * 1)) + .addToggleButton( + 5, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLACKLIST) + .addTooltip(GT_Utility.trans("237", "Blacklist Fluid")) + .setPos(spaceX * 1, spaceY * 1)) + .addFollower( + new CoverDataFollower_SlotWidget<FluidFilterData>( + new ItemStackHandler(), + 0, + true) { + + @Override + protected void putClickedStack(ItemStack stack, int mouseButton) { + if (stack != null + && GT_Utility.getFluidFromContainerOrFluidDisplay(stack) == null) + return; + super.putClickedStack( + GT_Utility.getFluidDisplayStack( + GT_Utility.getFluidFromContainerOrFluidDisplay(stack), + false), + mouseButton); + } + }, + this::getFluidDisplayItem, + (coverData, stack) -> { + if (stack == null) { + coverData.mFluidID = -1; + } else { + FluidStack fluid = GT_Utility.getFluidFromDisplayStack(stack); + if (fluid != null && fluid.getFluid() != null) { + coverData.mFluidID = fluid.getFluid() + .getID(); + } + } + return coverData; + }, + widget -> widget.setBackground(ModularUITextures.FLUID_SLOT) + .setPos(0, spaceY * 3 + 2)) + .setPos(startX, startY)) + .widget( + new TextWidget(GT_Utility.trans("238", "Filter Direction")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 2, + 3 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("239", "Filter Type")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 2, + 3 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("240", "Block Flow")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 2, + 3 + startY + spaceY * 2)) + .widget(TextWidget.dynamicString(() -> { + if (getCoverData() != null) { + ItemStack fluidDisplay = getFluidDisplayItem(getCoverData()); + if (fluidDisplay != null) { + return fluidDisplay.getDisplayName(); + } + } + return GT_Utility.trans("315", "Filter Empty"); + }) + .setSynced(false) + .setDefaultColor(COLOR_TITLE.get()) + .setPos(startX + spaceX + 3, 4 + startY + spaceY * 3)); } private int getNewFilterMode(int id, FluidFilterData coverVariable) { @@ -423,13 +430,17 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil public NBTBase saveDataToNBT() { NBTTagCompound tNBT = new NBTTagCompound(); tNBT.setInteger("mFilterMode", mFilterMode); - if (mFluidID >= 0) tNBT.setString("mFluid", FluidRegistry.getFluid(mFluidID).getName()); + if (mFluidID >= 0) tNBT.setString( + "mFluid", + FluidRegistry.getFluid(mFluidID) + .getName()); return tNBT; } @Override public void writeToByteBuf(ByteBuf aBuf) { - aBuf.writeByte(mFilterMode).writeInt(mFluidID); + aBuf.writeByte(mFilterMode) + .writeInt(mFluidID); } @Override diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java index a1378c9812..3ea7c88d8e 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java @@ -214,37 +214,46 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte filterInvHandler.setStackInSlot(0, setStackSize1(getCoverData().mFilter)); } builder.widget( - new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_ItemFilter.this) - .addFollower( + new CoverDataControllerWidget<>( + this::getCoverData, + this::setCoverData, + GT_Cover_ItemFilter.this).addFollower( new CoverDataFollower_ToggleButtonWidget<>(), coverData -> coverData.mWhitelist, (coverData, state) -> { coverData.mWhitelist = state; return coverData; }, - widget -> widget - .setToggleTexture( - GT_UITextures.OVERLAY_BUTTON_WHITELIST, - GT_UITextures.OVERLAY_BUTTON_BLACKLIST) - .addTooltip(0, GT_Utility.trans("124.1", "Blacklist Mode")) - .addTooltip(1, GT_Utility.trans("125.1", "Whitelist Mode")) - .setPos(spaceX * 0, spaceY * 0)) - .addFollower( - new CoverDataFollower_SlotWidget<>(filterInvHandler, 0, true), - coverData -> setStackSize1(coverData.mFilter), - (coverData, stack) -> { - coverData.mFilter = setStackSize1(stack); - return coverData; - }, - widget -> widget.setBackground(GT_UITextures.SLOT_DARK_GRAY) - .setPos(spaceX * 0, spaceY * 2)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("317", "Filter: ")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 0, 3 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("318", "Check Mode")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 2, 3 + startY + spaceY * 0)); + widget -> widget.setToggleTexture( + GT_UITextures.OVERLAY_BUTTON_WHITELIST, + GT_UITextures.OVERLAY_BUTTON_BLACKLIST) + .addTooltip(0, GT_Utility.trans("124.1", "Blacklist Mode")) + .addTooltip(1, GT_Utility.trans("125.1", "Whitelist Mode")) + .setPos(spaceX * 0, spaceY * 0)) + .addFollower( + new CoverDataFollower_SlotWidget<>( + filterInvHandler, + 0, + true), + coverData -> setStackSize1(coverData.mFilter), + (coverData, stack) -> { + coverData.mFilter = setStackSize1(stack); + return coverData; + }, + widget -> widget.setBackground( + GT_UITextures.SLOT_DARK_GRAY) + .setPos(spaceX * 0, spaceY * 2)) + .setPos(startX, startY)) + .widget( + new TextWidget(GT_Utility.trans("317", "Filter: ")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 0, + 3 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("318", "Check Mode")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 2, + 3 + startY + spaceY * 0)); } private ItemStack setStackSize1(ItemStack stack) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java index 14607cdf09..cc3f553755 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java @@ -135,8 +135,9 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. aCoverVariable.slot++; if (aCoverVariable.slot > aTileEntity.getSizeInventory()) aCoverVariable.slot = -1; - if (aCoverVariable.slot == -1) GT_Utility - .sendChatToPlayer(aPlayer, GT_Utility.trans("053", "Slot: ") + GT_Utility.trans("ALL", "All")); + if (aCoverVariable.slot == -1) GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("053", "Slot: ") + GT_Utility.trans("ALL", "All")); else GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("053", "Slot: ") + aCoverVariable.slot); } @@ -228,67 +229,84 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. maxSlot = getMaxSlot(); builder.widget( - new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_ItemMeter.this) - .addFollower( + new CoverDataControllerWidget<>( + this::getCoverData, + this::setCoverData, + GT_Cover_ItemMeter.this).addFollower( CoverDataFollower_ToggleButtonWidget.ofRedstone(), coverData -> coverData.inverted, (coverData, state) -> { coverData.inverted = state; return coverData; }, - widget -> widget.addTooltip(0, NORMAL).addTooltip(1, INVERTED).setPos(0, 0)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> getSlotTextFieldContent(coverData.slot), - (coverData, state) -> { - coverData.slot = getIntFromText(state); - return coverData; - }, - widget -> widget.setOnScrollText().setValidator(val -> { - final int valSlot = getIntFromText(val); - if (valSlot > -1) { - return TextFieldWidget.format.format(Math.min(valSlot, maxSlot)); - } else { - return ALL_TEXT; - } - }).setPattern(BaseTextFieldWidget.NATURAL_NUMS).setFocusOnGuiOpen(true) - .setPos(0, spaceY + 2).setSize(spaceX * 2 + 5, 12)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(coverData.threshold), - (coverData, state) -> { - coverData.threshold = (int) MathExpression.parseMathExpression(state); - return coverData; - }, - widget -> widget.setOnScrollNumbers(1, 10, 64).setNumbers(0, getUpperBound()) - .setPos(0, spaceY * 2 + 2).setSize(spaceX * 2 + 5, 12)) - .setPos(startX, startY)) - .widget( - new ItemWatcherSlotWidget().setGetter( - this::getTargetItem).setPos( - startX + spaceX * 8 - 4, - startY + spaceY)) - .widget( - TextWidget.dynamicString( - () -> getCoverData() != null ? getCoverData().inverted ? INVERTED : NORMAL : "") - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 4 + startY)) - .widget( - new TextWidget(GT_Utility.trans("254", "Detect slot#")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 4 + startY + spaceY)) - .widget( - new TextWidget(GT_Utility.trans("221", "Item threshold")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, startY + spaceY * 2 + 4)); + widget -> widget.addTooltip(0, NORMAL) + .addTooltip(1, INVERTED) + .setPos(0, 0)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> getSlotTextFieldContent(coverData.slot), + (coverData, state) -> { + coverData.slot = getIntFromText(state); + return coverData; + }, + widget -> widget.setOnScrollText() + .setValidator(val -> { + final int valSlot = getIntFromText(val); + if (valSlot > -1) { + return TextFieldWidget.format.format( + Math.min(valSlot, maxSlot)); + } else { + return ALL_TEXT; + } + }) + .setPattern( + BaseTextFieldWidget.NATURAL_NUMS) + .setFocusOnGuiOpen(true) + .setPos(0, spaceY + 2) + .setSize(spaceX * 2 + 5, 12)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> String.valueOf(coverData.threshold), + (coverData, state) -> { + coverData.threshold = (int) MathExpression.parseMathExpression( + state); + return coverData; + }, + widget -> widget.setOnScrollNumbers(1, 10, 64) + .setNumbers(0, getUpperBound()) + .setPos(0, spaceY * 2 + 2) + .setSize(spaceX * 2 + 5, 12)) + .setPos(startX, startY)) + .widget( + new ItemWatcherSlotWidget().setGetter(this::getTargetItem) + .setPos(startX + spaceX * 8 - 4, startY + spaceY)) + .widget( + TextWidget.dynamicString( + () -> getCoverData() != null ? getCoverData().inverted ? INVERTED : NORMAL : "") + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 3, 4 + startY)) + .widget( + new TextWidget(GT_Utility.trans("254", "Detect slot#")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 4 + startY + spaceY)) + .widget( + new TextWidget(GT_Utility.trans("221", "Item threshold")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + startY + spaceY * 2 + 4)); } private int getMaxSlot() { final ICoverable tile = getUIBuildContext().getTile(); if (tile instanceof TileEntity && !tile.isDead() && tile instanceof IGregTechTileEntity - && !(((IGregTechTileEntity) tile) - .getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase)) + && !(((IGregTechTileEntity) tile).getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase)) return Math.min(tile.getSizeInventory() - 1, SLOT_MASK - 1); else return -1; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java index af062ca56b..4e54aa7cf3 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java @@ -66,10 +66,9 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe if (tanks != null) { for (FluidTankInfo tank : tanks) { if (tank != null) { - if (tileEntity instanceof BaseMetaTileEntity && ((BaseMetaTileEntity) tileEntity) - .getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalTankBase) { - max += ((GT_MetaTileEntity_DigitalTankBase) ((BaseMetaTileEntity) tileEntity) - .getMetaTileEntity()).getRealCapacity(); + if (tileEntity instanceof BaseMetaTileEntity + && ((BaseMetaTileEntity) tileEntity).getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalTankBase) { + max += ((GT_MetaTileEntity_DigitalTankBase) ((BaseMetaTileEntity) tileEntity).getMetaTileEntity()).getRealCapacity(); } else max += tank.capacity; FluidStack tLiquid = tank.fluid; if (tLiquid != null) { @@ -196,60 +195,75 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe final int maxCapacity; if (getUIBuildContext().getTile() instanceof IFluidHandler) { - FluidTankInfo[] tanks = ((IFluidHandler) getUIBuildContext().getTile()) - .getTankInfo(ForgeDirection.UNKNOWN); - maxCapacity = Arrays.stream(tanks).mapToInt(tank -> tank.capacity).sum(); + FluidTankInfo[] tanks = ((IFluidHandler) getUIBuildContext().getTile()).getTankInfo( + ForgeDirection.UNKNOWN); + maxCapacity = Arrays.stream(tanks) + .mapToInt(tank -> tank.capacity) + .sum(); } else { maxCapacity = -1; } builder.widget( - new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, GT_Cover_LiquidMeter.this) - .addFollower( + new CoverDataControllerWidget<>( + this::getCoverData, + this::setCoverData, + GT_Cover_LiquidMeter.this).addFollower( CoverDataFollower_ToggleButtonWidget.ofRedstone(), coverData -> coverData.inverted, (coverData, state) -> { coverData.inverted = state; return coverData; }, - widget -> widget.addTooltip(0, NORMAL).addTooltip(1, INVERTED) - .setPos(spaceX * 0, spaceY * 0)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofRedstone(), - coverData -> coverData.strong, - (coverData, state) -> { - coverData.strong = state; - return coverData; - }, - widget -> widget.addTooltip(0, WEAK).addTooltip(1, STRONG) - .setPos(spaceX * 0, spaceY * 1)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(coverData.threshold), - (coverData, state) -> { - coverData.threshold = (int) MathExpression.parseMathExpression(state); - return coverData; - }, - widget -> widget.setOnScrollNumbers(1000, 100, 100000) - .setNumbers(0, maxCapacity > 0 ? maxCapacity : Integer.MAX_VALUE) - .setFocusOnGuiOpen(true).setPos(spaceX * 0, spaceY * 2 + 2) - .setSize(spaceX * 4 + 5, 12)) - .setPos(startX, startY)) - .widget( - TextWidget.dynamicString( - () -> getCoverData() != null ? getCoverData().inverted ? INVERTED : NORMAL : "") - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0)) - .widget( - TextWidget - .dynamicString( - () -> getCoverData() != null ? getCoverData().strong ? STRONG : WEAK : "") - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("222", "Fluid threshold")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5 - 10, startY + spaceY * 2 + 4)); + widget -> widget.addTooltip(0, NORMAL) + .addTooltip(1, INVERTED) + .setPos(spaceX * 0, spaceY * 0)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofRedstone(), + coverData -> coverData.strong, + (coverData, state) -> { + coverData.strong = state; + return coverData; + }, + widget -> widget.addTooltip(0, WEAK) + .addTooltip(1, STRONG) + .setPos(spaceX * 0, spaceY * 1)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> String.valueOf(coverData.threshold), + (coverData, state) -> { + coverData.threshold = (int) MathExpression.parseMathExpression( + state); + return coverData; + }, + widget -> widget.setOnScrollNumbers(1000, 100, 100000) + .setNumbers( + 0, + maxCapacity > 0 ? maxCapacity + : Integer.MAX_VALUE) + .setFocusOnGuiOpen(true) + .setPos(spaceX * 0, spaceY * 2 + 2) + .setSize(spaceX * 4 + 5, 12)) + .setPos(startX, startY)) + .widget( + TextWidget.dynamicString( + () -> getCoverData() != null ? getCoverData().inverted ? INVERTED : NORMAL : "") + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0)) + .widget( + TextWidget.dynamicString( + () -> getCoverData() != null ? getCoverData().strong ? STRONG : WEAK : "") + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 1, 4 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("222", "Fluid threshold")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 5 - 10, + startY + spaceY * 2 + 4)); } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java index cb8c4e691e..0387d4e4b9 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java @@ -247,69 +247,93 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior { getNewCoverVariable(index, convert(coverData)))).addToggleButton( 0, CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.addTooltip(tooltipText[0]).setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.addTooltip(tooltipText[1]) - .setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.addTooltip(tooltipText[2]) - .setPos(spaceX * 0, spaceY * 2)) - .addToggleButton( - 3, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.addTooltip(tooltipText[3]) - .setPos(spaceX * 0, spaceY * 3)) - .addToggleButton( - 4, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.addTooltip(tooltipText[4]) - .setPos(spaceX * 4 + 4, spaceY * 0)) - .addToggleButton( - 5, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.addTooltip(tooltipText[5]) - .setPos(spaceX * 4 + 4, spaceY * 1)) - .addToggleButton( - 6, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.addTooltip(tooltipText[6]) - .setPos(spaceX * 4 + 4, spaceY * 2)) - .addToggleButton( - 7, - CoverDataFollower_ToggleButtonWidget.ofRedstone(), - widget -> widget.setPos(spaceX * 4 + 4, spaceY * 3)) - .setPos(startX, startY)) - .widget( - new TextWidget(buttonText[0]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(buttonText[1]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(buttonText[2]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 2)) - .widget( - new TextWidget(buttonText[3]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 3)) - .widget( - new TextWidget(buttonText[4]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(buttonText[5]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(buttonText[6]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 2)) - .widget( - TextWidget - .dynamicString( - () -> isEnabled(7, convert(getCoverData())) ? buttonText[7] : buttonText[8]) - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 3)); + widget -> widget.addTooltip(tooltipText[0]) + .setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + tooltipText[1]) + .setPos( + spaceX * 0, + spaceY * 1)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + tooltipText[2]) + .setPos( + spaceX * 0, + spaceY * 2)) + .addToggleButton( + 3, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + tooltipText[3]) + .setPos( + spaceX * 0, + spaceY * 3)) + .addToggleButton( + 4, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + tooltipText[4]) + .setPos( + spaceX * 4 + + 4, + spaceY * 0)) + .addToggleButton( + 5, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + tooltipText[5]) + .setPos( + spaceX * 4 + + 4, + spaceY * 1)) + .addToggleButton( + 6, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + tooltipText[6]) + .setPos( + spaceX * 4 + + 4, + spaceY * 2)) + .addToggleButton( + 7, + CoverDataFollower_ToggleButtonWidget.ofRedstone(), + widget -> widget.setPos( + spaceX * 4 + 4, + spaceY * 3)) + .setPos(startX, startY)) + .widget( + new TextWidget(buttonText[0]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0)) + .widget( + new TextWidget(buttonText[1]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 1, 4 + startY + spaceY * 1)) + .widget( + new TextWidget(buttonText[2]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 1, 4 + startY + spaceY * 2)) + .widget( + new TextWidget(buttonText[3]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 1, 4 + startY + spaceY * 3)) + .widget( + new TextWidget(buttonText[4]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 0)) + .widget( + new TextWidget(buttonText[5]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 1)) + .widget( + new TextWidget(buttonText[6]).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 2)) + .widget( + TextWidget.dynamicString( + () -> isEnabled(7, convert(getCoverData())) ? buttonText[7] : buttonText[8]) + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 5 + 4, 4 + startY + spaceY * 3)); } private int getNewCoverVariable(int id, int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java index 5746807247..bbfe23eb30 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java @@ -68,7 +68,8 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior { playerDetected = true; break; } - if (tEntity.getDisplayName().equalsIgnoreCase(placer)) { + if (tEntity.getDisplayName() + .equalsIgnoreCase(placer)) { if (aCoverVariable == 1) { playerDetected = true; break; @@ -187,33 +188,49 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior { (index, coverData) -> new ISerializableObject.LegacyCoverData(index)).addToggleButton( 0, CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget - .addTooltip(GT_Utility.trans("068.1", "Emit if any Player is close")) - .setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget - .addTooltip( - GT_Utility.trans("069.1", "Emit if other Player is close")) - .setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget - .addTooltip(GT_Utility.trans("070", "Emit if you are close")) - .setPos(spaceX * 0, spaceY * 2)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("319", "Any player")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("320", "Other players")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("321", "Only owner")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, 4 + startY + spaceY * 2)); + widget -> widget.addTooltip( + GT_Utility.trans("068.1", "Emit if any Player is close")) + .setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + GT_Utility.trans( + "069.1", + "Emit if other Player is close")) + .setPos( + spaceX * 0, + spaceY * 1)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.addTooltip( + GT_Utility.trans( + "070", + "Emit if you are close")) + .setPos( + spaceX * 0, + spaceY * 2)) + .setPos( + startX, + startY)) + .widget( + new TextWidget(GT_Utility.trans("319", "Any player")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 1, + 4 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("320", "Other players")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 1, + 4 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("321", "Only owner")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 1, + 4 + startY + spaceY * 2)); } } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java index 57f39d4ba6..2e23995fcf 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java @@ -60,18 +60,25 @@ public class GT_Cover_Pump extends GT_CoverBehavior { FluidStack tLiquid = tTank1.drain(ForgeDirection.getOrientation(aSide), this.mTransferRate, false); if (tLiquid != null) { tLiquid = tLiquid.copy(); - tLiquid.amount = tTank2 - .fill(ForgeDirection.getOrientation(aSide).getOpposite(), tLiquid, false); + tLiquid.amount = tTank2.fill( + ForgeDirection.getOrientation(aSide) + .getOpposite(), + tLiquid, + false); if (tLiquid.amount > 0 && canTransferFluid(tLiquid)) { tTank2.fill( - ForgeDirection.getOrientation(aSide).getOpposite(), + ForgeDirection.getOrientation(aSide) + .getOpposite(), tTank1.drain(ForgeDirection.getOrientation(aSide), tLiquid.amount, true), true); } } } else { - FluidStack tLiquid = tTank2 - .drain(ForgeDirection.getOrientation(aSide).getOpposite(), this.mTransferRate, false); + FluidStack tLiquid = tTank2.drain( + ForgeDirection.getOrientation(aSide) + .getOpposite(), + this.mTransferRate, + false); if (tLiquid != null) { tLiquid = tLiquid.copy(); tLiquid.amount = tTank1.fill(ForgeDirection.getOrientation(aSide), tLiquid, false); @@ -79,7 +86,8 @@ public class GT_Cover_Pump extends GT_CoverBehavior { tTank1.fill( ForgeDirection.getOrientation(aSide), tTank2.drain( - ForgeDirection.getOrientation(aSide).getOpposite(), + ForgeDirection.getOrientation(aSide) + .getOpposite(), tLiquid.amount, true), true); @@ -245,69 +253,100 @@ public class GT_Cover_Pump extends GT_CoverBehavior { 0, CoverDataFollower_ToggleButtonWidget.ofDisableable(), widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EXPORT) - .addTooltip(GT_Utility.trans("006", "Export")) - .setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_IMPORT) - .addTooltip(GT_Utility.trans("007", "Import")) - .setPos(spaceX * 1, spaceY * 0)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK) - .addTooltip(GT_Utility.trans("224", "Always On")) - .setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 3, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON) - .addTooltip( - GT_Utility.trans( - "225", - "Active with Redstone Signal")) - .setPos(spaceX * 1, spaceY * 1)) - .addToggleButton( - 4, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) - .addTooltip( - GT_Utility.trans( - "226", - "Inactive with Redstone Signal")) - .setPos(spaceX * 2, spaceY * 1)) - .addToggleButton( - 5, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT) - .addTooltip(GT_Utility.trans("227", "Allow Input")) - .setPos(spaceX * 0, spaceY * 2)) - .addToggleButton( - 6, - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - widget -> widget - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT) - .addTooltip(GT_Utility.trans("228", "Block Input")) - .setPos(spaceX * 1, spaceY * 2)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("229", "Import/Export")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 3 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("230", "Conditional")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 3 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("231", "Enable Input")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 3, 3 + startY + spaceY * 2)); + .addTooltip(GT_Utility.trans("006", "Export")) + .setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_IMPORT) + .addTooltip( + GT_Utility.trans( + "007", + "Import")) + .setPos( + spaceX * 1, + spaceY * 0)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_CHECKMARK) + .addTooltip( + GT_Utility.trans( + "224", + "Always On")) + .setPos( + spaceX * 0, + spaceY * 1)) + .addToggleButton( + 3, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON) + .addTooltip( + GT_Utility.trans( + "225", + "Active with Redstone Signal")) + .setPos( + spaceX * 1, + spaceY * 1)) + .addToggleButton( + 4, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) + .addTooltip( + GT_Utility.trans( + "226", + "Inactive with Redstone Signal")) + .setPos( + spaceX * 2, + spaceY * 1)) + .addToggleButton( + 5, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_ALLOW_INPUT) + .addTooltip( + GT_Utility.trans( + "227", + "Allow Input")) + .setPos( + spaceX * 0, + spaceY * 2)) + .addToggleButton( + 6, + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + widget -> widget.setStaticTexture( + GT_UITextures.OVERLAY_BUTTON_BLOCK_INPUT) + .addTooltip( + GT_Utility.trans( + "228", + "Block Input")) + .setPos( + spaceX * 1, + spaceY * 2)) + .setPos(startX, startY)) + .widget( + new TextWidget(GT_Utility.trans("229", "Import/Export")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 3 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("230", "Conditional")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 3 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("231", "Enable Input")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 3, + 3 + startY + spaceY * 2)); } private int getNewCoverVariable(int id, int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java index f4b7f5fa80..968ad3f815 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java @@ -27,8 +27,9 @@ public class GT_Cover_RedstoneTransmitterInternal extends GT_Cover_RedstoneWirel @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) { - GregTech_API.sWirelessRedstone - .put(Integer.valueOf(aCoverVariable), Byte.valueOf(aTileEntity.getOutputRedstoneSignal(aSide))); + GregTech_API.sWirelessRedstone.put( + Integer.valueOf(aCoverVariable), + Byte.valueOf(aTileEntity.getOutputRedstoneSignal(aSide))); return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java index 441201af08..88a472797b 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java @@ -68,13 +68,15 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte) 0); int val = GT_Utility.stackToInt(aPlayer.inventory.getCurrentItem()) - * (1 + aPlayer.inventory.getCurrentItem().getItemDamage()); + * (1 + aPlayer.inventory.getCurrentItem() + .getItemDamage()); aCoverVariable = (aCoverVariable & (PRIVATE_MASK | CHECKBOX_MASK)) | (val & PUBLIC_MASK); aTileEntity.setCoverDataAtSide(aSide, aCoverVariable); - GT_Utility - .sendChatToPlayer(aPlayer, GT_Utility.trans("081", "Frequency: ") + (aCoverVariable & PUBLIC_MASK)); + GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("081", "Frequency: ") + (aCoverVariable & PUBLIC_MASK)); return true; } return false; @@ -198,30 +200,41 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { new CoverDataControllerWidget<>( this::getCoverData, this::setCoverData, - GT_Cover_RedstoneWirelessBase.this) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> String.valueOf(getFlagFrequency(convert(coverData))), - (coverData, text) -> new ISerializableObject.LegacyCoverData( - (int) MathExpression.parseMathExpression(text) - | getFlagCheckbox(convert(coverData))), - widget -> widget.setOnScrollNumbers().setNumbers(0, MAX_CHANNEL) - .setFocusOnGuiOpen(true).setPos(spaceX * 0, spaceY * 0 + 2) + GT_Cover_RedstoneWirelessBase.this).addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> String.valueOf(getFlagFrequency(convert(coverData))), + (coverData, text) -> new ISerializableObject.LegacyCoverData( + (int) MathExpression.parseMathExpression(text) + | getFlagCheckbox(convert(coverData))), + widget -> widget.setOnScrollNumbers() + .setNumbers(0, MAX_CHANNEL) + .setFocusOnGuiOpen(true) + .setPos(spaceX * 0, spaceY * 0 + 2) .setSize(spaceX * 4 - 3, 12)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofCheck(), - coverData -> getFlagCheckbox(convert(coverData)) > 0, - (coverData, state) -> new ISerializableObject.LegacyCoverData( - getFlagFrequency(convert(coverData)) | (state ? CHECKBOX_MASK : 0)), - widget -> widget.setPos(spaceX * 0, spaceY * 2)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 4, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("602", "Use Private Frequency")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 1, startY + spaceY * 2 + 4)); + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofCheck(), + coverData -> getFlagCheckbox(convert(coverData)) + > 0, + (coverData, + state) -> new ISerializableObject.LegacyCoverData( + getFlagFrequency( + convert(coverData)) + | (state ? CHECKBOX_MASK + : 0)), + widget -> widget.setPos(spaceX * 0, spaceY * 2)) + .setPos(startX, startY)) + .widget( + new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 4, + 4 + startY + spaceY * 0)) + .widget( + new TextWidget(GT_Utility.trans("602", "Use Private Frequency")).setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 1, + startY + spaceY * 2 + + 4)); } private int getFlagFrequency(int coverVariable) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java index f1e977efad..81af7b06d4 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java @@ -173,40 +173,65 @@ public class GT_Cover_Shutter extends GT_CoverBehavior { this::setCoverData, GT_Cover_Shutter.this, (index, coverData) -> index == convert(coverData), - (index, coverData) -> new ISerializableObject.LegacyCoverData(index)) - .addToggleButton( - 0, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.setPos(spaceX * 0, spaceY * 0)) - .addToggleButton( - 1, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.setPos(spaceX * 0, spaceY * 1)) - .addToggleButton( - 2, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.setPos(spaceX * 0, spaceY * 2)) - .addToggleButton( - 3, - CoverDataFollower_ToggleButtonWidget.ofCheck(), - widget -> widget.setPos(spaceX * 0, spaceY * 3)) - .setPos(startX, startY)) - .widget( - new TextWidget(GT_Utility.trans("082", "Open if work enabled")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 0)) - .widget( - new TextWidget(GT_Utility.trans("083", "Open if work disabled")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 1)) - .widget( - new TextWidget(GT_Utility.trans("084", "Only Output allowed")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 2)) - .widget( - new TextWidget(GT_Utility.trans("085", "Only Input allowed")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 3)); + (index, coverData) -> new ISerializableObject.LegacyCoverData(index)).addToggleButton( + 0, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.setPos(spaceX * 0, spaceY * 0)) + .addToggleButton( + 1, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.setPos( + spaceX * 0, + spaceY * 1)) + .addToggleButton( + 2, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.setPos( + spaceX * 0, + spaceY * 2)) + .addToggleButton( + 3, + CoverDataFollower_ToggleButtonWidget.ofCheck(), + widget -> widget.setPos( + spaceX * 0, + spaceY * 3)) + .setPos( + startX, + startY)) + .widget( + new TextWidget(GT_Utility.trans("082", "Open if work enabled")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + + spaceX * 1, + 4 + startY + + spaceY * 0)) + .widget( + new TextWidget( + GT_Utility.trans("083", "Open if work disabled")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + spaceY * 1)) + .widget( + new TextWidget(GT_Utility.trans("084", "Only Output allowed")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + + spaceX * 1, + 4 + startY + + spaceY * 2)) + .widget( + new TextWidget(GT_Utility.trans("085", "Only Input allowed")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 3 + startX + spaceX * 1, + 4 + startY + + spaceY * 3)); } } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java index 7bd0503214..7b41aefcca 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java @@ -32,22 +32,27 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior { int coverState = aCoverVariable & 0x3; int coverNum = aCoverVariable >> 2; if (aTimer % 100L == 0L) { - if (aTileEntity.getWorld().isThundering()) { + if (aTileEntity.getWorld() + .isThundering()) { return aTileEntity.getBiome().rainfall > 0.0F && aTileEntity.getSkyAtSide(aSide) ? Math.min(20, coverNum) << 2 : coverNum << 2; } else { - if (aTileEntity.getWorld().isRaining() && aTileEntity.getBiome().rainfall > 0.0F) { // really rains + if (aTileEntity.getWorld() + .isRaining() + && aTileEntity.getBiome().rainfall > 0.0F) { // really rains if (aTileEntity.getSkyAtSide(aSide)) coverNum = Math.min(30, coverNum); if (aTileEntity.getWorld().skylightSubtracted >= 4) { - if (aTileEntity.getWorld().isDaytime()) { + if (aTileEntity.getWorld() + .isDaytime()) { coverState = 2; } else { return coverNum << 2; } } } else { // not rains - if (aTileEntity.getWorld().isDaytime()) { + if (aTileEntity.getWorld() + .isDaytime()) { coverState = 1; } else { coverState = 2; @@ -74,7 +79,8 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior { for (int i = 0; i < aPlayer.inventory.mainInventory.length; i++) { ItemStack is = aPlayer.inventory.mainInventory[i]; if (is == null) continue; - if (is.getUnlocalizedName().equals(new ItemStack(Items.water_bucket).getUnlocalizedName())) { + if (is.getUnlocalizedName() + .equals(new ItemStack(Items.water_bucket).getUnlocalizedName())) { aPlayer.inventory.mainInventory[i] = new ItemStack(Items.bucket); if (aPlayer.inventoryContainer != null) aPlayer.inventoryContainer.detectAndSendChanges(); GT_Utility.sendChatToPlayer( @@ -100,7 +106,8 @@ public class GT_Cover_SolarPanel extends GT_CoverBehavior { for (int i = 0; i < aPlayer.inventory.mainInventory.length; i++) { ItemStack is = aPlayer.inventory.mainInventory[i]; if (is == null) continue; - if (is.getUnlocalizedName().equals(new ItemStack(Items.water_bucket).getUnlocalizedName())) { + if (is.getUnlocalizedName() + .equals(new ItemStack(Items.water_bucket).getUnlocalizedName())) { aPlayer.inventory.mainInventory[i] = new ItemStack(Items.bucket); if (aPlayer.inventoryContainer != null) aPlayer.inventoryContainer.detectAndSendChanges(); GT_Utility.sendChatToPlayer(aPlayer, "Cleaned solar panel from " + (aCoverVariable >> 2) + "% dirt"); diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java index e296785cd8..bebedffaca 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverBase.java @@ -72,7 +72,9 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase super.addUIWidgets(builder); builder.widget( new TextWidget(GT_Utility.trans("335", "Gate Mode")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2)); + .setPos( + startX + spaceX * 5, + 4 + startY + spaceY * 2)); } @SuppressWarnings("PointlessArithmeticExpression") @@ -87,48 +89,52 @@ public abstract class GT_Cover_AdvancedRedstoneReceiverBase return coverData; }, widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_AND) - .addTooltip(GT_Utility.trans("331", "AND Gate")).setPos(spaceX * 0, spaceY * 2)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.mode == GateMode.NAND, - (coverData, state) -> { - coverData.mode = GateMode.NAND; - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NAND) - .addTooltip(GT_Utility.trans("332", "NAND Gate")).setPos(spaceX * 1, spaceY * 2)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.mode == GateMode.OR, - (coverData, state) -> { - coverData.mode = GateMode.OR; - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_OR) - .addTooltip(GT_Utility.trans("333", "OR Gate")).setPos(spaceX * 2, spaceY * 2)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.mode == GateMode.NOR, - (coverData, state) -> { - coverData.mode = GateMode.NOR; - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NOR) - .addTooltip(GT_Utility.trans("334", "NOR Gate")).setPos(spaceX * 3, spaceY * 2)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofDisableable(), - coverData -> coverData.mode == GateMode.SINGLE_SOURCE, - (coverData, state) -> { - coverData.mode = GateMode.SINGLE_SOURCE; - return coverData; - }, - widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ANALOG) - .addTooltips( - Arrays.asList( - "ANALOG Mode", - "Only use this mode with ONE transmitter in total,", - "no logic involved")) - .setPos(spaceX * 4, spaceY * 2)); + .addTooltip(GT_Utility.trans("331", "AND Gate")) + .setPos(spaceX * 0, spaceY * 2)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.mode == GateMode.NAND, + (coverData, state) -> { + coverData.mode = GateMode.NAND; + return coverData; + }, + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NAND) + .addTooltip(GT_Utility.trans("332", "NAND Gate")) + .setPos(spaceX * 1, spaceY * 2)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.mode == GateMode.OR, + (coverData, state) -> { + coverData.mode = GateMode.OR; + return coverData; + }, + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_OR) + .addTooltip(GT_Utility.trans("333", "OR Gate")) + .setPos(spaceX * 2, spaceY * 2)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.mode == GateMode.NOR, + (coverData, state) -> { + coverData.mode = GateMode.NOR; + return coverData; + }, + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_GATE_NOR) + .addTooltip(GT_Utility.trans("334", "NOR Gate")) + .setPos(spaceX * 3, spaceY * 2)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofDisableable(), + coverData -> coverData.mode == GateMode.SINGLE_SOURCE, + (coverData, state) -> { + coverData.mode = GateMode.SINGLE_SOURCE; + return coverData; + }, + widget -> widget.setStaticTexture(GT_UITextures.OVERLAY_BUTTON_ANALOG) + .addTooltips( + Arrays.asList( + "ANALOG Mode", + "Only use this mode with ONE transmitter in total,", + "no logic involved")) + .setPos(spaceX * 4, spaceY * 2)); } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java index f39b573742..e74dffb102 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneTransmitterBase.java @@ -163,8 +163,10 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove } else { return ""; } - }).setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 10, 4 + startY + spaceY * getButtonRow())); + }) + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(startX + spaceX * 10, 4 + startY + spaceY * getButtonRow())); } @Override @@ -178,8 +180,8 @@ public abstract class GT_Cover_AdvancedRedstoneTransmitterBase<T extends GT_Cove return coverData; }, widget -> widget.addTooltip(0, GT_Utility.trans("NORMAL", "Normal")) - .addTooltip(1, GT_Utility.trans("INVERTED", "Inverted")) - .setPos(spaceX * 9, spaceY * getButtonRow())); + .addTooltip(1, GT_Utility.trans("INVERTED", "Inverted")) + .setPos(spaceX * 9, spaceY * getButtonRow())); } } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java index 50302bade0..e619d72723 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java @@ -44,23 +44,34 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A switch (mode) { case AND: - return (byte) (signals.values().stream().map(signal -> signal > 0) - .reduce(true, (signalA, signalB) -> signalA && signalB) ? 15 : 0); + return (byte) (signals.values() + .stream() + .map(signal -> signal > 0) + .reduce(true, (signalA, signalB) -> signalA && signalB) ? 15 : 0); case NAND: - return (byte) (signals.values().stream().map(signal -> signal > 0) - .reduce(true, (signalA, signalB) -> signalA && signalB) ? 0 : 15); + return (byte) (signals.values() + .stream() + .map(signal -> signal > 0) + .reduce(true, (signalA, signalB) -> signalA && signalB) ? 0 : 15); case OR: - return (byte) (signals.values().stream().map(signal -> signal > 0) - .reduce(false, (signalA, signalB) -> signalA || signalB) ? 15 : 0); + return (byte) (signals.values() + .stream() + .map(signal -> signal > 0) + .reduce(false, (signalA, signalB) -> signalA || signalB) ? 15 : 0); case NOR: - return (byte) (signals.values().stream().map(signal -> signal > 0) - .reduce(false, (signalA, signalB) -> signalA || signalB) ? 0 : 15); + return (byte) (signals.values() + .stream() + .map(signal -> signal > 0) + .reduce(false, (signalA, signalB) -> signalA || signalB) ? 0 : 15); case SINGLE_SOURCE: - if (signals.values().isEmpty()) { + if (signals.values() + .isEmpty()) { return 0; } - return signals.values().iterator().next(); + return signals.values() + .iterator() + .next(); default: return 0; } @@ -76,8 +87,9 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A } public static void setSignalAt(UUID uuid, int frequency, long hash, byte value) { - Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone - .computeIfAbsent(String.valueOf(uuid), k -> new ConcurrentHashMap<>()); + Map<Integer, Map<Long, Byte>> frequencies = GregTech_API.sAdvancedWirelessRedstone.computeIfAbsent( + String.valueOf(uuid), + k -> new ConcurrentHashMap<>()); Map<Long, Byte> signals = frequencies.computeIfAbsent(frequency, k -> new ConcurrentHashMap<>()); signals.put(hash, value); } @@ -238,14 +250,22 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A addUIForDataController(dataController); builder.widget(dataController) - .widget( - new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5, 4 + startY + spaceY * getFrequencyRow())) - .widget( - new TextWidget(GT_Utility.trans("602", "Use Private Frequency")) - .setDefaultColor(COLOR_TEXT_GRAY.get()).setPos( - startX + spaceX * privateExtraColumn, - 4 + startY + spaceY * getButtonRow())); + .widget( + new TextWidget(GT_Utility.trans("246", "Frequency")).setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 5, + 4 + startY + + spaceY * getFrequencyRow())) + .widget( + new TextWidget( + GT_Utility.trans("602", "Use Private Frequency")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX + * privateExtraColumn, + 4 + startY + + spaceY * getButtonRow())); } protected void addUIForDataController(CoverDataControllerWidget<T> controller) { @@ -256,20 +276,24 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A coverData.frequency = (int) MathExpression.parseMathExpression(state); return coverData; }, - widget -> widget.setOnScrollNumbers().setNumbers(0, Integer.MAX_VALUE).setFocusOnGuiOpen(true) - .setPos(1, 2 + spaceY * getFrequencyRow()).setSize(spaceX * 5 - 4, 12)) - .addFollower( - CoverDataFollower_ToggleButtonWidget.ofCheck(), - coverData -> coverData.uuid != null, - (coverData, state) -> { - if (state) { - coverData.uuid = getUIBuildContext().getPlayer().getUniqueID(); - } else { - coverData.uuid = null; - } - return coverData; - }, - widget -> widget.setPos(0, spaceY * getButtonRow())); + widget -> widget.setOnScrollNumbers() + .setNumbers(0, Integer.MAX_VALUE) + .setFocusOnGuiOpen(true) + .setPos(1, 2 + spaceY * getFrequencyRow()) + .setSize(spaceX * 5 - 4, 12)) + .addFollower( + CoverDataFollower_ToggleButtonWidget.ofCheck(), + coverData -> coverData.uuid != null, + (coverData, state) -> { + if (state) { + coverData.uuid = getUIBuildContext().getPlayer() + .getUniqueID(); + } else { + coverData.uuid = null; + } + return coverData; + }, + widget -> widget.setPos(0, spaceY * getButtonRow())); } protected abstract int getFrequencyRow(); diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java index 06388602c0..af1afbe18d 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessFluidDetector.java @@ -43,8 +43,10 @@ public class GT_Cover_WirelessFluidDetector @Override public FluidTransmitterData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, FluidTransmitterData aCoverVariable, ICoverable aTileEntity, long aTimer) { - byte signal = GT_Cover_LiquidMeter - .computeSignalBasedOnFluid(aTileEntity, aCoverVariable.invert, aCoverVariable.threshold); + byte signal = GT_Cover_LiquidMeter.computeSignalBasedOnFluid( + aTileEntity, + aCoverVariable.invert, + aCoverVariable.threshold); long hash = hashCoverCoords(aTileEntity, aSide); setSignalAt(aCoverVariable.getUuid(), aCoverVariable.getFrequency(), hash, signal); @@ -145,7 +147,7 @@ public class GT_Cover_WirelessFluidDetector super.addUIWidgets(builder); builder.widget( new TextWidget(GT_Utility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5, 4 + startY)); + .setPos(startX + spaceX * 5, 4 + startY)); } @Override @@ -158,8 +160,10 @@ public class GT_Cover_WirelessFluidDetector coverData.threshold = (int) MathExpression.parseMathExpression(state); return coverData; }, - widget -> widget.setOnScrollNumbers().setNumbers(0, Integer.MAX_VALUE).setPos(1, 2) - .setSize(spaceX * 5 - 4, 12)); + widget -> widget.setOnScrollNumbers() + .setNumbers(0, Integer.MAX_VALUE) + .setPos(1, 2) + .setSize(spaceX * 5 - 4, 12)); } } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java index 0b69150e86..9c1e9b2c5f 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java @@ -175,15 +175,21 @@ public class GT_Cover_WirelessItemDetector super.addUIWidgets(builder); builder.widget( new ItemWatcherSlotWidget().setGetter(this::getTargetItem) - .setPos(startX + spaceX * 4 - 1, startY + spaceY * 3)) - .widget( - new TextWidget(GT_Utility.trans("221", "Item threshold")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5, 4 + startY + spaceY * 2)) - .widget( - new TextWidget(GT_Utility.trans("254.0", "Detect Slot")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * 5, 4 + startY + spaceY * 3)); + .setPos(startX + spaceX * 4 - 1, startY + spaceY * 3)) + .widget( + new TextWidget(GT_Utility.trans("221", "Item threshold")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 5, + 4 + startY + spaceY * 2)) + .widget( + new TextWidget(GT_Utility.trans("254.0", "Detect Slot")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + startX + spaceX * 5, + 4 + startY + spaceY * 3)); } @Override @@ -196,32 +202,36 @@ public class GT_Cover_WirelessItemDetector coverData.threshold = (int) MathExpression.parseMathExpression(state); return coverData; }, - widget -> widget.setOnScrollNumbers(1, 10, 64).setNumbers(() -> 0, this::getMaxItemCount) - .setPos(1, 2 + spaceY * 2).setSize(spaceX * 5 - 4, 12)) - .addFollower( - new CoverDataFollower_TextFieldWidget<>(), - coverData -> getSlotTextFieldContent(coverData.slot), - (coverData, state) -> { - coverData.slot = getIntFromText(state); - return coverData; - }, - widget -> widget.setOnScrollText().setValidator(val -> { - final int valSlot = getIntFromText(val); - if (valSlot > -1) { - return TextFieldWidget.format.format(Math.min(valSlot, maxSlot)); - } else { - return ALL_TEXT; - } - }).setPattern(BaseTextFieldWidget.NATURAL_NUMS).setPos(1, 2 + spaceY * 3) - .setSize(spaceX * 4 - 8, 12)); + widget -> widget.setOnScrollNumbers(1, 10, 64) + .setNumbers(() -> 0, this::getMaxItemCount) + .setPos(1, 2 + spaceY * 2) + .setSize(spaceX * 5 - 4, 12)) + .addFollower( + new CoverDataFollower_TextFieldWidget<>(), + coverData -> getSlotTextFieldContent(coverData.slot), + (coverData, state) -> { + coverData.slot = getIntFromText(state); + return coverData; + }, + widget -> widget.setOnScrollText() + .setValidator(val -> { + final int valSlot = getIntFromText(val); + if (valSlot > -1) { + return TextFieldWidget.format.format(Math.min(valSlot, maxSlot)); + } else { + return ALL_TEXT; + } + }) + .setPattern(BaseTextFieldWidget.NATURAL_NUMS) + .setPos(1, 2 + spaceY * 3) + .setSize(spaceX * 4 - 8, 12)); } private int getMaxSlot() { final ICoverable tile = getUIBuildContext().getTile(); if (tile instanceof TileEntity && !tile.isDead() && tile instanceof IGregTechTileEntity - && !(((IGregTechTileEntity) tile) - .getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase)) { + && !(((IGregTechTileEntity) tile).getMetaTileEntity() instanceof GT_MetaTileEntity_DigitalChestBase)) { return tile.getSizeInventory() - 1; } else { return -1; diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java index 085a7e1f4d..515a196b65 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java @@ -225,7 +225,9 @@ public class GT_Cover_WirelessMaintenanceDetector extends for (int i = 0; i < 8; i++) { builder.widget( new TextWidget(extraTexts[i]).setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(startX + spaceX * (i % 2 == 0 ? 1 : 7), 4 + startY + spaceY * (2 + i / 2))); + .setPos( + startX + spaceX * (i % 2 == 0 ? 1 : 7), + 4 + startY + spaceY * (2 + i / 2))); } } @@ -241,9 +243,10 @@ public class GT_Cover_WirelessMaintenanceDetector extends coverData.mode = MaintenanceMode.values()[index]; return coverData; }, - widget -> widget - .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.TRANSPARENT) - .setPos(spaceX * (index % 2 == 0 ? 0 : 6), spaceY * (2 + index / 2))); + widget -> widget.setToggleTexture( + GT_UITextures.OVERLAY_BUTTON_CHECKMARK, + GT_UITextures.TRANSPARENT) + .setPos(spaceX * (index % 2 == 0 ? 0 : 6), spaceY * (2 + index / 2))); } } } diff --git a/src/main/java/gregtech/common/entities/GT_Entity_Arrow.java b/src/main/java/gregtech/common/entities/GT_Entity_Arrow.java index 6c096c09ee..540a8e23a5 100644 --- a/src/main/java/gregtech/common/entities/GT_Entity_Arrow.java +++ b/src/main/java/gregtech/common/entities/GT_Entity_Arrow.java @@ -86,8 +86,11 @@ public class GT_Entity_Arrow extends EntityArrow { Block tBlock = this.worldObj.getBlock(this.mHitBlockX, this.mHitBlockY, this.mHitBlockZ); if (tBlock.getMaterial() != Material.air) { tBlock.setBlockBoundsBasedOnState(this.worldObj, this.mHitBlockX, this.mHitBlockY, this.mHitBlockZ); - AxisAlignedBB axisalignedbb = tBlock - .getCollisionBoundingBoxFromPool(this.worldObj, this.mHitBlockX, this.mHitBlockY, this.mHitBlockZ); + AxisAlignedBB axisalignedbb = tBlock.getCollisionBoundingBoxFromPool( + this.worldObj, + this.mHitBlockX, + this.mHitBlockY, + this.mHitBlockZ); if ((axisalignedbb != null) && (axisalignedbb.isVecInside(Vec3.createVectorHelper(this.posX, this.posY, this.posZ)))) { this.inGround = true; @@ -109,19 +112,24 @@ public class GT_Entity_Arrow extends EntityArrow { } else { this.ticksInAir += 1; Vec3 vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - Vec3 vec3 = Vec3 - .createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + Vec3 vec3 = Vec3.createVectorHelper( + this.posX + this.motionX, + this.posY + this.motionY, + this.posZ + this.motionZ); MovingObjectPosition tVector = this.worldObj.func_147447_a(vec31, vec3, false, true, false); vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - vec3 = Vec3 - .createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + vec3 = Vec3.createVectorHelper( + this.posX + this.motionX, + this.posY + this.motionY, + this.posZ + this.motionZ); if (tVector != null) { vec3 = Vec3.createVectorHelper(tVector.hitVec.xCoord, tVector.hitVec.yCoord, tVector.hitVec.zCoord); } Entity tHitEntity = null; List tAllPotentiallyHitEntities = this.worldObj.getEntitiesWithinAABBExcludingEntity( this, - this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); + this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ) + .expand(1.0D, 1.0D, 1.0D)); double tLargestDistance = Double.MAX_VALUE; for (int i = 0; i < tAllPotentiallyHitEntities.size(); i++) { Entity entity1 = (Entity) tAllPotentiallyHitEntities.get(i); @@ -151,8 +159,10 @@ public class GT_Entity_Arrow extends EntityArrow { if (tVector.entityHit != null) { ItemData tData = GT_OreDictUnificator.getItemData(this.mArrow); - float tMagicDamage = (tVector.entityHit instanceof EntityLivingBase) ? EnchantmentHelper - .func_152377_a(this.mArrow, ((EntityLivingBase) tVector.entityHit).getCreatureAttribute()) + float tMagicDamage = (tVector.entityHit instanceof EntityLivingBase) + ? EnchantmentHelper.func_152377_a( + this.mArrow, + ((EntityLivingBase) tVector.entityHit).getCreatureAttribute()) : 0.0F; float tDamage = MathHelper.ceiling_double_int( MathHelper.sqrt_double( @@ -209,26 +219,29 @@ public class GT_Entity_Arrow extends EntityArrow { tPlayer.setDead(); } } - DamageSource tDamageSource = DamageSource - .causeArrowDamage(this, tShootingEntity == null ? this : tShootingEntity); + DamageSource tDamageSource = DamageSource.causeArrowDamage( + this, + tShootingEntity == null ? this : tShootingEntity); if ((tDamage + tMagicDamage > 0.0F) && (tVector.entityHit.attackEntityFrom(tDamageSource, tDamage + tMagicDamage))) { if ((tVector.entityHit instanceof EntityLivingBase)) { if (tHitTimer >= 0) { tVector.entityHit.hurtResistantTime = tHitTimer; } - if (((tVector.entityHit instanceof EntityCreeper)) && (EnchantmentHelper - .getEnchantmentLevel(Enchantment.fireAspect.effectId, this.mArrow) > 0)) { + if (((tVector.entityHit instanceof EntityCreeper)) + && (EnchantmentHelper.getEnchantmentLevel( + Enchantment.fireAspect.effectId, + this.mArrow) > 0)) { ((EntityCreeper) tVector.entityHit).func_146079_cb(); } EntityLivingBase tHitLivingEntity = (EntityLivingBase) tVector.entityHit; if (!this.worldObj.isRemote) { - tHitLivingEntity - .setArrowCountInEntity(tHitLivingEntity.getArrowCountInEntity() + 1); + tHitLivingEntity.setArrowCountInEntity( + tHitLivingEntity.getArrowCountInEntity() + 1); } if (tKnockback > 0) { - float tKnockbackDivider = MathHelper - .sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + float tKnockbackDivider = MathHelper.sqrt_double( + this.motionX * this.motionX + this.motionZ * this.motionZ); if (tKnockbackDivider > 0.0F) { tHitLivingEntity.addVelocity( this.motionX * tKnockback * 0.6000000238418579D / tKnockbackDivider, @@ -249,8 +262,8 @@ public class GT_Entity_Arrow extends EntityArrow { if ((tShootingEntity != null) && (tHitLivingEntity != tShootingEntity) && ((tHitLivingEntity instanceof EntityPlayer)) && ((tShootingEntity instanceof EntityPlayerMP))) { - ((EntityPlayerMP) tShootingEntity).playerNetServerHandler - .sendPacket(new S2BPacketChangeGameState(6, 0.0F)); + ((EntityPlayerMP) tShootingEntity).playerNetServerHandler.sendPacket( + new S2BPacketChangeGameState(6, 0.0F)); } } if (((tShootingEntity instanceof EntityPlayer)) && (tMagicDamage > 0.0F)) { @@ -279,8 +292,10 @@ public class GT_Entity_Arrow extends EntityArrow { this.mHitBlockY = tVector.blockY; this.mHitBlockZ = tVector.blockZ; this.mHitBlock = this.worldObj.getBlock(this.mHitBlockX, this.mHitBlockY, this.mHitBlockZ); - this.mHitBlockMeta = this.worldObj - .getBlockMetadata(this.mHitBlockX, this.mHitBlockY, this.mHitBlockZ); + this.mHitBlockMeta = this.worldObj.getBlockMetadata( + this.mHitBlockX, + this.mHitBlockY, + this.mHitBlockZ); this.motionX = ((float) (tVector.hitVec.xCoord - this.posX)); this.motionY = ((float) (tVector.hitVec.yCoord - this.posY)); this.motionZ = ((float) (tVector.hitVec.zCoord - this.posZ)); @@ -316,20 +331,19 @@ public class GT_Entity_Arrow extends EntityArrow { } } } - WorldSpawnedEventBuilder.ParticleEventBuilder events = new WorldSpawnedEventBuilder.ParticleEventBuilder() - .setWorld(this.worldObj); + WorldSpawnedEventBuilder.ParticleEventBuilder events = new WorldSpawnedEventBuilder.ParticleEventBuilder().setWorld( + this.worldObj); if (getIsCritical()) { events.setIdentifier(ParticleFX.CRIT) - .setMotion( - -this.motionX, - -this.motionY + 0.2D, - -this.motionZ).<WorldSpawnedEventBuilder.ParticleEventBuilder>times( - 4, - (x, i) -> x.setPosition( - this.posX + this.motionX * i / 4.0D, - this.posY + this.motionY * i / 4.0D, - this.posZ + this.motionZ * i / 4.0D).run()); + .setMotion(-this.motionX, -this.motionY + 0.2D, -this.motionZ).<WorldSpawnedEventBuilder + .ParticleEventBuilder>times( + 4, + (x, i) -> x.setPosition( + this.posX + this.motionX * i / 4.0D, + this.posY + this.motionY * i / 4.0D, + this.posZ + this.motionZ * i / 4.0D) + .run()); } this.posX += this.motionX; this.posY += this.motionY; @@ -354,12 +368,13 @@ public class GT_Entity_Arrow extends EntityArrow { this.rotationYaw = (this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F); float tFrictionMultiplier = 0.99F; if (isInWater()) { - events.setMotion(-this.motionX, -this.motionY + 0.2D, -this.motionZ).setIdentifier(ParticleFX.BUBBLE) - .setPosition( - this.posX - this.motionX * 0.25D, - this.posY - this.motionY * 0.25D, - this.posZ - this.motionZ * 0.25D) - .times(4, Runnable::run); + events.setMotion(-this.motionX, -this.motionY + 0.2D, -this.motionZ) + .setIdentifier(ParticleFX.BUBBLE) + .setPosition( + this.posX - this.motionX * 0.25D, + this.posY - this.motionY * 0.25D, + this.posZ - this.motionZ * 0.25D) + .times(4, Runnable::run); tFrictionMultiplier = 0.8F; } if (isWet()) { diff --git a/src/main/java/gregtech/common/fluid/GT_Fluid.java b/src/main/java/gregtech/common/fluid/GT_Fluid.java index e4503f95ea..a508b5ecf1 100644 --- a/src/main/java/gregtech/common/fluid/GT_Fluid.java +++ b/src/main/java/gregtech/common/fluid/GT_Fluid.java @@ -55,10 +55,13 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R setGaseous(false).setViscosity(10000); break; case GAS: - setGaseous(true).setDensity(-100).setViscosity(200); + setGaseous(true).setDensity(-100) + .setViscosity(200); break; case PLASMA: - setGaseous(true).setDensity(55536).setViscosity(10).setLuminosity(15); + setGaseous(true).setDensity(55536) + .setViscosity(10) + .setLuminosity(15); break; case MOLTEN: final int luminosity; diff --git a/src/main/java/gregtech/common/gui/modularui/UIHelper.java b/src/main/java/gregtech/common/gui/modularui/UIHelper.java index 8973992c28..2135d3686a 100644 --- a/src/main/java/gregtech/common/gui/modularui/UIHelper.java +++ b/src/main/java/gregtech/common/gui/modularui/UIHelper.java @@ -26,7 +26,9 @@ public class UIHelper { SteamVariant steamVariant, Pos2d offset) { List<Pos2d> itemInputPositions = recipeMap != null ? recipeMap.getItemInputPositions(itemInputCount) : UIHelper.getItemInputPositions(itemInputCount); - itemInputPositions = itemInputPositions.stream().map(p -> p.add(offset)).collect(Collectors.toList()); + itemInputPositions = itemInputPositions.stream() + .map(p -> p.add(offset)) + .collect(Collectors.toList()); for (int i = 0; i < itemInputPositions.size(); i++) { forEachItemInputSlot.accept( i, @@ -36,7 +38,9 @@ public class UIHelper { List<Pos2d> itemOutputPositions = recipeMap != null ? recipeMap.getItemOutputPositions(itemOutputCount) : UIHelper.getItemOutputPositions(itemOutputCount); - itemOutputPositions = itemOutputPositions.stream().map(p -> p.add(offset)).collect(Collectors.toList()); + itemOutputPositions = itemOutputPositions.stream() + .map(p -> p.add(offset)) + .collect(Collectors.toList()); for (int i = 0; i < itemOutputPositions.size(); i++) { forEachItemOutputSlot.accept( i, @@ -47,12 +51,14 @@ public class UIHelper { forEachSpecialSlot.accept( 0, getBackgroundsForSlot(itemSlotBackground, recipeMap, false, false, 0, true, steamVariant), - (recipeMap != null ? recipeMap.getSpecialItemPosition() : UIHelper.getSpecialItemPosition()) - .add(offset)); + (recipeMap != null ? recipeMap.getSpecialItemPosition() : UIHelper.getSpecialItemPosition()).add( + offset)); List<Pos2d> fluidInputPositions = recipeMap != null ? recipeMap.getFluidInputPositions(fluidInputCount) : UIHelper.getFluidInputPositions(fluidInputCount); - fluidInputPositions = fluidInputPositions.stream().map(p -> p.add(offset)).collect(Collectors.toList()); + fluidInputPositions = fluidInputPositions.stream() + .map(p -> p.add(offset)) + .collect(Collectors.toList()); for (int i = 0; i < fluidInputPositions.size(); i++) { forEachFluidInputSlot.accept( i, @@ -62,7 +68,9 @@ public class UIHelper { List<Pos2d> fluidOutputPositions = recipeMap != null ? recipeMap.getFluidOutputPositions(fluidOutputCount) : UIHelper.getFluidOutputPositions(fluidOutputCount); - fluidOutputPositions = fluidOutputPositions.stream().map(p -> p.add(offset)).collect(Collectors.toList()); + fluidOutputPositions = fluidOutputPositions.stream() + .map(p -> p.add(offset)) + .collect(Collectors.toList()); for (int i = 0; i < fluidOutputPositions.size(); i++) { forEachFluidOutputSlot.accept( i, diff --git a/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java b/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java index 00cfcf9d6d..c8e015d5b4 100644 --- a/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java +++ b/src/main/java/gregtech/common/gui/modularui/uifactory/SelectItemUIFactory.java @@ -116,15 +116,21 @@ public class SelectItemUIFactory { } public ModularWindow createWindow(UIBuildContext buildContext) { - ModularWindow.Builder builder = ModularWindow - .builder(getGUIWidth(), 53 + 18 * ((stacks.size() - 1) / cols + 1)); + ModularWindow.Builder builder = ModularWindow.builder( + getGUIWidth(), + 53 + 18 * ((stacks.size() - 1) / cols + 1)); builder.setBackground(ModularUITextures.VANILLA_BACKGROUND); builder.setGuiTint(guiTint); if (headerItem != null) { - builder.widget(new ItemDrawable(headerItem).asWidget().setPos(5, 5).setSize(16, 16)); + builder.widget( + new ItemDrawable(headerItem).asWidget() + .setPos(5, 5) + .setSize(16, 16)); } - builder.widget(new TextWidget(header).setDefaultColor(COLOR_TITLE.get()).setPos(25, 9)); + builder.widget( + new TextWidget(header).setDefaultColor(COLOR_TITLE.get()) + .setPos(25, 9)); builder.widget(new SlotWidget(BaseSlot.phantom(currentDisplayItemHandler, 0)) { @@ -137,12 +143,18 @@ public class SelectItemUIFactory { } super.draw(partialTicks); } - }.disableInteraction().setBackground(GT_UITextures.SLOT_DARK_GRAY).setPos( - 9 + getFontRenderer().getStringWidth(StatCollector.translateToLocal("GT5U.gui.select.current")), - 24)).widget( - new TextWidget(StatCollector.translateToLocal("GT5U.gui.select.current")) - .setDefaultColor(COLOR_TEXT_GRAY.get()) - .setPos(8, 25 + (18 - getFontRenderer().FONT_HEIGHT) / 2)); + }.disableInteraction() + .setBackground(GT_UITextures.SLOT_DARK_GRAY) + .setPos(9 + getFontRenderer().getStringWidth(StatCollector.translateToLocal("GT5U.gui.select.current")), 24)) + .widget( + new TextWidget( + StatCollector.translateToLocal("GT5U.gui.select.current")) + .setDefaultColor( + COLOR_TEXT_GRAY.get()) + .setPos( + 8, + 25 + (18 - getFontRenderer().FONT_HEIGHT) + / 2)); for (int i = 0; i < stacks.size(); i++) { final int index = i; @@ -167,7 +179,8 @@ public class SelectItemUIFactory { return new IDrawable[] { index == selected ? GT_UITextures.SLOT_DARK_GRAY : ModularUITextures.ITEM_SLOT }; } - }.disableInteraction().setPos(7 + 18 * (index % cols), 43 + 18 * (index / cols))); + }.disableInteraction() + .setPos(7 + 18 * (index % cols), 43 + 18 * (index / cols))); } if (anotherWindow) { @@ -178,9 +191,12 @@ public class SelectItemUIFactory { public void onDestroy() { dialogOpened.set(false); } - }.setOnClick((clickData, widget) -> widget.getWindow().tryClose()) - .setBackground(ModularUITextures.VANILLA_BACKGROUND, new Text("x")).setPos(getGUIWidth() - 15, 3) - .setSize(12, 12)); + }.setOnClick( + (clickData, widget) -> widget.getWindow() + .tryClose()) + .setBackground(ModularUITextures.VANILLA_BACKGROUND, new Text("x")) + .setPos(getGUIWidth() - 15, 3) + .setSize(12, 12)); } return builder.build(); diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java index 70978351c2..28b495ce42 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverCycleButtonWidget.java @@ -16,13 +16,22 @@ import gregtech.api.gui.modularui.GT_UITextures; */ public class CoverCycleButtonWidget extends CycleButtonWidget { - private static final UITexture BUTTON_NORMAL_NOT_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL - .getSubArea(0, 0, 1, 0.5f); + private static final UITexture BUTTON_NORMAL_NOT_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL.getSubArea( + 0, + 0, + 1, + 0.5f); private static final UITexture BUTTON_NORMAL_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL.getSubArea(0, 0.5f, 1, 1); - private static final UITexture BUTTON_HOVERED_NOT_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL_HOVERED - .getSubArea(0, 0, 1, 0.5f); - private static final UITexture BUTTON_HOVERED_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL_HOVERED - .getSubArea(0, 0.5f, 1, 1); + private static final UITexture BUTTON_HOVERED_NOT_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL_HOVERED.getSubArea( + 0, + 0, + 1, + 0.5f); + private static final UITexture BUTTON_HOVERED_PRESSED = GT_UITextures.BUTTON_COVER_NORMAL_HOVERED.getSubArea( + 0, + 0.5f, + 1, + 1); private boolean clickPressed; diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java index cb5fbf7994..0547609022 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_ToggleButtonWidget.java @@ -44,18 +44,21 @@ public class CoverDataFollower_ToggleButtonWidget<T extends ISerializableObject> } public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofCheckAndCross() { - return new CoverDataFollower_ToggleButtonWidget<T>() - .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.OVERLAY_BUTTON_CROSS); + return new CoverDataFollower_ToggleButtonWidget<T>().setToggleTexture( + GT_UITextures.OVERLAY_BUTTON_CHECKMARK, + GT_UITextures.OVERLAY_BUTTON_CROSS); } public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofCheck() { - return new CoverDataFollower_ToggleButtonWidget<T>() - .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_CHECKMARK, GT_UITextures.TRANSPARENT); + return new CoverDataFollower_ToggleButtonWidget<T>().setToggleTexture( + GT_UITextures.OVERLAY_BUTTON_CHECKMARK, + GT_UITextures.TRANSPARENT); } public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofRedstone() { - return new CoverDataFollower_ToggleButtonWidget<T>() - .setToggleTexture(GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON, GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF); + return new CoverDataFollower_ToggleButtonWidget<T>().setToggleTexture( + GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON, + GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF); } public static <T extends ISerializableObject> CoverDataFollower_ToggleButtonWidget<T> ofDisableable() { diff --git a/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java index 182f007b33..13bcc12504 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java @@ -141,8 +141,8 @@ public class FluidDisplaySlotWidget extends SlotWidget { ItemStack ret = null; if (actionRealClick == Action.TRANSFER) { if (fluidAccessConstructor == null) { - GT_Mod.GT_FML_LOGGER - .warn("FluidDisplaySlotWidget is asked to transfer fluid, but fluidAccessConstructor is null!"); + GT_Mod.GT_FML_LOGGER.warn( + "FluidDisplaySlotWidget is asked to transfer fluid, but fluidAccessConstructor is null!"); return null; } ret = transferFluid( @@ -238,7 +238,9 @@ public class FluidDisplaySlotWidget extends SlotWidget { protected static ItemStack fillFluid(IFluidAccess aFluidAccess, EntityPlayer aPlayer, FluidStack aFluidHeld, boolean aProcessFullStack) { // we are not using aMachine.fill() here any more, so we need to check for fluid type here ourselves - if (aFluidAccess.get() != null && !aFluidAccess.get().isFluidEqual(aFluidHeld)) return null; + if (aFluidAccess.get() != null && !aFluidAccess.get() + .isFluidEqual(aFluidHeld)) + return null; ItemStack tStackHeld = aPlayer.inventory.getItemStack(); ItemStack tStackSizedOne = GT_Utility.copyAmount(1, tStackHeld); if (tStackSizedOne == null) return null; diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index 479f6fe82f..c646652e44 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -236,7 +236,10 @@ public enum CombType { this.color = new int[] { color1, color2 }; this.localizedName = GT_LanguageManager.addStringLocalization( "comb." + this.name, - this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Comb"); + this.name.substring(0, 1) + .toUpperCase() + + this.name.substring(1) + + " Comb"); } public void setHidden() { @@ -265,7 +268,10 @@ public enum CombType { private static final CombType[] VALUES; static { - int biggestId = Arrays.stream(CombType.values()).mapToInt(CombType::getId).max().getAsInt(); + int biggestId = Arrays.stream(CombType.values()) + .mapToInt(CombType::getId) + .max() + .getAsInt(); VALUES = new CombType[biggestId + 1]; Arrays.fill(VALUES, _NULL); for (CombType type : CombType.values()) { diff --git a/src/main/java/gregtech/common/items/DropType.java b/src/main/java/gregtech/common/items/DropType.java index 3195e9ecbd..3573978e21 100644 --- a/src/main/java/gregtech/common/items/DropType.java +++ b/src/main/java/gregtech/common/items/DropType.java @@ -36,7 +36,10 @@ public enum DropType { return GT_LanguageManager.addStringLocalization( "drop." + this.name, - this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Drop"); + this.name.substring(0, 1) + .toUpperCase() + + this.name.substring(1) + + " Drop"); } public int[] getColours() { diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java index 624e326268..95a6474c17 100644 --- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java +++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java @@ -68,8 +68,10 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { + " K" + EnumChatFormatting.GRAY); aList.add( - EnumChatFormatting.GREEN + String - .format(transItem("018", "State: %s"), aNBT.getBoolean("mFluidState") ? "Gas" : "Liquid") + EnumChatFormatting.GREEN + + String.format( + transItem("018", "State: %s"), + aNBT.getBoolean("mFluidState") ? "Gas" : "Liquid") + EnumChatFormatting.GRAY); } } @@ -80,8 +82,12 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { @Override public IIcon getIconFromDamage(int aMetaData) { - return Stream.of(FluidRegistry.getFluid(aMetaData), FluidRegistry.WATER).filter(Objects::nonNull) - .map(Fluid::getStillIcon).filter(Objects::nonNull).findFirst().orElseThrow(IllegalStateException::new); + return Stream.of(FluidRegistry.getFluid(aMetaData), FluidRegistry.WATER) + .filter(Objects::nonNull) + .map(Fluid::getStillIcon) + .filter(Objects::nonNull) + .findFirst() + .orElseThrow(IllegalStateException::new); } @Override @@ -168,8 +174,10 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { for (int tOreDict : OreDictionary.getOreIDs(tItemStack)) { String tOreDictName = OreDictionary.getOreName(tOreDict); if (tOreDictName.startsWith("cell")) { - return Materials - .getRealMaterial(tOreDictName.replace("cell", "").replace("Molten", "").replace("Plasma", "")); + return Materials.getRealMaterial( + tOreDictName.replace("cell", "") + .replace("Molten", "") + .replace("Plasma", "")); } } return Materials._NULL; diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java index 3fa06018f0..65cd24c116 100644 --- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java +++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java @@ -195,15 +195,21 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo super.addAdditionalToolTips(aList, aStack, aPlayer); aList.add( GT_LanguageManager.addStringLocalization( - new StringBuilder().append(getUnlocalizedName()).append(".configuration").toString(), + new StringBuilder().append(getUnlocalizedName()) + .append(".configuration") + .toString(), "Configuration: ") + getConfigurationString(getDamage(aStack))); aList.add( GT_LanguageManager.addStringLocalization( - new StringBuilder().append(getUnlocalizedName()).append(".tooltip.0").toString(), + new StringBuilder().append(getUnlocalizedName()) + .append(".tooltip.0") + .toString(), "Right click to reconfigure")); aList.add( GT_LanguageManager.addStringLocalization( - new StringBuilder().append(getUnlocalizedName()).append(".tooltip.1").toString(), + new StringBuilder().append(getUnlocalizedName()) + .append(".tooltip.1") + .toString(), "Needs a screwdriver or circuit programming tool")); } @@ -223,8 +229,8 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo public void registerIcons(IIconRegister aIconRegister) { super.registerIcons(aIconRegister); for (int i = 0; i < mIconDamage.length; i++) { - mIconDamage[i] = aIconRegister - .registerIcon(RES_PATH_ITEM + (GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i)); + mIconDamage[i] = aIconRegister.registerIcon( + RES_PATH_ITEM + (GT_Config.troll ? "troll" : getUnlocalizedName() + "/" + i)); } if (GregTech_API.sPostloadFinished) { GT_Log.out.println("GT_Mod: Starting Item Icon Load Phase"); @@ -258,7 +264,8 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo if (toolIndex == null) return true; ItemStack[] mainInventory = player.inventory.mainInventory; - mainInventory[toolIndex.getKey()] = toolIndex.getValue().apply(mainInventory[toolIndex.getKey()], player); + mainInventory[toolIndex.getKey()] = toolIndex.getValue() + .apply(mainInventory[toolIndex.getKey()], player); } stack.setItemDamage(meta); @@ -324,9 +331,10 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo if (!GT_Utility.isStackValid(toolStack)) continue; - for (Map.Entry<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> p : GregTech_API.sCircuitProgrammerList - .entrySet()) - if (p.getKey().test(toolStack)) return Pair.of(j, p.getValue()); + for (Map.Entry<Predicate<ItemStack>, BiFunction<ItemStack, EntityPlayerMP, ItemStack>> p : GregTech_API.sCircuitProgrammerList.entrySet()) + if (p.getKey() + .test(toolStack)) + return Pair.of(j, p.getValue()); } return null; } diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 9950b2581f..7165702f98 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -50,8 +50,9 @@ import gregtech.common.items.behaviors.*; public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { public static GT_MetaGenerated_Item_01 INSTANCE; - private final String mToolTipPurify = GT_LanguageManager - .addStringLocalization("metaitem.01.tooltip.purify", "Throw into Cauldron to get clean Dust"); + private final String mToolTipPurify = GT_LanguageManager.addStringLocalization( + "metaitem.01.tooltip.purify", + "Throw into Cauldron to get clean Dust"); private static final String aTextArrow = " A"; private static final String aTextStick = " S "; private static final String aTextFeather = "F "; @@ -679,8 +680,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Shape_Mold_Plate.set(addItem(tLastID = 301, "Mold (Plate)", "Mold for making Plates")); ItemList.Shape_Mold_Casing.set(addItem(tLastID = 302, "Mold (Casing)", "Mold for making Item Casings")); ItemList.Shape_Mold_Gear.set(addItem(tLastID = 303, "Mold (Gear)", "Mold for making Gears")); - ItemList.Shape_Mold_Credit - .set(addItem(tLastID = 304, "Mold (Coinage)", "Secure Mold for making Coins (Don't lose it!)")); + ItemList.Shape_Mold_Credit.set( + addItem(tLastID = 304, "Mold (Coinage)", "Secure Mold for making Coins (Don't lose it!)")); ItemList.Shape_Mold_Bottle.set(addItem(tLastID = 305, "Mold (Bottle)", "Mold for making Bottles")); ItemList.Shape_Mold_Ingot.set(addItem(tLastID = 306, "Mold (Ingot)", "Mold for making Ingots")); ItemList.Shape_Mold_Ball.set(addItem(tLastID = 307, "Mold (Ball)", "Mold for making Balls")); @@ -691,8 +692,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Shape_Mold_Baguette.set(addItem(tLastID = 312, "Mold (Baguette)", "Mold for shaping Baguettes")); ItemList.Shape_Mold_Cylinder.set(addItem(tLastID = 313, "Mold (Cylinder)", "Mold for shaping Cylinders")); ItemList.Shape_Mold_Anvil.set(addItem(tLastID = 314, "Mold (Anvil)", "Mold for shaping Anvils")); - ItemList.Shape_Mold_Name - .set(addItem(tLastID = 315, "Mold (Name)", "Mold for naming Items (rename Mold with Anvil)")); + ItemList.Shape_Mold_Name.set( + addItem(tLastID = 315, "Mold (Name)", "Mold for naming Items (rename Mold with Anvil)")); ItemList.Shape_Mold_Arrow.set(addItem(tLastID = 316, "Mold (Arrow Head)", "Mold for making Arrow Heads")); ItemList.Shape_Mold_Gear_Small.set(addItem(tLastID = 317, "Mold (Small Gear)", "Mold for making small Gears")); ItemList.Shape_Mold_Rod.set(addItem(tLastID = 318, "Mold (Rod)", "Mold for making Rods")); @@ -702,16 +703,16 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Shape_Mold_Ring.set(addItem(tLastID = 322, "Mold (Ring)", "Mold for making Rings")); ItemList.Shape_Mold_Rod_Long.set(addItem(tLastID = 323, "Mold (Long Rod)", "Mold for making Long Rods")); ItemList.Shape_Mold_Rotor.set(addItem(tLastID = 324, "Mold (Rotor)", "Mold for making a Rotor")); - ItemList.Shape_Mold_Turbine_Blade - .set(addItem(tLastID = 325, "Mold (Turbine Blade)", "Mold for making a Turbine Blade")); + ItemList.Shape_Mold_Turbine_Blade.set( + addItem(tLastID = 325, "Mold (Turbine Blade)", "Mold for making a Turbine Blade")); ItemList.Shape_Mold_Pipe_Tiny.set(addItem(tLastID = 326, "Mold (Tiny Pipe)", "Mold for making tiny Pipes")); ItemList.Shape_Mold_Pipe_Small.set(addItem(tLastID = 327, "Mold (Small Pipe)", "Mold for making small Pipes")); ItemList.Shape_Mold_Pipe_Medium.set(addItem(tLastID = 328, "Mold (Normal Pipe)", "Mold for making Pipes")); ItemList.Shape_Mold_Pipe_Large.set(addItem(tLastID = 329, "Mold (Large Pipe)", "Mold for making large Pipes")); - ItemList.Shape_Mold_Pipe_Huge - .set(addItem(tLastID = 330, "Mold (Huge Pipe)", "Mold for making full Block Pipes")); - ItemList.Shape_Mold_ToolHeadDrill - .set(addItem(tLastID = 331, "Mold (Drill Head)", "Mold for making Drill Heads")); + ItemList.Shape_Mold_Pipe_Huge.set( + addItem(tLastID = 330, "Mold (Huge Pipe)", "Mold for making full Block Pipes")); + ItemList.Shape_Mold_ToolHeadDrill.set( + addItem(tLastID = 331, "Mold (Drill Head)", "Mold for making Drill Heads")); GT_ModHandler.removeRecipe( new ItemStack(Blocks.glass), null, @@ -719,69 +720,69 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { null, new ItemStack(Blocks.glass)); - ItemList.Shape_Extruder_Plate - .set(addItem(tLastID = 350, "Extruder Shape (Plate)", "Extruder Shape for making Plates")); - ItemList.Shape_Extruder_Rod - .set(addItem(tLastID = 351, "Extruder Shape (Rod)", "Extruder Shape for making Rods")); - ItemList.Shape_Extruder_Bolt - .set(addItem(tLastID = 352, "Extruder Shape (Bolt)", "Extruder Shape for making Bolts")); - ItemList.Shape_Extruder_Ring - .set(addItem(tLastID = 353, "Extruder Shape (Ring)", "Extruder Shape for making Rings")); - ItemList.Shape_Extruder_Cell - .set(addItem(tLastID = 354, "Extruder Shape (Cell)", "Extruder Shape for making Cells")); + ItemList.Shape_Extruder_Plate.set( + addItem(tLastID = 350, "Extruder Shape (Plate)", "Extruder Shape for making Plates")); + ItemList.Shape_Extruder_Rod.set( + addItem(tLastID = 351, "Extruder Shape (Rod)", "Extruder Shape for making Rods")); + ItemList.Shape_Extruder_Bolt.set( + addItem(tLastID = 352, "Extruder Shape (Bolt)", "Extruder Shape for making Bolts")); + ItemList.Shape_Extruder_Ring.set( + addItem(tLastID = 353, "Extruder Shape (Ring)", "Extruder Shape for making Rings")); + ItemList.Shape_Extruder_Cell.set( + addItem(tLastID = 354, "Extruder Shape (Cell)", "Extruder Shape for making Cells")); ItemList.Shape_Extruder_Ingot.set( addItem( tLastID = 355, "Extruder Shape (Ingot)", "Extruder Shape for, wait, can't we just use a Furnace?")); - ItemList.Shape_Extruder_Wire - .set(addItem(tLastID = 356, "Extruder Shape (Wire)", "Extruder Shape for making Wires")); - ItemList.Shape_Extruder_Casing - .set(addItem(tLastID = 357, "Extruder Shape (Casing)", "Extruder Shape for making Item Casings")); - ItemList.Shape_Extruder_Pipe_Tiny - .set(addItem(tLastID = 358, "Extruder Shape (Tiny Pipe)", "Extruder Shape for making tiny Pipes")); - ItemList.Shape_Extruder_Pipe_Small - .set(addItem(tLastID = 359, "Extruder Shape (Small Pipe)", "Extruder Shape for making small Pipes")); - ItemList.Shape_Extruder_Pipe_Medium - .set(addItem(tLastID = 360, "Extruder Shape (Normal Pipe)", "Extruder Shape for making Pipes")); - ItemList.Shape_Extruder_Pipe_Large - .set(addItem(tLastID = 361, "Extruder Shape (Large Pipe)", "Extruder Shape for making large Pipes")); + ItemList.Shape_Extruder_Wire.set( + addItem(tLastID = 356, "Extruder Shape (Wire)", "Extruder Shape for making Wires")); + ItemList.Shape_Extruder_Casing.set( + addItem(tLastID = 357, "Extruder Shape (Casing)", "Extruder Shape for making Item Casings")); + ItemList.Shape_Extruder_Pipe_Tiny.set( + addItem(tLastID = 358, "Extruder Shape (Tiny Pipe)", "Extruder Shape for making tiny Pipes")); + ItemList.Shape_Extruder_Pipe_Small.set( + addItem(tLastID = 359, "Extruder Shape (Small Pipe)", "Extruder Shape for making small Pipes")); + ItemList.Shape_Extruder_Pipe_Medium.set( + addItem(tLastID = 360, "Extruder Shape (Normal Pipe)", "Extruder Shape for making Pipes")); + ItemList.Shape_Extruder_Pipe_Large.set( + addItem(tLastID = 361, "Extruder Shape (Large Pipe)", "Extruder Shape for making large Pipes")); ItemList.Shape_Extruder_Pipe_Huge.set( addItem(tLastID = 362, "Extruder Shape (Huge Pipe)", "Extruder Shape for making full Block Pipes")); - ItemList.Shape_Extruder_Block - .set(addItem(tLastID = 363, "Extruder Shape (Block)", "Extruder Shape for making Blocks")); - ItemList.Shape_Extruder_Sword - .set(addItem(tLastID = 364, "Extruder Shape (Sword Blade)", "Extruder Shape for making Swords")); - ItemList.Shape_Extruder_Pickaxe - .set(addItem(tLastID = 365, "Extruder Shape (Pickaxe Head)", "Extruder Shape for making Pickaxes")); - ItemList.Shape_Extruder_Shovel - .set(addItem(tLastID = 366, "Extruder Shape (Shovel Head)", "Extruder Shape for making Shovels")); - ItemList.Shape_Extruder_Axe - .set(addItem(tLastID = 367, "Extruder Shape (Axe Head)", "Extruder Shape for making Axes")); - ItemList.Shape_Extruder_Hoe - .set(addItem(tLastID = 368, "Extruder Shape (Hoe Head)", "Extruder Shape for making Hoes")); - ItemList.Shape_Extruder_Hammer - .set(addItem(tLastID = 369, "Extruder Shape (Hammer Head)", "Extruder Shape for making Hammers")); - ItemList.Shape_Extruder_File - .set(addItem(tLastID = 370, "Extruder Shape (File Head)", "Extruder Shape for making Files")); - ItemList.Shape_Extruder_Saw - .set(addItem(tLastID = 371, "Extruder Shape (Saw Blade)", "Extruder Shape for making Saws")); - ItemList.Shape_Extruder_Gear - .set(addItem(tLastID = 372, "Extruder Shape (Gear)", "Extruder Shape for making Gears")); - ItemList.Shape_Extruder_Bottle - .set(addItem(tLastID = 373, "Extruder Shape (Bottle)", "Extruder Shape for making Bottles")); - ItemList.Shape_Extruder_Rotor - .set(addItem(tLastID = 374, "Extruder Shape (Rotor)", "Extruder Shape for a Rotor")); - ItemList.Shape_Extruder_Small_Gear - .set(addItem(tLastID = 375, "Extruder Shape (Small Gear)", "Extruder Shape for a Small Gear")); - ItemList.Shape_Extruder_Turbine_Blade - .set(addItem(tLastID = 376, "Extruder Shape (Turbine Blade)", "Extruder Shape for a Turbine Blade")); - ItemList.Shape_Extruder_ToolHeadDrill - .set(addItem(tLastID = 377, "Extruder Shape (Drill Head)", "Extruder Shape for a Drill Head")); + ItemList.Shape_Extruder_Block.set( + addItem(tLastID = 363, "Extruder Shape (Block)", "Extruder Shape for making Blocks")); + ItemList.Shape_Extruder_Sword.set( + addItem(tLastID = 364, "Extruder Shape (Sword Blade)", "Extruder Shape for making Swords")); + ItemList.Shape_Extruder_Pickaxe.set( + addItem(tLastID = 365, "Extruder Shape (Pickaxe Head)", "Extruder Shape for making Pickaxes")); + ItemList.Shape_Extruder_Shovel.set( + addItem(tLastID = 366, "Extruder Shape (Shovel Head)", "Extruder Shape for making Shovels")); + ItemList.Shape_Extruder_Axe.set( + addItem(tLastID = 367, "Extruder Shape (Axe Head)", "Extruder Shape for making Axes")); + ItemList.Shape_Extruder_Hoe.set( + addItem(tLastID = 368, "Extruder Shape (Hoe Head)", "Extruder Shape for making Hoes")); + ItemList.Shape_Extruder_Hammer.set( + addItem(tLastID = 369, "Extruder Shape (Hammer Head)", "Extruder Shape for making Hammers")); + ItemList.Shape_Extruder_File.set( + addItem(tLastID = 370, "Extruder Shape (File Head)", "Extruder Shape for making Files")); + ItemList.Shape_Extruder_Saw.set( + addItem(tLastID = 371, "Extruder Shape (Saw Blade)", "Extruder Shape for making Saws")); + ItemList.Shape_Extruder_Gear.set( + addItem(tLastID = 372, "Extruder Shape (Gear)", "Extruder Shape for making Gears")); + ItemList.Shape_Extruder_Bottle.set( + addItem(tLastID = 373, "Extruder Shape (Bottle)", "Extruder Shape for making Bottles")); + ItemList.Shape_Extruder_Rotor.set( + addItem(tLastID = 374, "Extruder Shape (Rotor)", "Extruder Shape for a Rotor")); + ItemList.Shape_Extruder_Small_Gear.set( + addItem(tLastID = 375, "Extruder Shape (Small Gear)", "Extruder Shape for a Small Gear")); + ItemList.Shape_Extruder_Turbine_Blade.set( + addItem(tLastID = 376, "Extruder Shape (Turbine Blade)", "Extruder Shape for a Turbine Blade")); + ItemList.Shape_Extruder_ToolHeadDrill.set( + addItem(tLastID = 377, "Extruder Shape (Drill Head)", "Extruder Shape for a Drill Head")); ItemList.Shape_Slicer_Flat.set(addItem(tLastID = 398, "Slicer Blade (Flat)", "Slicer Blade for cutting Flat")); - ItemList.Shape_Slicer_Stripes - .set(addItem(tLastID = 399, "Slicer Blade (Stripes)", "Slicer Blade for cutting Stripes")); + ItemList.Shape_Slicer_Stripes.set( + addItem(tLastID = 399, "Slicer Blade (Stripes)", "Slicer Blade for cutting Stripes")); GT_ModHandler.addCraftingRecipe( ItemList.Shape_Slicer_Flat.get(1L), @@ -1178,8 +1179,12 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Tool_MatchBox_Full.get(1L), 64, 16); - GT_Values.RA - .addUnboxingRecipe(ItemList.Tool_MatchBox_Full.get(1L), ItemList.Tool_Matches.get(16L), null, 32, 16); + GT_Values.RA.addUnboxingRecipe( + ItemList.Tool_MatchBox_Full.get(1L), + ItemList.Tool_Matches.get(16L), + null, + 32, + 16); ItemList.Tool_Lighter_Invar_Empty.set( addItem( @@ -1269,12 +1274,12 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { 256); if (GalacticraftMars.isModLoaded()) { - ItemList.Ingot_Heavy1 - .set(addItem(tLastID = 462, "Heavy Duty Alloy Ingot T1", "Used to make Heavy Duty Plates T1")); - ItemList.Ingot_Heavy2 - .set(addItem(tLastID = 463, "Heavy Duty Alloy Ingot T2", "Used to make Heavy Duty Plates T2")); - ItemList.Ingot_Heavy3 - .set(addItem(tLastID = 464, "Heavy Duty Alloy Ingot T3", "Used to make Heavy Duty Plates T3")); + ItemList.Ingot_Heavy1.set( + addItem(tLastID = 462, "Heavy Duty Alloy Ingot T1", "Used to make Heavy Duty Plates T1")); + ItemList.Ingot_Heavy2.set( + addItem(tLastID = 463, "Heavy Duty Alloy Ingot T2", "Used to make Heavy Duty Plates T2")); + ItemList.Ingot_Heavy3.set( + addItem(tLastID = 464, "Heavy Duty Alloy Ingot T3", "Used to make Heavy Duty Plates T3")); // GT_ModHandler.addCraftingRecipe(ItemList.Ingot_Heavy1.get(1L, new Object[0]), // GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"BhB", "CAS", "B B", 'B', @@ -1705,14 +1710,17 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { setElectricStats(32000 + tLastID, 800000L, GT_Values.V[3], 3L, -3L, true); registerTieredTooltip(ItemList.Battery_RE_HV_Sodium.get(1), HV); - GT_ModHandler - .addExtractionRecipe(ItemList.Battery_SU_LV_SulfuricAcid.get(1L), ItemList.Battery_Hull_LV.get(1L)); + GT_ModHandler.addExtractionRecipe( + ItemList.Battery_SU_LV_SulfuricAcid.get(1L), + ItemList.Battery_Hull_LV.get(1L)); GT_ModHandler.addExtractionRecipe(ItemList.Battery_SU_LV_Mercury.get(1L), ItemList.Battery_Hull_LV.get(1L)); - GT_ModHandler - .addExtractionRecipe(ItemList.Battery_SU_MV_SulfuricAcid.get(1L), ItemList.Battery_Hull_MV.get(1L)); + GT_ModHandler.addExtractionRecipe( + ItemList.Battery_SU_MV_SulfuricAcid.get(1L), + ItemList.Battery_Hull_MV.get(1L)); GT_ModHandler.addExtractionRecipe(ItemList.Battery_SU_MV_Mercury.get(1L), ItemList.Battery_Hull_MV.get(1L)); - GT_ModHandler - .addExtractionRecipe(ItemList.Battery_SU_HV_SulfuricAcid.get(1L), ItemList.Battery_Hull_HV.get(1L)); + GT_ModHandler.addExtractionRecipe( + ItemList.Battery_SU_HV_SulfuricAcid.get(1L), + ItemList.Battery_Hull_HV.get(1L)); GT_ModHandler.addExtractionRecipe(ItemList.Battery_SU_HV_Mercury.get(1L), ItemList.Battery_Hull_HV.get(1L)); GT_ModHandler.addExtractionRecipe(ItemList.Battery_RE_LV_Cadmium.get(1L), ItemList.Battery_Hull_LV.get(1L)); GT_ModHandler.addExtractionRecipe(ItemList.Battery_RE_LV_Lithium.get(1L), ItemList.Battery_Hull_LV.get(1L)); @@ -2565,8 +2573,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { TextureFactory.of(MACHINE_CASINGS[5][0], TextureFactory.of(OVERLAY_VALVE)), new GT_Cover_SteamValve(16384, TextureFactory.of(OVERLAY_VALVE))); - ItemList.FluidRegulator_LV - .set(addItem(tLastID = 660, "Fluid Regulator (LV)", FRText1 + GT_Utility.formatNumbers(640) + FRText2)); + ItemList.FluidRegulator_LV.set( + addItem(tLastID = 660, "Fluid Regulator (LV)", FRText1 + GT_Utility.formatNumbers(640) + FRText2)); ItemList.FluidRegulator_MV.set( addItem(tLastID = 661, "Fluid Regulator (MV)", FRText1 + GT_Utility.formatNumbers(2560) + FRText2)); ItemList.FluidRegulator_HV.set( @@ -2615,8 +2623,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { TextureFactory.of(MACHINE_CASINGS[8][0], TextureFactory.of(OVERLAY_PUMP)), new GT_Cover_FluidRegulator(524288, TextureFactory.of(OVERLAY_PUMP))); - ItemList.FluidFilter - .set(addItem(669, "Fluid Filter Cover", "Set with Fluid Container to only accept one Fluid Type")); + ItemList.FluidFilter.set( + addItem(669, "Fluid Filter Cover", "Set with Fluid Container to only accept one Fluid Type")); GregTech_API.registerCover( ItemList.FluidFilter.get(1L), TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(OVERLAY_SHUTTER)), @@ -2639,8 +2647,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.ItemFilter_Import.get(1L), TextureFactory.of(MACHINE_CASINGS[5][0], TextureFactory.of(OVERLAY_CONVEYOR)), new GT_Cover_ItemFilter(false, TextureFactory.of(OVERLAY_CONVEYOR))); - ItemList.Cover_FluidLimiter - .set(addItem(272, "Fluid Limiter Cover", "Limits fluid input depending on fill level")); + ItemList.Cover_FluidLimiter.set( + addItem(272, "Fluid Limiter Cover", "Limits fluid input depending on fill level")); GregTech_API.registerCover( ItemList.Cover_FluidLimiter.get(1L), TextureFactory.of(MACHINE_CASINGS[1][0], TextureFactory.of(OVERLAY_SHUTTER)), @@ -3561,15 +3569,15 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Circuit_Board_Coated.set(ItemList.Circuit_Board_Basic.get(1)); ItemList.Circuit_Board_Advanced.set(addItem(tLastID = 711, "Epoxy Circuit Board", "An Advanced Board")); ItemList.Circuit_Board_Epoxy.set(ItemList.Circuit_Board_Advanced.get(1)); - ItemList.Circuit_Board_Elite - .set(addItem(tLastID = 712, "Multilayer Fiber-Reinforced Circuit Board", "An Elite Board")); + ItemList.Circuit_Board_Elite.set( + addItem(tLastID = 712, "Multilayer Fiber-Reinforced Circuit Board", "An Elite Board")); ItemList.Circuit_Board_Multifiberglass.set(ItemList.Circuit_Board_Elite.get(1)); - ItemList.Circuit_Parts_Crystal_Chip_Elite - .set(addItem(tLastID = 713, "Engraved Crystal Chip", "Needed for Circuits")); - ItemList.Circuit_Parts_Crystal_Chip_Master - .set(addItem(tLastID = 714, "Engraved Lapotron Chip", "Needed for Circuits")); - ItemList.Circuit_Parts_Crystal_Chip_Wetware - .set(addItem(tLastID = 668, "Living Crystal Chip", "Needed for Circuits")); + ItemList.Circuit_Parts_Crystal_Chip_Elite.set( + addItem(tLastID = 713, "Engraved Crystal Chip", "Needed for Circuits")); + ItemList.Circuit_Parts_Crystal_Chip_Master.set( + addItem(tLastID = 714, "Engraved Lapotron Chip", "Needed for Circuits")); + ItemList.Circuit_Parts_Crystal_Chip_Wetware.set( + addItem(tLastID = 668, "Living Crystal Chip", "Needed for Circuits")); ItemList.Circuit_Parts_Advanced.set(addItem(tLastID = 715, "Diode", "Basic Electronic Component")); ItemList.Circuit_Parts_Diode.set(ItemList.Circuit_Parts_Advanced.get(1)); ItemList.Circuit_Parts_Wiring_Basic.set(addItem(tLastID = 716, "Resistor", "Basic Electronic Component")); @@ -3793,7 +3801,10 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { final ITexture doesWorkCoverTexture = TextureFactory.of( TextureFactory.of(OVERLAY_ACTIVITYDETECTOR), - TextureFactory.builder().addIcon(OVERLAY_ACTIVITYDETECTOR_GLOW).glow().build()); + TextureFactory.builder() + .addIcon(OVERLAY_ACTIVITYDETECTOR_GLOW) + .glow() + .build()); GregTech_API.registerCover( ItemList.Cover_ActivityDetector.get(1L), TextureFactory.of(MACHINE_CASINGS[2][0], doesWorkCoverTexture), @@ -3813,7 +3824,10 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { final ITexture playerDectectorCoverTexture = TextureFactory.of( TextureFactory.of(OVERLAY_ACTIVITYDETECTOR), - TextureFactory.builder().addIcon(OVERLAY_ACTIVITYDETECTOR_GLOW).glow().build()); + TextureFactory.builder() + .addIcon(OVERLAY_ACTIVITYDETECTOR_GLOW) + .glow() + .build()); GregTech_API.registerCover( ItemList.Cover_PlayerDetector.get(1L), TextureFactory.of(MACHINE_CASINGS[2][0], playerDectectorCoverTexture), @@ -3942,7 +3956,10 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { final ITexture screenCoverTexture = TextureFactory.of( TextureFactory.of(OVERLAY_SCREEN), - TextureFactory.builder().addIcon(OVERLAY_SCREEN_GLOW).glow().build()); + TextureFactory.builder() + .addIcon(OVERLAY_SCREEN_GLOW) + .glow() + .build()); GregTech_API.registerCover( ItemList.Cover_Screen.get(1L), TextureFactory.of(MACHINE_CASINGS[2][0], screenCoverTexture), @@ -4370,7 +4387,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { @Override public boolean onEntityItemUpdate(EntityItem aItemEntity) { - int aDamage = aItemEntity.getEntityItem().getItemDamage(); + int aDamage = aItemEntity.getEntityItem() + .getItemDamage(); if ((aDamage < 32000) && (aDamage >= 0) && (!aItemEntity.worldObj.isRemote)) { Materials aMaterial = GregTech_API.sGeneratedMaterials[(aDamage % 1000)]; if ((aMaterial != null) && (aMaterial != Materials.Empty) && (aMaterial != Materials._NULL)) { @@ -4386,8 +4404,10 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { aMaterial = cauldronRemap.getOrDefault(aMaterial, aMaterial); aItemEntity.setEntityItemStack( - GT_OreDictUnificator - .get(OrePrefixes.dust, aMaterial, aItemEntity.getEntityItem().stackSize)); + GT_OreDictUnificator.get( + OrePrefixes.dust, + aMaterial, + aItemEntity.getEntityItem().stackSize)); aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3); return true; } @@ -4437,10 +4457,12 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { if (aPrefix == OrePrefixes.cellPlasma && aMaterial.getPlasma(1L) != null) { // Materials has a plasma fluid for (GT_Recipe recipe : fusionRecipes) { // Loop through fusion recipes if (recipe.getFluidOutput(0) != null) { // Make sure fluid output can't be null (not sure if possible) - if (recipe.getFluidOutput(0).isFluidEqual(aMaterial.getPlasma(1L))) return true; // Fusion recipe - // output matches - // current plasma - // cell fluid + if (recipe.getFluidOutput(0) + .isFluidEqual(aMaterial.getPlasma(1L))) + return true; // Fusion recipe + // output matches + // current plasma + // cell fluid } } } diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index c52255ce3a..7300e59b14 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -1679,7 +1679,8 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { tLastID = 414 + i, Dyes.get(i).mName + " Dye", "", - Dyes.get(i).name(), + Dyes.get(i) + .name(), new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L))); } ItemList.Plank_Oak.set( @@ -2816,16 +2817,20 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1L)); GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Coppon.get(4L), new ItemStack(Blocks.wool, 1, 1)); - GT_ModHandler - .addCompressionRecipe(ItemList.Crop_Drop_Plumbilia.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler - .addCompressionRecipe(ItemList.Crop_Drop_Argentia.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe( + ItemList.Crop_Drop_Plumbilia.get(4L), + ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe( + ItemList.Crop_Drop_Argentia.get(4L), + ItemList.IC2_PlantballCompressed.get(1L)); GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Indigo.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Ferru.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler - .addCompressionRecipe(ItemList.Crop_Drop_Aurelia.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler - .addCompressionRecipe(ItemList.Crop_Drop_OilBerry.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe( + ItemList.Crop_Drop_Aurelia.get(4L), + ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe( + ItemList.Crop_Drop_OilBerry.get(4L), + ItemList.IC2_PlantballCompressed.get(1L)); GT_ModHandler.addCompressionRecipe( ItemList.Crop_Drop_BobsYerUncleRanks.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); @@ -2898,9 +2903,9 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { try { ic2.api.crops.CropCard tCrop; GT_Utility.getField(tCrop = ic2.api.crops.Crops.instance.getCropList()[13], "mDrop") - .set(tCrop, ItemList.Crop_Drop_Ferru.get(1L)); + .set(tCrop, ItemList.Crop_Drop_Ferru.get(1L)); GT_Utility.getField(tCrop = ic2.api.crops.Crops.instance.getCropList()[14], "mDrop") - .set(tCrop, ItemList.Crop_Drop_Aurelia.get(1L)); + .set(tCrop, ItemList.Crop_Drop_Aurelia.get(1L)); } catch (Throwable e) { if (GT_Values.D1) { e.printStackTrace(GT_Log.err); @@ -2953,8 +2958,13 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { int aDamage = aStack.getItemDamage(); if ((aDamage >= 25000) && (aDamage < 27000)) { if (aDamage >= 26000) { - return Behaviour_Arrow.DEFAULT_PLASTIC - .getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed); + return Behaviour_Arrow.DEFAULT_PLASTIC.getProjectile( + this, + aProjectileType, + aStack, + aWorld, + aEntity, + aSpeed); } return Behaviour_Arrow.DEFAULT_WOODEN.getProjectile(this, aProjectileType, aStack, aWorld, aEntity, aSpeed); } @@ -2982,7 +2992,8 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { @Override public boolean doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) { - return (aDoShowAllItems) || (!aPrefix.name().startsWith("toolHead")); + return (aDoShowAllItems) || (!aPrefix.name() + .startsWith("toolHead")); } @Override diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 79c9ccc164..f2ea20a174 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -35,8 +35,8 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { * copper foil + sulfuric acid fiberglass circuit board (simple + multilayer) / glass + plastic + electrum foil * + sulfurci acid wetware lifesupport board / fiberglass CB + teflon + */ - ItemList.Circuit_Board_Wetware - .set(addItem(tLastID = 6, "Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); + ItemList.Circuit_Board_Wetware.set( + addItem(tLastID = 6, "Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); ItemList.Circuit_Board_Plastic.set(addItem(tLastID = 7, "Plastic Circuit Board", "A Good Board", o)); ItemList.Circuit_Board_Bio.set(addItem(tLastID = 8, "Bio Circuit Board", "Bio genetic mutated Board", o)); @@ -74,28 +74,28 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "Electronic Component", OrePrefixes.componentCircuit.get(Materials.Capacitor), SubTag.NO_UNIFICATION)); - ItemList.Circuit_Parts_GlassFiber - .set(addItem(tLastID = 21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o)); + ItemList.Circuit_Parts_GlassFiber.set( + addItem(tLastID = 21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o)); ItemList.Circuit_Parts_PetriDish.set(addItem(tLastID = 22, "Petri Dish", "For cultivating cells", o)); ItemList.Circuit_Parts_Reinforced_Glass_Tube.set(addItem(tLastID = 23, "Reinforced Glass Tube", "", o)); - ItemList.Circuit_Parts_ResistorASMD - .set(addItem(tLastID = 24, "Advanced SMD Resistor", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_DiodeASMD - .set(addItem(tLastID = 25, "Advanced SMD Diode", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_TransistorASMD - .set(addItem(tLastID = 26, "Advanced SMD Transistor", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_CapacitorASMD - .set(addItem(tLastID = 27, "Advanced SMD Capacitor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_ResistorASMD.set( + addItem(tLastID = 24, "Advanced SMD Resistor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_DiodeASMD.set( + addItem(tLastID = 25, "Advanced SMD Diode", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_TransistorASMD.set( + addItem(tLastID = 26, "Advanced SMD Transistor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_CapacitorASMD.set( + addItem(tLastID = 27, "Advanced SMD Capacitor", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_ResistorXSMD - .set(addItem(tLastID = 178, "Optical SMD Resistor", "Highly Advanced Electronic Component", o)); - ItemList.Circuit_Parts_DiodeXSMD - .set(addItem(tLastID = 179, "Optical SMD Diode", "Highly Advanced Electronic Component", o)); - ItemList.Circuit_Parts_TransistorXSMD - .set(addItem(tLastID = 180, "Optical SMD Transistor", "Highly Advanced Electronic Component", o)); - ItemList.Circuit_Parts_CapacitorXSMD - .set(addItem(tLastID = 181, "Optical SMD Capacitor", "Highly Advanced Electronic Component", o)); + ItemList.Circuit_Parts_ResistorXSMD.set( + addItem(tLastID = 178, "Optical SMD Resistor", "Highly Advanced Electronic Component", o)); + ItemList.Circuit_Parts_DiodeXSMD.set( + addItem(tLastID = 179, "Optical SMD Diode", "Highly Advanced Electronic Component", o)); + ItemList.Circuit_Parts_TransistorXSMD.set( + addItem(tLastID = 180, "Optical SMD Transistor", "Highly Advanced Electronic Component", o)); + ItemList.Circuit_Parts_CapacitorXSMD.set( + addItem(tLastID = 181, "Optical SMD Capacitor", "Highly Advanced Electronic Component", o)); ItemList.Circuit_Parts_InductorSMD.set( addItem( @@ -104,19 +104,25 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "Electronic Component", OrePrefixes.componentCircuit.get(Materials.Inductor), SubTag.NO_UNIFICATION)); - ItemList.Circuit_Parts_InductorASMD - .set(addItem(tLastID = 183, "Advanced SMD Inductor", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_InductorXSMD - .set(addItem(tLastID = 184, "Optical SMD Inductor", "Highly Advanced Electronic Component", o)); + ItemList.Circuit_Parts_InductorASMD.set( + addItem(tLastID = 183, "Advanced SMD Inductor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_InductorXSMD.set( + addItem(tLastID = 184, "Optical SMD Inductor", "Highly Advanced Electronic Component", o)); - GT_OreDictUnificator - .set(OrePrefixes.componentCircuit, Materials.Resistor, ItemList.Circuit_Parts_Resistor.get(1L)); + GT_OreDictUnificator.set( + OrePrefixes.componentCircuit, + Materials.Resistor, + ItemList.Circuit_Parts_Resistor.get(1L)); GT_OreDictUnificator.set(OrePrefixes.componentCircuit, Materials.Diode, ItemList.Circuit_Parts_Diode.get(1L)); - GT_OreDictUnificator - .set(OrePrefixes.componentCircuit, Materials.Transistor, ItemList.Circuit_Parts_Transistor.get(1L)); + GT_OreDictUnificator.set( + OrePrefixes.componentCircuit, + Materials.Transistor, + ItemList.Circuit_Parts_Transistor.get(1L)); GT_OreDictUnificator.set(OrePrefixes.componentCircuit, Materials.Inductor, ItemList.Circuit_Parts_Coil.get(1L)); - GT_OreDictUnificator - .set(OrePrefixes.componentCircuit, Materials.Capacitor, ItemList.Circuit_Parts_Capacitor.get(1L)); + GT_OreDictUnificator.set( + OrePrefixes.componentCircuit, + Materials.Capacitor, + ItemList.Circuit_Parts_Capacitor.get(1L)); GT_OreDictUnificator.addAssociation( OrePrefixes.componentCircuit, @@ -157,16 +163,16 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { * quantum chips */ ItemList.Circuit_Silicon_Ingot.set(addItem(tLastID = 30, "Monocrystalline Silicon Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Ingot2 - .set(addItem(tLastID = 31, "Phosphorus doped Monocrystalline Silicon Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Ingot3 - .set(addItem(tLastID = 32, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Ingot4 - .set(addItem(tLastID = 150, "Europium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Ingot5 - .set(addItem(tLastID = 152, "Americium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Ingot6 - .set(addItem(tLastID = 721, "Optically Enriched Crystalline Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot2.set( + addItem(tLastID = 31, "Phosphorus doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot3.set( + addItem(tLastID = 32, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot4.set( + addItem(tLastID = 150, "Europium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot5.set( + addItem(tLastID = 152, "Americium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot6.set( + addItem(tLastID = 721, "Optically Enriched Crystalline Boule", "Raw Circuit", o)); ItemList.Circuit_Silicon_Wafer.set(addItem(tLastID = 33, "Wafer", "Raw Circuit", o)); ItemList.Circuit_Silicon_Wafer2.set(addItem(tLastID = 34, "Phosphorus doped Wafer", "Raw Circuit", o)); @@ -204,8 +210,8 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { ItemList.Circuit_Chip_HPIC.set(addItem(tLastID = 53, "High Power IC", "High Power Circuit", o)); ItemList.Circuit_Wafer_NanoCPU.set(addItem(tLastID = 54, "NanoCPU Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_NanoCPU - .set(addItem(tLastID = 55, "Nanocomponent Central Processing Unit", "Power Circuit", o)); + ItemList.Circuit_Chip_NanoCPU.set( + addItem(tLastID = 55, "Nanocomponent Central Processing Unit", "Power Circuit", o)); ItemList.Circuit_Wafer_QuantumCPU.set(addItem(tLastID = 56, "QBit Wafer", "Raw Circuit", o)); ItemList.Circuit_Chip_QuantumCPU.set(addItem(tLastID = 57, "QBit Processing Unit", "Quantum CPU", o)); @@ -233,10 +239,10 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { /** * Engraved Crystal Chip Engraved Lapotron Chip Crystal CPU SoCrystal stem cells (disassemble eggs) */ - ItemList.Circuit_Chip_CrystalSoC2 - .set(addItem(tLastID = 68, "Raw Advanced Crystal Chip", "Raw Advanced Crystal Processor", o)); - ItemList.Circuit_Parts_RawCrystalChip - .set(addItem(tLastID = 69, "Raw Crystal Chip", "Raw Crystal Processor", o)); + ItemList.Circuit_Chip_CrystalSoC2.set( + addItem(tLastID = 68, "Raw Advanced Crystal Chip", "Raw Advanced Crystal Processor", o)); + ItemList.Circuit_Parts_RawCrystalChip.set( + addItem(tLastID = 69, "Raw Crystal Chip", "Raw Crystal Processor", o)); ItemList.Circuit_Chip_CrystalCPU.set(addItem(tLastID = 70, "Crystal Processing Unit", "Crystal CPU", o)); // Crystal // chip // elite @@ -244,8 +250,8 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { ItemList.Circuit_Chip_CrystalSoC.set(addItem(tLastID = 71, "Crystal SoC", "Crystal System on a Chip", o)); ItemList.Circuit_Chip_NeuroCPU.set(addItem(tLastID = 72, "Neuro Processing Unit", "Neuro CPU", o)); ItemList.Circuit_Chip_Stemcell.set(addItem(tLastID = 73, "Stemcells", "Raw inteligence", o)); - ItemList.Circuit_Parts_RawCrystalParts - .set(addItem(tLastID = 74, "Raw Crystal Chip Parts", "Raw Crystal Processor Parts", o)); + ItemList.Circuit_Parts_RawCrystalParts.set( + addItem(tLastID = 74, "Raw Crystal Chip Parts", "Raw Crystal Processor Parts", o)); ItemList.Circuit_Chip_Biocell.set(addItem(tLastID = 76, "Biocells", "Mutated Raw inteligence", o)); ItemList.Circuit_Chip_BioCPU.set(addItem(tLastID = 77, "Bio Processing Unit", "Bio CPU", o)); ItemList.Circuit_Chip_Optical.set(addItem(tLastID = 724, "Raw Exposed Optical Chip", "Raw Optical Chip", o)); @@ -462,21 +468,21 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Biomainframe.get(1), UEV); ItemList.Circuit_Board_Coated_Basic.set(addItem(tLastID = 100, "Circuit Board", "A basic Circuit Board", o)); - ItemList.Circuit_Board_Phenolic_Good - .set(addItem(tLastID = 101, "Good Circuit Board", "A good Circuit Board", o)); - ItemList.Circuit_Board_Epoxy_Advanced - .set(addItem(tLastID = 102, "Advanced Circuit Board", "A advanced Circuit Board", o)); - ItemList.Circuit_Board_Fiberglass_Advanced - .set(addItem(tLastID = 103, "More Advanced Circuit Board", "A more advanced Circuit Board", o)); - ItemList.Circuit_Board_Multifiberglass_Elite - .set(addItem(tLastID = 104, "Elite Circuit Board", "A elite Circuit Board", o)); + ItemList.Circuit_Board_Phenolic_Good.set( + addItem(tLastID = 101, "Good Circuit Board", "A good Circuit Board", o)); + ItemList.Circuit_Board_Epoxy_Advanced.set( + addItem(tLastID = 102, "Advanced Circuit Board", "A advanced Circuit Board", o)); + ItemList.Circuit_Board_Fiberglass_Advanced.set( + addItem(tLastID = 103, "More Advanced Circuit Board", "A more advanced Circuit Board", o)); + ItemList.Circuit_Board_Multifiberglass_Elite.set( + addItem(tLastID = 104, "Elite Circuit Board", "A elite Circuit Board", o)); ItemList.Circuit_Board_Wetware_Extreme.set( addItem(tLastID = 105, "Extreme Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); ItemList.Circuit_Board_Plastic_Advanced.set(addItem(tLastID = 106, "Plastic Circuit Board", "A good Board", o)); - ItemList.Circuit_Board_Bio_Ultra - .set(addItem(tLastID = 107, "Ultra Bio Mutated Circuit Board", "Bio genetic mutated Board", o)); - ItemList.Circuit_Board_Optical - .set(addItem(tLastID = 728, "Optical Circuit Board", "Optically Infused Board", o)); + ItemList.Circuit_Board_Bio_Ultra.set( + addItem(tLastID = 107, "Ultra Bio Mutated Circuit Board", "Bio genetic mutated Board", o)); + ItemList.Circuit_Board_Optical.set( + addItem(tLastID = 728, "Optical Circuit Board", "Optically Infused Board", o)); // Optical circuits ItemList.Circuit_OpticalProcessor.set( @@ -666,8 +672,8 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { ItemList.UHV_Coil.set(addItem(tLastID = 149, "Highly Ultimate Voltage Coil", "Infinite Coil", o)); ItemList.GalliumArsenideCrystal.set(addItem(tLastID = 190, "Gallium Arsenide Crystal", "For making boules", o)); - ItemList.GalliumArsenideCrystalSmallPart - .set(addItem(tLastID = 191, "Small Gallium Arsenide Crystal", "For making boules", o)); + ItemList.GalliumArsenideCrystalSmallPart.set( + addItem(tLastID = 191, "Small Gallium Arsenide Crystal", "For making boules", o)); ItemList.KevlarFiber.set(addItem(tLastID = 192, "Kevlar Fiber", "For make Kevlar Plates", o)); ItemList.WovenKevlar.set(addItem(tLastID = 193, "Woven Kevlar", "For make Kevlar Plates", o)); ItemList.Spinneret.set(addItem(tLastID = 194, "Spinneret", "For make Kevlar Fiber", o)); @@ -900,11 +906,11 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "BY THE POWERS OF NAUGHTINESS, I COMMAND THIS PARTICULAR STAR, TO BE REALLY, REALLY HOT", SubTag.NO_UNIFICATION)); - ItemList.Optical_Cpu_Containment_Housing - .set(addItem(tLastID = 727, "Optical CPU Containment Housing", "CPU Housing", o)); + ItemList.Optical_Cpu_Containment_Housing.set( + addItem(tLastID = 727, "Optical CPU Containment Housing", "CPU Housing", o)); ItemList.Optically_Perfected_CPU.set(addItem(tLastID = 726, "Optically Perfected CPU", "Perfected CPU!", o)); - ItemList.Optically_Compatible_Memory - .set(addItem(tLastID = 725, "Optically Compatible Memory", "Its in the name!", o)); + ItemList.Optically_Compatible_Memory.set( + addItem(tLastID = 725, "Optically Compatible Memory", "Its in the name!", o)); int whiteDwarfIDs = 729; ItemList.White_Dwarf_Shape_Extruder_Plate.set( @@ -1051,6 +1057,8 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { @Override public boolean doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) { - return aDoShowAllItems || (aPrefix.toString().toLowerCase().contains("nanite")); + return aDoShowAllItems || (aPrefix.toString() + .toLowerCase() + .contains("nanite")); } } diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java index 7e50bd4556..8bd30912fc 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java @@ -313,8 +313,11 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item { @Override @SideOnly(Side.CLIENT) public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { - Arrays.stream(FluidCell.values()).filter(fluid -> FluidRegistry.getFluid(fluid.getFluidName()) != null) - .map(FluidCell::get).filter(Objects::nonNull).forEach(aList::add); + Arrays.stream(FluidCell.values()) + .filter(fluid -> FluidRegistry.getFluid(fluid.getFluidName()) != null) + .map(FluidCell::get) + .filter(Objects::nonNull) + .forEach(aList::add); } @Override diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java index 51d8405107..4186b607f8 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java @@ -178,7 +178,9 @@ public class GT_MetaGenerated_Item_99 extends GT_MetaGenerated_Item { @Override @SideOnly(Side.CLIENT) public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { - enabled.stream().mapToObj(i -> new ItemStack(this, 1, i)).forEach(aList::add); + enabled.stream() + .mapToObj(i -> new ItemStack(this, 1, i)) + .forEach(aList::add); } @Override diff --git a/src/main/java/gregtech/common/items/GT_NeutronReflector_Item.java b/src/main/java/gregtech/common/items/GT_NeutronReflector_Item.java index cfcedaa8b6..9365677773 100644 --- a/src/main/java/gregtech/common/items/GT_NeutronReflector_Item.java +++ b/src/main/java/gregtech/common/items/GT_NeutronReflector_Item.java @@ -18,8 +18,15 @@ public class GT_NeutronReflector_Item extends GT_Generic_Item implements IReacto public boolean acceptUraniumPulse(IReactor reactor, ItemStack yourStack, ItemStack pulsingStack, int youX, int youY, int pulseX, int pulseY, boolean heatrun) { if (!heatrun) { - ((IReactorComponent) pulsingStack.getItem()) - .acceptUraniumPulse(reactor, pulsingStack, yourStack, pulseX, pulseY, youX, youY, heatrun); + ((IReactorComponent) pulsingStack.getItem()).acceptUraniumPulse( + reactor, + pulsingStack, + yourStack, + pulseX, + pulseY, + youX, + youY, + heatrun); } return true; } diff --git a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java index db2efa4d81..1787875100 100644 --- a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java +++ b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java @@ -228,7 +228,8 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs creativeTabs, List itemList) { itemList.add(new ItemStack(this)); - for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) { + for (Fluid fluid : FluidRegistry.getRegisteredFluids() + .values()) { if (fluid != null) { ItemStack stack = new ItemStack(this); setCapacity(stack, getMaxCapacity()); @@ -339,11 +340,14 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain textField.setText( String.valueOf(((GT_VolumetricFlask) getCurrentItem().getItem()).getCapacity(getCurrentItem()))); builder.widget( - textField.setNumbers(() -> 1, () -> maxCapacity).setPattern(BaseTextFieldWidget.NATURAL_NUMS) - .setTextAlignment(Alignment.CenterLeft).setTextColor(Color.WHITE.dark(1)) - .setFocusOnGuiOpen(true) - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2)) - .setPos(60, 55).setSize(59, 12)); + textField.setNumbers(() -> 1, () -> maxCapacity) + .setPattern(BaseTextFieldWidget.NATURAL_NUMS) + .setTextAlignment(Alignment.CenterLeft) + .setTextColor(Color.WHITE.dark(1)) + .setFocusOnGuiOpen(true) + .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD_LIGHT_GRAY.withOffset(-1, -1, 2, 2)) + .setPos(60, 55) + .setSize(59, 12)); addChangeAmountButton(builder, "+1", new Pos2d(20, 26), new Size(22, 20), val -> val + 1); addChangeAmountButton(builder, "+10", new Pos2d(48, 26), new Size(28, 20), val -> val + 10); @@ -355,26 +359,34 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain addChangeAmountButton(builder, "-1000", new Pos2d(120, 75), new Size(38, 20), val -> val - 1000); builder.widget( new VanillaButtonWidget().setDisplayString("Accept") - .setClickableGetter(() -> MathExpression.parseMathExpression(textField.getText()) > 0) - .setOnClick((clickData, widget) -> { - if (widget.isClient()) { - textField.onRemoveFocus(); - } else { - widget.getWindow().tryClose(); - } - }).setPos(128, 51).setSize(38, 20)); + .setClickableGetter( + () -> MathExpression.parseMathExpression(textField.getText()) > 0) + .setOnClick((clickData, widget) -> { + if (widget.isClient()) { + textField.onRemoveFocus(); + } else { + widget.getWindow() + .tryClose(); + } + }) + .setPos(128, 51) + .setSize(38, 20)); return builder.build(); } private void addChangeAmountButton(ModularWindow.Builder builder, String text, Pos2d pos, Size size, Function<Integer, Integer> function) { - builder.widget(new VanillaButtonWidget().setDisplayString(text).setOnClick((clickData, widget) -> { - String currentText = textField.getText(); - int amount = (int) MathExpression.parseMathExpression(currentText, 1); - amount = Math.min(maxCapacity, Math.max(1, function.apply(amount))); - textField.setText(String.valueOf(amount)); - }).setPos(pos).setSize(size)); + builder.widget( + new VanillaButtonWidget().setDisplayString(text) + .setOnClick((clickData, widget) -> { + String currentText = textField.getText(); + int amount = (int) MathExpression.parseMathExpression(currentText, 1); + amount = Math.min(maxCapacity, Math.max(1, function.apply(amount))); + textField.setText(String.valueOf(amount)); + }) + .setPos(pos) + .setSize(size)); } private ItemStack getCurrentItem() { diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index b1146e8db6..70a89d3c17 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -98,7 +98,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { @Override public String getItemStackDisplayName(ItemStack stack) { - return CombType.valueOf(stack.getItemDamage()).getName(); + return CombType.valueOf(stack.getItemDamage()) + .getName(); } @Override @@ -1597,7 +1598,12 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { null, fluid, 100 * 100, - (fluid.getFluid().getDensity() * 128 > 0 ? (int) (fluid.getFluid().getDensity() * 100) : 128), + (fluid.getFluid() + .getDensity() * 128 > 0 + ? (int) (fluid.getFluid() + .getDensity() + * 100) + : 128), volt.getSimpleEnergy() / 2); } diff --git a/src/main/java/gregtech/common/items/PollenType.java b/src/main/java/gregtech/common/items/PollenType.java index b8cccb70b6..782bed9f64 100644 --- a/src/main/java/gregtech/common/items/PollenType.java +++ b/src/main/java/gregtech/common/items/PollenType.java @@ -25,7 +25,10 @@ public enum PollenType { public String getName() { return GT_LanguageManager.addStringLocalization( "pollen." + this.name, - this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Pollen"); + this.name.substring(0, 1) + .toUpperCase() + + this.name.substring(1) + + " Pollen"); } public int[] getColours() { diff --git a/src/main/java/gregtech/common/items/PropolisType.java b/src/main/java/gregtech/common/items/PropolisType.java index 15f4a2400b..88a1a3faa8 100644 --- a/src/main/java/gregtech/common/items/PropolisType.java +++ b/src/main/java/gregtech/common/items/PropolisType.java @@ -36,7 +36,10 @@ public enum PropolisType { // return "gt.comb."+this.name; return GT_LanguageManager.addStringLocalization( "propolis." + this.name, - this.name.substring(0, 1).toUpperCase() + this.name.substring(1) + " Propolis"); + this.name.substring(0, 1) + .toUpperCase() + + this.name.substring(1) + + " Propolis"); } public int getColours() { diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java index 4a7beb453c..57e0750335 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java @@ -23,8 +23,9 @@ import gregtech.api.util.*; public class Behaviour_Cover_Tool extends Behaviour_None { public static final IItemBehaviour<GT_MetaBase_Item> INSTANCE = new Behaviour_Cover_Tool(); - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.cover_copy_paste", "Can copy/paste cover data."); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.cover_copy_paste", + "Can copy/paste cover data."); private ISerializableObject mStoredData = GregTech_API.sNoBehavior.createDataObject(); private int mCoverType; @@ -113,11 +114,13 @@ public class Behaviour_Cover_Tool extends Behaviour_None { mCoverType = tCoverable.getCoverIDAtSide((byte) tSide); aList.add( "Block Side: " + EnumChatFormatting.AQUA - + ForgeDirection.getOrientation(tSide).name() + + ForgeDirection.getOrientation(tSide) + .name() + EnumChatFormatting.RESET); aList.add( "Cover Type: " + EnumChatFormatting.GREEN - + tCoverable.getCoverItemAtSide((byte) tSide).getDisplayName() + + tCoverable.getCoverItemAtSide((byte) tSide) + .getDisplayName() + EnumChatFormatting.RESET); } else { mStoredData = GregTech_API.sNoBehavior.createDataObject(); diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java index 1dbcd4691d..84b6513563 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java @@ -32,7 +32,8 @@ public class Behaviour_DataStick extends Behaviour_None { aList.add(tString.substring(i, Math.min(i + 64, j))); } } - short sTier = GT_Utility.ItemNBT.getNBT(aStack).getShort("rocket_tier"); + short sTier = GT_Utility.ItemNBT.getNBT(aStack) + .getShort("rocket_tier"); if (sTier > 0 && sTier < 100) { aList.add("Rocket Schematic Tier: " + sTier); } else if (sTier >= 100) { @@ -51,7 +52,8 @@ public class Behaviour_DataStick extends Behaviour_None { } } } - long lastUpdate = GT_Utility.ItemNBT.getNBT(aStack).getLong("lastUpdate"); + long lastUpdate = GT_Utility.ItemNBT.getNBT(aStack) + .getLong("lastUpdate"); if (lastUpdate != 0) aList.add(String.format("Last update at: %tc", lastUpdate)); return aList; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java index 933f30acb7..a66cba699d 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Hoe.java @@ -45,11 +45,14 @@ public class Behaviour_Hoe extends Behaviour_None { Block aBlock = aWorld.getBlock(aX, aY, aZ); if ((aSide != 0) && (GT_Utility.isBlockAir(aWorld, aX, aY + 1, aZ)) && ((aBlock == Blocks.grass) || (aBlock == Blocks.dirt))) { - new WorldSpawnedEventBuilder.SoundEventBuilder() - .setVolume((Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F) - .setPitch(Blocks.farmland.stepSound.getPitch() * 0.8F) - .setIdentifier(Blocks.farmland.stepSound.getStepResourcePath()) - .setPosition(aX + 0.5F, aY + 0.5F, aZ + 0.5F).setWorld(aWorld).run(); + new WorldSpawnedEventBuilder.SoundEventBuilder().setVolume( + (Blocks.farmland.stepSound.getVolume() + 1.0F) / 2.0F) + .setPitch(Blocks.farmland.stepSound.getPitch() * 0.8F) + .setIdentifier( + Blocks.farmland.stepSound.getStepResourcePath()) + .setPosition(aX + 0.5F, aY + 0.5F, aZ + 0.5F) + .setWorld(aWorld) + .run(); if (aWorld.isRemote) { return true; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java index b1357a0777..1e232d4988 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java @@ -24,12 +24,15 @@ public class Behaviour_Lighter extends Behaviour_None { private final ItemStack mUsedLighter; private final ItemStack mFullLighter; private final long mFuelAmount; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.lighter.tooltip", "Can light things on Fire"); - private final String mTooltipUses = GT_LanguageManager - .addStringLocalization("gt.behaviour.lighter.uses", "Remaining Uses:"); - private final String mTooltipUnstackable = GT_LanguageManager - .addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.lighter.tooltip", + "Can light things on Fire"); + private final String mTooltipUses = GT_LanguageManager.addStringLocalization( + "gt.behaviour.lighter.uses", + "Remaining Uses:"); + private final String mTooltipUnstackable = GT_LanguageManager.addStringLocalization( + "gt.behaviour.unstackable", + "Not usable when stacked!"); public Behaviour_Lighter(ItemStack aEmptyLighter, ItemStack aUsedLighter, ItemStack aFullLighter, long aFuelAmount) { diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Essentia.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Essentia.java index c164695c36..0023511846 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Essentia.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Essentia.java @@ -18,8 +18,9 @@ import gregtech.api.util.GT_Utility; public class Behaviour_Plunger_Essentia extends Behaviour_None { private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.plunger.essentia", "Clears Essentia from Containers and Tubes"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.plunger.essentia", + "Clears Essentia from Containers and Tubes"); public Behaviour_Plunger_Essentia(int aCosts) { this.mCosts = aCosts; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java index e0d0f91e48..737caf9f5b 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java @@ -21,8 +21,9 @@ import gregtech.api.util.GT_Utility; public class Behaviour_Plunger_Fluid extends Behaviour_None { private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.plunger.fluid", "Clears 1000 Liters of Fluid from Tanks"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.plunger.fluid", + "Clears 1000 Liters of Fluid from Tanks"); public Behaviour_Plunger_Fluid(int aCosts) { this.mCosts = aCosts; @@ -61,8 +62,14 @@ public class Behaviour_Plunger_Fluid extends Behaviour_None { GT_MetaTileEntity_BasicTank machine = (GT_MetaTileEntity_BasicTank) mTileEntity; if (machine.mFluid != null && machine.mFluid.amount > 0) machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, 1000); - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); return true; } } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java index 1aeafc62fe..e4f0c3012d 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Item.java @@ -21,8 +21,9 @@ import gregtech.api.util.GT_Utility; public class Behaviour_Plunger_Item extends Behaviour_None { private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.plunger.item", "Clears Items from Pipes"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.plunger.item", + "Clears Items from Pipes"); public Behaviour_Plunger_Item(int aCosts) { this.mCosts = aCosts; @@ -39,9 +40,13 @@ public class Behaviour_Plunger_Item extends Behaviour_None { IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) aTileEntity).getMetaTileEntity(); if ((tMetaTileEntity instanceof IMetaTileEntityItemPipe)) { for (IMetaTileEntityItemPipe tTileEntity : GT_Utility.sortMapByValuesAcending( - IMetaTileEntityItemPipe.Util - .scanPipes((IMetaTileEntityItemPipe) tMetaTileEntity, new HashMap<>(), 0L, false, true)) - .keySet()) { + IMetaTileEntityItemPipe.Util.scanPipes( + (IMetaTileEntityItemPipe) tMetaTileEntity, + new HashMap<>(), + 0L, + false, + true)) + .keySet()) { int i = 0; for (int j = tTileEntity.getSizeInventory(); i < j; i++) { if (tTileEntity.isValidSlot(i)) { diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java index 1374a33f7d..c007473df1 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java @@ -31,8 +31,9 @@ public class Behaviour_Prospecting extends Behaviour_None { private final int mVanillaCosts; private final int mEUCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.prospecting", "Usable for Prospecting"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.prospecting", + "Usable for Prospecting"); public Behaviour_Prospecting(int aVanillaCosts, int aEUCosts) { this.mVanillaCosts = aVanillaCosts; @@ -54,7 +55,8 @@ public class Behaviour_Prospecting extends Behaviour_None { ItemData tAssociation = GT_OreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta)); if (tAssociation != null && tAssociation.mPrefix != null && tAssociation.mMaterial != null - && tAssociation.mPrefix.toString().startsWith("ore")) { + && tAssociation.mPrefix.toString() + .startsWith("ore")) { GT_Utility.sendChatToPlayer( aPlayer, GT_Utility.trans("100", "This is ") + tAssociation.mMaterial.mMaterial.mDefaultLocalName @@ -85,8 +87,9 @@ public class Behaviour_Prospecting extends Behaviour_None { tBlock = aWorld.getBlock(tX, tY, tZ); if (tBlock == Blocks.lava || tBlock == Blocks.flowing_lava) { - GT_Utility - .sendChatToPlayer(aPlayer, GT_Utility.trans("102", "There is Lava behind this Rock.")); + GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("102", "There is Lava behind this Rock.")); break; } if (tBlock instanceof BlockLiquid || tBlock instanceof IFluidBlock) { @@ -133,7 +136,8 @@ public class Behaviour_Prospecting extends Behaviour_None { tAssociation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); if (tAssociation != null && tAssociation.mPrefix != null && tAssociation.mMaterial != null - && tAssociation.mPrefix.toString().startsWith("ore")) { + && tAssociation.mPrefix.toString() + .startsWith("ore")) { GT_Utility.sendChatToPlayer( aPlayer, GT_Utility.trans("106", "Found traces of ") diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java index ad8d99f6fb..d82585184d 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scanner.java @@ -19,8 +19,9 @@ import gregtech.api.util.GT_Utility; public class Behaviour_Scanner extends Behaviour_None { public static final IItemBehaviour<GT_MetaBase_Item> INSTANCE = new Behaviour_Scanner(); - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.scanning", "Can scan Blocks in World"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.scanning", + "Can scan Blocks in World"); @Override public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java index 83d5ffffa3..51723469d6 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java @@ -17,8 +17,9 @@ import gregtech.api.util.GT_LanguageManager; public class Behaviour_Scoop extends Behaviour_None { private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.scoop", "Catches Butterflies on Leftclick"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.scoop", + "Catches Butterflies on Leftclick"); public Behaviour_Scoop(int aCosts) { this.mCosts = aCosts; @@ -33,18 +34,23 @@ public class Behaviour_Scoop extends Behaviour_None { if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { Object tButterfly = ((IEntityButterfly) aEntity).getButterfly(); - ((IButterfly) tButterfly).getGenome().getPrimary().getRoot() - .getBreedingTracker(aEntity.worldObj, aPlayer.getGameProfile()) - .registerCatch((IButterfly) tButterfly); + ((IButterfly) tButterfly).getGenome() + .getPrimary() + .getRoot() + .getBreedingTracker(aEntity.worldObj, aPlayer.getGameProfile()) + .registerCatch((IButterfly) tButterfly); aPlayer.worldObj.spawnEntityInWorld( new EntityItem( aPlayer.worldObj, aEntity.posX, aEntity.posY, aEntity.posZ, - ((IButterfly) tButterfly).getGenome().getPrimary().getRoot().getMemberStack( - ((IButterfly) tButterfly).copy(), - EnumFlutterType.BUTTERFLY.ordinal()))); + ((IButterfly) tButterfly).getGenome() + .getPrimary() + .getRoot() + .getMemberStack( + ((IButterfly) tButterfly).copy(), + EnumFlutterType.BUTTERFLY.ordinal()))); aEntity.setDead(); } return true; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java index 75b4d9e431..949b57e581 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java @@ -15,8 +15,9 @@ import ic2.api.crops.ICropTile; public class Behaviour_Sense extends Behaviour_None { private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.sense", "Rightclick to harvest Crop Sticks"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.sense", + "Rightclick to harvest Crop Sticks"); public Behaviour_Sense(int aCosts) { this.mCosts = aCosts; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_SoftHammer.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_SoftHammer.java index 7c5780c42d..75f3afb4fc 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_SoftHammer.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_SoftHammer.java @@ -17,8 +17,9 @@ import gregtech.api.util.GT_Utility; public class Behaviour_SoftHammer extends Behaviour_None { private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.softhammer", "Activates and Deactivates Machines"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.softhammer", + "Activates and Deactivates Machines"); public Behaviour_SoftHammer(int aCosts) { this.mCosts = aCosts; @@ -41,8 +42,14 @@ public class Behaviour_SoftHammer extends Behaviour_None { aWorld.isRemote = true; aWorld.setBlock(aX, aY, aZ, Blocks.redstone_lamp, 0, 0); aWorld.isRemote = false; - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); } return true; } @@ -52,8 +59,14 @@ public class Behaviour_SoftHammer extends Behaviour_None { aWorld.isRemote = true; aWorld.setBlock(aX, aY, aZ, Blocks.lit_redstone_lamp, 0, 0); aWorld.isRemote = false; - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); } return true; } @@ -63,8 +76,14 @@ public class Behaviour_SoftHammer extends Behaviour_None { aWorld.isRemote = true; aWorld.setBlock(aX, aY, aZ, aBlock, (aMeta + 8) % 16, 0); aWorld.isRemote = false; - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); } return true; } @@ -74,8 +93,14 @@ public class Behaviour_SoftHammer extends Behaviour_None { aWorld.isRemote = true; aWorld.setBlock(aX, aY, aZ, aBlock, (aMeta + 8) % 16, 0); aWorld.isRemote = false; - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); } return true; } @@ -92,8 +117,14 @@ public class Behaviour_SoftHammer extends Behaviour_None { if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 1) % 6, 3); - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); } return true; } @@ -105,8 +136,14 @@ public class Behaviour_SoftHammer extends Behaviour_None { if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta - 1) % 4 + 2, 3); - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); } return true; } @@ -114,8 +151,14 @@ public class Behaviour_SoftHammer extends Behaviour_None { if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 1) % 6 != 1 ? (aMeta + 1) % 6 : 2, 3); - GT_Utility - .sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1.0F, aX, aY, aZ); + GT_Utility.sendSoundToPlayers( + aWorld, + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, + 1.0F, + -1.0F, + aX, + aY, + aZ); } return true; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java index f5b4615a21..3365d44d11 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java @@ -37,10 +37,12 @@ public class Behaviour_Spray_Color extends Behaviour_None { Blocks.hardened_clay, ItemList.TE_Rockwool.getBlock()); private final String mTooltip; - private final String mTooltipUses = GT_LanguageManager - .addStringLocalization("gt.behaviour.paintspray.uses", "Remaining Uses:"); - private final String mTooltipUnstackable = GT_LanguageManager - .addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!"); + private final String mTooltipUses = GT_LanguageManager.addStringLocalization( + "gt.behaviour.paintspray.uses", + "Remaining Uses:"); + private final String mTooltipUnstackable = GT_LanguageManager.addStringLocalization( + "gt.behaviour.unstackable", + "Not usable when stacked!"); public Behaviour_Spray_Color(ItemStack aEmpty, ItemStack aUsed, ItemStack aFull, long aUses, int aColor) { this.mEmpty = aEmpty; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java index 64d2660c53..a04593a1b8 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Wrench.java @@ -23,8 +23,9 @@ import ic2.api.tile.IWrenchable; public class Behaviour_Wrench extends Behaviour_None { private final int mCosts; - private final String mTooltip = GT_LanguageManager - .addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick"); + private final String mTooltip = GT_LanguageManager.addStringLocalization( + "gt.behaviour.wrench", + "Rotates Blocks on Rightclick"); public Behaviour_Wrench(int aCosts) { this.mCosts = aCosts; @@ -165,7 +166,7 @@ public class Behaviour_Wrench extends Behaviour_None { } } if ((Arrays.asList(aBlock.getValidRotations(aWorld, aX, aY, aZ)) - .contains(ForgeDirection.getOrientation(aTargetSide))) + .contains(ForgeDirection.getOrientation(aTargetSide))) && ((aPlayer.capabilities.isCreativeMode) || (!GT_ModHandler.isElectricItem(aStack)) || (GT_ModHandler.canUseElectricItem(aStack, this.mCosts))) && (aBlock.rotateBlock(aWorld, aX, aY, aZ, ForgeDirection.getOrientation(aTargetSide)))) { diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_WrittenBook.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_WrittenBook.java index 947442ad8e..65ba5199ee 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_WrittenBook.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_WrittenBook.java @@ -22,7 +22,8 @@ public class Behaviour_WrittenBook extends Behaviour_None { int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) { if ((GT_Utility.isStringValid(GT_Utility.ItemNBT.getBookTitle(aStack))) && ((aPlayer instanceof EntityPlayerSP))) { - Minecraft.getMinecraft().displayGuiScreen(new GuiScreenBook(aPlayer, aStack, false)); + Minecraft.getMinecraft() + .displayGuiScreen(new GuiScreenBook(aPlayer, aStack, false)); } return true; } diff --git a/src/main/java/gregtech/common/misc/GT_Command.java b/src/main/java/gregtech/common/misc/GT_Command.java index c2af60523d..66b77b2c87 100644 --- a/src/main/java/gregtech/common/misc/GT_Command.java +++ b/src/main/java/gregtech/common/misc/GT_Command.java @@ -101,14 +101,16 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner public List addTabCompletionOptions(ICommandSender sender, String[] ss) { List<String> l = new ArrayList<>(); String test = ss.length == 0 ? "" : ss[0].trim(); - if (ss.length == 0 || ss.length == 1 && (test.isEmpty() || Stream.of( - "toggle", - "chunks", - "pollution", - "global_energy_add", - "global_energy_set", - "global_energy_join", - "global_energy_display").anyMatch(s -> s.startsWith(test)))) { + if (ss.length == 0 || ss.length == 1 && (test.isEmpty() || Stream + .of( + "toggle", + "chunks", + "pollution", + "global_energy_add", + "global_energy_set", + "global_energy_join", + "global_energy_display") + .anyMatch(s -> s.startsWith(test)))) { Stream.of( "toggle", "chunks", @@ -116,7 +118,9 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner "global_energy_add", "global_energy_set", "global_energy_join", - "global_energy_display").filter(s -> test.isEmpty() || s.startsWith(test)).forEach(l::add); + "global_energy_display") + .filter(s -> test.isEmpty() || s.startsWith(test)) + .forEach(l::add); } else if (test.equals("toggle")) { String test1 = ss[1].trim(); Stream.of( @@ -133,7 +137,9 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner "debugStones", "debugChunkloaders", "debugMulti", - "debugWorldData").filter(s -> test1.isEmpty() || s.startsWith(test1)).forEach(l::add); + "debugWorldData") + .filter(s -> test1.isEmpty() || s.startsWith(test1)) + .forEach(l::add); } return l; } @@ -178,7 +184,8 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner int amount = (strings.length < 2) ? GT_Mod.gregtechproxy.mPollutionSmogLimit : Integer.parseInt(strings[1]); GT_Pollution.addPollution( - sender.getEntityWorld().getChunkFromBlockCoords(coordinates.posX, coordinates.posZ), + sender.getEntityWorld() + .getChunkFromBlockCoords(coordinates.posX, coordinates.posZ), amount); break; case "global_energy_add": { diff --git a/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java b/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java index 9edee98725..6de4de3c71 100644 --- a/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java +++ b/src/main/java/gregtech/common/misc/GT_DrillingLogicDelegate.java @@ -22,8 +22,8 @@ public class GT_DrillingLogicDelegate { public static final ItemStack MINING_PIPE_STACK = GT_ModHandler.getIC2Item("miningPipe", 0); public static final Block MINING_PIPE_BLOCK = GT_Utility.getBlockFromStack(MINING_PIPE_STACK); - public static final Block MINING_PIPE_TIP_BLOCK = GT_Utility - .getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 0)); + public static final Block MINING_PIPE_TIP_BLOCK = GT_Utility.getBlockFromStack( + GT_ModHandler.getIC2Item("miningPipeTip", 0)); /** The owner machine pointer */ private final GT_IDrillingLogicDelegateOwner owner; @@ -74,7 +74,8 @@ public class GT_DrillingLogicDelegate { // Replace the tip onto pipe if (te.getBlockOffset(0, tipDepth, 0) == MINING_PIPE_TIP_BLOCK) { - te.getWorld().setBlock(xCoord, yCoord + tipDepth, zCoord, MINING_PIPE_BLOCK); + te.getWorld() + .setBlock(xCoord, yCoord + tipDepth, zCoord, MINING_PIPE_BLOCK); } // Get and decrease pipe from the machine boolean pipeTaken = owner.pullInputs(MINING_PIPE_STACK.getItem(), 1, false); @@ -91,7 +92,8 @@ public class GT_DrillingLogicDelegate { } // Descent the pipe tip - te.getWorld().setBlock(xCoord, yCoord + tipDepth - 1, zCoord, MINING_PIPE_TIP_BLOCK); + te.getWorld() + .setBlock(xCoord, yCoord + tipDepth - 1, zCoord, MINING_PIPE_TIP_BLOCK); tipDepth--; return true; } @@ -140,16 +142,19 @@ public class GT_DrillingLogicDelegate { int actualDrillY = yCoord + tipDepth; // Move the pipe tip position if (actualDrillY < yCoord - 1) { - owner.getBaseMetaTileEntity().getWorld().setBlock(xCoord, actualDrillY + 1, zCoord, MINING_PIPE_TIP_BLOCK); + owner.getBaseMetaTileEntity() + .getWorld() + .setBlock(xCoord, actualDrillY + 1, zCoord, MINING_PIPE_TIP_BLOCK); } // Remove the old pipe tip - aBaseMetaTileEntity.getWorld().setBlock( - xCoord, - actualDrillY, - zCoord, - Blocks.air, - 0, - /* send to client without neighbour updates */ 2); + aBaseMetaTileEntity.getWorld() + .setBlock( + xCoord, + actualDrillY, + zCoord, + Blocks.air, + 0, + /* send to client without neighbour updates */ 2); // Return the pipe back to the machine (inputs allowed for this case!) owner.pushOutputs(MINING_PIPE_STACK, 1, false, true); @@ -177,19 +182,21 @@ public class GT_DrillingLogicDelegate { } short metaData = 0; - TileEntity tTileEntity = owner.getBaseMetaTileEntity().getTileEntity(x, y, z); + TileEntity tTileEntity = owner.getBaseMetaTileEntity() + .getTileEntity(x, y, z); if (tTileEntity instanceof GT_TileEntity_Ores) { metaData = ((GT_TileEntity_Ores) tTileEntity).mMetaData; } ItemStack cobble = GT_Utility.getCobbleForOre(block, metaData); - te.getWorld().setBlock( - x, - y, - z, - Block.getBlockFromItem(cobble.getItem()), - cobble.getItemDamage(), /* cause updates(1) + send to client(2) */ - 3); + te.getWorld() + .setBlock( + x, + y, + z, + Block.getBlockFromItem(cobble.getItem()), + cobble.getItemDamage(), /* cause updates(1) + send to client(2) */ + 3); } /** @@ -231,18 +238,26 @@ public class GT_DrillingLogicDelegate { } public boolean canFakePlayerInteract(IGregTechTileEntity te, int xCoord, int yCoord, int zCoord) { - return GT_Utility - .setBlockByFakePlayer(getFakePlayer(te), xCoord, yCoord, zCoord, MINING_PIPE_TIP_BLOCK, 0, true); + return GT_Utility.setBlockByFakePlayer( + getFakePlayer(te), + xCoord, + yCoord, + zCoord, + MINING_PIPE_TIP_BLOCK, + 0, + true); } /** Get target block drops. We need to encapsulate everyting of mining in this class. */ private List<ItemStack> getBlockDrops(final Block oreBlock, int posX, int posY, int posZ) { return oreBlock.getDrops( - owner.getBaseMetaTileEntity().getWorld(), + owner.getBaseMetaTileEntity() + .getWorld(), posX, posY, posZ, - owner.getBaseMetaTileEntity().getMetaID(posX, posY, posZ), + owner.getBaseMetaTileEntity() + .getMetaID(posX, posY, posZ), owner.getMachineTier()); } diff --git a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java index 81c7fac375..db7b811a1d 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java @@ -103,11 +103,12 @@ public class SpaceProjectManager { public static void putInTeam(UUID teamMember, UUID teamLeader) { if (teamMember.equals(teamLeader)) { spaceTeams.put(teamMember, teamLeader); - } else if (!spaceTeams.get(teamLeader).equals(teamLeader)) { - putInTeam(teamMember, spaceTeams.get(teamLeader)); - } else { - spaceTeams.put(teamMember, teamLeader); - } + } else if (!spaceTeams.get(teamLeader) + .equals(teamLeader)) { + putInTeam(teamMember, spaceTeams.get(teamLeader)); + } else { + spaceTeams.put(teamMember, teamLeader); + } SpaceProjectWorldSavedData.INSTANCE.markDirty(); } @@ -264,14 +265,20 @@ public class SpaceProjectManager { * Gets the UUID using the player's username */ public static UUID getPlayerUUIDFromName(String playerName) { - return MinecraftServer.getServer().func_152358_ax().func_152655_a(playerName).getId(); + return MinecraftServer.getServer() + .func_152358_ax() + .func_152655_a(playerName) + .getId(); } /** * Gets the player's name using their UUID */ public static String getPlayerNameFromUUID(UUID playerUUID) { - return MinecraftServer.getServer().func_152358_ax().func_152652_a(playerUUID).getName(); + return MinecraftServer.getServer() + .func_152358_ax() + .func_152652_a(playerUUID) + .getName(); } // #endregion diff --git a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java index 23a7b7bbb1..a70d1b5843 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectWorldSavedData.java @@ -50,16 +50,34 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { public static SpaceProjectWorldSavedData INSTANCE; - private static final Gson GSON_SPACE_PROJECT = new GsonBuilder().serializeNulls().enableComplexMapKeySerialization() - .registerTypeAdapter(spaceTeamProjects.getClass(), new SpaceTeamProjectsMapAdapter()) - .registerTypeAdapter(Map.class, new SpaceTeamProjectsMapAdapter()) - .registerTypeAdapter(Pair.of((ISpaceBody) SolarSystem.Ariel, "").getClass(), new PairAdapter()) - .registerTypeAdapter(Pair.class, new PairAdapter()) - .registerTypeAdapter(ISpaceProject.class, new SpaceProjectAdapter()) - .registerTypeAdapter(ISP_Upgrade.class, new SP_UpgradeAdapter()) - .registerTypeHierarchyAdapter(ISpaceProject.class, new SpaceProjectAdapter()) - .registerTypeHierarchyAdapter(ISP_Upgrade.class, new SP_UpgradeAdapter()).create(); - private static final Gson GSON_TEAMS = new GsonBuilder().serializeNulls().create(); + private static final Gson GSON_SPACE_PROJECT = new GsonBuilder().serializeNulls() + .enableComplexMapKeySerialization() + .registerTypeAdapter( + spaceTeamProjects.getClass(), + new SpaceTeamProjectsMapAdapter()) + .registerTypeAdapter( + Map.class, + new SpaceTeamProjectsMapAdapter()) + .registerTypeAdapter( + Pair.of((ISpaceBody) SolarSystem.Ariel, "") + .getClass(), + new PairAdapter()) + .registerTypeAdapter(Pair.class, new PairAdapter()) + .registerTypeAdapter( + ISpaceProject.class, + new SpaceProjectAdapter()) + .registerTypeAdapter( + ISP_Upgrade.class, + new SP_UpgradeAdapter()) + .registerTypeHierarchyAdapter( + ISpaceProject.class, + new SpaceProjectAdapter()) + .registerTypeHierarchyAdapter( + ISP_Upgrade.class, + new SP_UpgradeAdapter()) + .create(); + private static final Gson GSON_TEAMS = new GsonBuilder().serializeNulls() + .create(); private static final String DATA_NAME = "GT_SpaceProjectData"; @@ -127,8 +145,14 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { } else { spaceTeams = new HashMap<>(); } - spaceTeamsFile = new File(aWorld.getSaveHandler().getWorldDirectory(), SPACE_TEAMS_JSON); - teamProjectsFile = new File(aWorld.getSaveHandler().getWorldDirectory(), SPACE_TEAM_PROJECTS_JSON); + spaceTeamsFile = new File( + aWorld.getSaveHandler() + .getWorldDirectory(), + SPACE_TEAMS_JSON); + teamProjectsFile = new File( + aWorld.getSaveHandler() + .getWorldDirectory(), + SPACE_TEAM_PROJECTS_JSON); MapStorage tStorage = aWorld.mapStorage; INSTANCE = (SpaceProjectWorldSavedData) tStorage.loadData(SpaceProjectWorldSavedData.class, DATA_NAME); if (INSTANCE == null) { @@ -151,7 +175,10 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { @Override public JsonElement serialize(Pair<ISpaceBody, String> src, Type typeOfSrc, JsonSerializationContext context) { JsonObject pair = new JsonObject(); - pair.addProperty(PAIR_LEFT, src.getLeft().getName()); + pair.addProperty( + PAIR_LEFT, + src.getLeft() + .getName()); pair.addProperty(PAIR_RIGHT, src.getRight()); return pair; } @@ -163,8 +190,11 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { if (json.isJsonObject()) { JsonObject obj = json.getAsJsonObject(); pair = Pair.of( - SpaceProjectManager.getLocation(obj.get(PAIR_LEFT).getAsString()), - obj.get(PAIR_RIGHT).getAsString()); + SpaceProjectManager.getLocation( + obj.get(PAIR_LEFT) + .getAsString()), + obj.get(PAIR_RIGHT) + .getAsString()); } return pair; } @@ -177,7 +207,10 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { JsonObject obj = new JsonObject(); obj.addProperty(PROJECT_NAME, src.getProjectName()); obj.addProperty(PROJECT_CURRENT_STAGE, src.getCurrentStage()); - obj.addProperty(PROJECT_LOCATION, src.getProjectLocation().getName()); + obj.addProperty( + PROJECT_LOCATION, + src.getProjectLocation() + .getName()); obj.add(PROJECT_CURRENT_UPGRADE, context.serialize(src.getUpgradeBeingBuilt())); obj.add(PROJECT_UPGRADES_BUILT, context.serialize(src.getAllBuiltUpgrades())); return obj; @@ -190,15 +223,21 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { return null; } JsonObject obj = json.getAsJsonObject(); - String projectName = obj.get(PROJECT_NAME).getAsString(); + String projectName = obj.get(PROJECT_NAME) + .getAsString(); ISpaceProject project = SpaceProjectManager.getProject(projectName); - int projectCurrentStage = obj.get(PROJECT_CURRENT_STAGE).getAsInt(); + int projectCurrentStage = obj.get(PROJECT_CURRENT_STAGE) + .getAsInt(); ISP_Upgrade[] projectUpgradesBuilt = new ISP_Upgrade[0]; - projectUpgradesBuilt = context - .deserialize(obj.get(PROJECT_UPGRADES_BUILT), projectUpgradesBuilt.getClass()); - ISP_Upgrade projectCurrentUpgrade = context - .deserialize(obj.get(PROJECT_CURRENT_UPGRADE), ISP_Upgrade.class); - ISpaceBody projectLocation = SpaceProjectManager.getLocation(obj.get(PROJECT_LOCATION).getAsString()); + projectUpgradesBuilt = context.deserialize( + obj.get(PROJECT_UPGRADES_BUILT), + projectUpgradesBuilt.getClass()); + ISP_Upgrade projectCurrentUpgrade = context.deserialize( + obj.get(PROJECT_CURRENT_UPGRADE), + ISP_Upgrade.class); + ISpaceBody projectLocation = SpaceProjectManager.getLocation( + obj.get(PROJECT_LOCATION) + .getAsString()); project.setBuiltUpgrade(projectUpgradesBuilt); project.setProjectLocation(projectLocation); project.setProjectCurrentStage(projectCurrentStage); @@ -213,7 +252,10 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { public JsonElement serialize(ISP_Upgrade src, Type typeOfSrc, JsonSerializationContext context) { JsonObject obj = new JsonObject(); obj.addProperty(UPGRADE_NAME, src.getUpgradeName()); - obj.addProperty(UPGRADE_PROJECT_PARENT, src.getParentProject().getProjectName()); + obj.addProperty( + UPGRADE_PROJECT_PARENT, + src.getParentProject() + .getProjectName()); obj.addProperty(UPGRADE_CURRENT_STAGE, src.getCurrentStage()); return obj; } @@ -225,14 +267,19 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { return null; } JsonObject obj = json.getAsJsonObject(); - String projectName = obj.get(UPGRADE_PROJECT_PARENT).getAsString(); + String projectName = obj.get(UPGRADE_PROJECT_PARENT) + .getAsString(); ISpaceProject project = SpaceProjectManager.getProject(projectName); - ISP_Upgrade upgrade = project.getUpgrade(obj.get(UPGRADE_NAME).getAsString()); + ISP_Upgrade upgrade = project.getUpgrade( + obj.get(UPGRADE_NAME) + .getAsString()); if (upgrade == null) { return null; } upgrade = upgrade.copy(); - upgrade.setUpgradeCurrentStage(obj.get(UPGRADE_CURRENT_STAGE).getAsInt()); + upgrade.setUpgradeCurrentStage( + obj.get(UPGRADE_CURRENT_STAGE) + .getAsInt()); return upgrade; } } @@ -249,7 +296,8 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { JsonObject teamMap = new JsonObject(); teamMap.add(MAP_UUID, context.serialize(firstEntry.getKey())); JsonArray teamProjectMap = new JsonArray(); - for (Entry<Pair<ISpaceBody, String>, ISpaceProject> secondEntry : firstEntry.getValue().entrySet()) { + for (Entry<Pair<ISpaceBody, String>, ISpaceProject> secondEntry : firstEntry.getValue() + .entrySet()) { JsonObject projectMap = new JsonObject(); projectMap.add(MAP_PAIR, context.serialize(secondEntry.getKey())); projectMap.add(MAP_PROJECT, context.serialize(secondEntry.getValue())); @@ -270,7 +318,8 @@ public class SpaceProjectWorldSavedData extends WorldSavedData { JsonObject teamMap = teamMapElement.getAsJsonObject(); UUID uuid = context.deserialize(teamMap.get(MAP_UUID), UUID.class); Map<Pair<ISpaceBody, String>, ISpaceProject> projectMap = new HashMap<>(); - for (JsonElement teamProjectMapElement : teamMap.get(MAP_MAP).getAsJsonArray()) { + for (JsonElement teamProjectMapElement : teamMap.get(MAP_MAP) + .getAsJsonArray()) { JsonObject teamProjectMap = teamProjectMapElement.getAsJsonObject(); Pair<ISpaceBody, String> pair = context.deserialize(teamProjectMap.get(MAP_PAIR), Pair.class); ISpaceProject project = context.deserialize(teamProjectMap.get(MAP_PROJECT), ISpaceProject.class); diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java index 18540c429a..a4b8d5aa5b 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Upgrade.java @@ -294,14 +294,21 @@ public class SP_Upgrade implements ISP_Upgrade { return true; } - if (requirements.getBodyType() != null && !requirements.getBodyType().equals(SpaceBodyType.NONE)) { - if (!requirements.getBodyType().equals(projectBelongingTo.getProjectLocation().getType())) { + if (requirements.getBodyType() != null && !requirements.getBodyType() + .equals(SpaceBodyType.NONE)) { + if (!requirements.getBodyType() + .equals( + projectBelongingTo.getProjectLocation() + .getType())) { return false; } } if (requirements.getStarType() != null) { - if (!requirements.getStarType().equals(projectBelongingTo.getProjectLocation().getStarType())) { + if (!requirements.getStarType() + .equals( + projectBelongingTo.getProjectLocation() + .getStarType())) { return false; } } @@ -327,9 +334,14 @@ public class SP_Upgrade implements ISP_Upgrade { @Override public SP_Upgrade copy() { - SP_Upgrade copy = new SP_Upgrade().setUpgradeName(name).setUpgradeUnlocalizedName(unlocalizedName) - .setUpgradeBuildTime(buildTime).setUpgradeFluidsCost(fluidsCost).setUpgradeItemsCost(itemsCost) - .setUpgradeRequirements(requirements).setUpgradeTotalStages(totalStages).setUpgradeVoltage(voltage); + SP_Upgrade copy = new SP_Upgrade().setUpgradeName(name) + .setUpgradeUnlocalizedName(unlocalizedName) + .setUpgradeBuildTime(buildTime) + .setUpgradeFluidsCost(fluidsCost) + .setUpgradeItemsCost(itemsCost) + .setUpgradeRequirements(requirements) + .setUpgradeTotalStages(totalStages) + .setUpgradeVoltage(voltage); return copy; } diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java index 0095ece5b1..dfbcf96dc6 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SpaceProject.java @@ -368,10 +368,15 @@ public class SpaceProject implements ISpaceProject { @Override public ISpaceProject copy() { - SpaceProject copy = new SpaceProject().setProjectName(name).setProjectUnlocalizedName(unlocalizedName) - .setProjectVoltage(voltage).setProjectBuildTime(buildTime).setProjectItemsCost(itemsCost) - .setProjectFluidsCost(fluidsCost).setProjectStages(totalStage).setProjectTexture(texture) - .setProjectRequirements(requirements); + SpaceProject copy = new SpaceProject().setProjectName(name) + .setProjectUnlocalizedName(unlocalizedName) + .setProjectVoltage(voltage) + .setProjectBuildTime(buildTime) + .setProjectItemsCost(itemsCost) + .setProjectFluidsCost(fluidsCost) + .setProjectStages(totalStage) + .setProjectTexture(texture) + .setProjectRequirements(requirements); if (upgradesAvailable != null) { ISP_Upgrade[] upgrades = new SP_Upgrade[upgradesAvailable.size()]; int index = 0; @@ -400,13 +405,15 @@ public class SpaceProject implements ISpaceProject { } if (requirements.getBodyType() != null && checkLocation) { - if (!requirements.getBodyType().equals(location.getType())) { + if (!requirements.getBodyType() + .equals(location.getType())) { return false; } } if (requirements.getStarType() != null && checkLocation) { - if (!requirements.getStarType().equals(location.getStarType())) { + if (!requirements.getStarType() + .equals(location.getStarType())) { return false; } } diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java index 8a54c40e70..6bd2561d68 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java @@ -152,20 +152,25 @@ public class SPM_Command extends CommandBase { break; } String finalFilter = filter; - return autoComplete.stream().filter(s -> finalFilter.isEmpty() || s.startsWith(finalFilter)) - .collect(Collectors.toList()); + return autoComplete.stream() + .filter(s -> finalFilter.isEmpty() || s.startsWith(finalFilter)) + .collect(Collectors.toList()); } private String[] getPlayers() { - return MinecraftServer.getServer().getAllUsernames(); + return MinecraftServer.getServer() + .getAllUsernames(); } private String[] getLocations() { - return SpaceProjectManager.getLocationNames().toArray(new String[0]); + return SpaceProjectManager.getLocationNames() + .toArray(new String[0]); } private String[] getProjects() { - return SpaceProjectManager.getProjectsMap().keySet().toArray(new String[0]); + return SpaceProjectManager.getProjectsMap() + .keySet() + .toArray(new String[0]); } private String[] getSubCommands() { @@ -204,7 +209,8 @@ public class SPM_Command extends CommandBase { UUID tID = SpaceProjectManager.getPlayerUUIDFromName(playerName); switch (argument) { case ALL: - for (String project : SpaceProjectManager.getProjectsMap().keySet()) { + for (String project : SpaceProjectManager.getProjectsMap() + .keySet()) { sender.addChatMessage(new ChatComponentText(project)); } break; diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java index ba673640c2..8ef301b6ba 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java @@ -19,8 +19,8 @@ import gregtech.common.misc.spaceprojects.SpaceProjectManager; */ public class SP_Command extends CommandBase { - private static Set<Pair<EntityPlayerMP, EntityPlayerMP>> invite = Collections - .newSetFromMap(new WeakHashMap<Pair<EntityPlayerMP, EntityPlayerMP>, Boolean>()); + private static Set<Pair<EntityPlayerMP, EntityPlayerMP>> invite = Collections.newSetFromMap( + new WeakHashMap<Pair<EntityPlayerMP, EntityPlayerMP>, Boolean>()); private static Set<EntityPlayerMP> confirm = Collections.newSetFromMap(new WeakHashMap<EntityPlayerMP, Boolean>()); private static final String INVITE = "invite"; diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java index a8421d089b..cac5263454 100644 --- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java +++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java @@ -46,8 +46,9 @@ public class GT_Circuit_Randomizer extends GT_CircuitryBehavior { } if (aCircuitData[4] >= aCircuitData[0]) { aCircuitData[4] = 0; - aRedstoneCircuitBlock - .setRedstone((byte) aRedstoneCircuitBlock.getRandom(16), aRedstoneCircuitBlock.getOutputFacing()); + aRedstoneCircuitBlock.setRedstone( + (byte) aRedstoneCircuitBlock.getRandom(16), + aRedstoneCircuitBlock.getOutputFacing()); } } diff --git a/src/main/java/gregtech/common/render/GT_CapeRenderer.java b/src/main/java/gregtech/common/render/GT_CapeRenderer.java index 274a914b67..6254a9df79 100644 --- a/src/main/java/gregtech/common/render/GT_CapeRenderer.java +++ b/src/main/java/gregtech/common/render/GT_CapeRenderer.java @@ -50,34 +50,51 @@ public class GT_CapeRenderer extends RenderPlayer { } try { ResourceLocation tResource = aPlayer.getLocationCape(); - if (aPlayer.getDisplayName().equalsIgnoreCase("Friedi4321")) { + if (aPlayer.getDisplayName() + .equalsIgnoreCase("Friedi4321")) { tResource = this.mCapes[0]; } - if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase())) { + if (this.mCapeList.contains( + aPlayer.getDisplayName() + .toLowerCase())) { tResource = this.mCapes[1]; } - if (aPlayer.getDisplayName().equalsIgnoreCase("Mr_Brain")) { + if (aPlayer.getDisplayName() + .equalsIgnoreCase("Mr_Brain")) { tResource = this.mCapes[2]; } - if (aPlayer.getDisplayName().equalsIgnoreCase("GregoriusT")) { + if (aPlayer.getDisplayName() + .equalsIgnoreCase("GregoriusT")) { tResource = this.mCapes[3]; } - if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase() + ":capedonor")) { + if (this.mCapeList.contains( + aPlayer.getDisplayName() + .toLowerCase() + ":capedonor")) { tResource = this.mCapes[4]; } - if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase() + ":capedev")) { + if (this.mCapeList.contains( + aPlayer.getDisplayName() + .toLowerCase() + ":capedev")) { tResource = this.mCapes[5]; } - if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase() + ":cape_steam")) { + if (this.mCapeList.contains( + aPlayer.getDisplayName() + .toLowerCase() + ":cape_steam")) { tResource = this.mCapes[6]; } - if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase() + ":cape_titanium")) { + if (this.mCapeList.contains( + aPlayer.getDisplayName() + .toLowerCase() + ":cape_titanium")) { tResource = this.mCapes[7]; } - if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase() + ":cape_neutronium")) { + if (this.mCapeList.contains( + aPlayer.getDisplayName() + .toLowerCase() + ":cape_neutronium")) { tResource = this.mCapes[8]; } - if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase() + ":cape_stargate")) { + if (this.mCapeList.contains( + aPlayer.getDisplayName() + .toLowerCase() + ":cape_stargate")) { tResource = this.mCapes[9]; } diff --git a/src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java b/src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java index f0df8277ee..fe9f378047 100644 --- a/src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java +++ b/src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java @@ -37,7 +37,7 @@ public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, I aRenderer.field_152631_f = true; startDrawingQuads(aRenderer, 1.0f, 0.0f, 0.0f); new LightingHelper(aRenderer).setupLightingXPos(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.EAST.ordinal(), 0xffffff); + .setupColor(ForgeDirection.EAST.ordinal(), 0xffffff); aRenderer.renderFaceXPos(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); aRenderer.field_152631_f = false; @@ -48,7 +48,7 @@ public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, I startDrawingQuads(aRenderer, -1.0f, 0.0f, 0.0f); final IIcon aIcon = getIcon(ForgeDirection.WEST.ordinal()); new LightingHelper(aRenderer).setupLightingXNeg(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.WEST.ordinal(), 0xffffff); + .setupColor(ForgeDirection.WEST.ordinal(), 0xffffff); aRenderer.renderFaceXNeg(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -58,7 +58,7 @@ public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, I startDrawingQuads(aRenderer, 0.0f, 1.0f, 0.0f); final IIcon aIcon = getIcon(ForgeDirection.UP.ordinal()); new LightingHelper(aRenderer).setupLightingYPos(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.UP.ordinal(), 0xffffff); + .setupColor(ForgeDirection.UP.ordinal(), 0xffffff); aRenderer.renderFaceYPos(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -68,7 +68,7 @@ public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, I startDrawingQuads(aRenderer, 0.0f, -1.0f, 0.0f); final IIcon aIcon = getIcon(ForgeDirection.DOWN.ordinal()); new LightingHelper(aRenderer).setupLightingYNeg(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.DOWN.ordinal(), 0xffffff); + .setupColor(ForgeDirection.DOWN.ordinal(), 0xffffff); aRenderer.renderFaceYNeg(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -78,7 +78,7 @@ public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, I startDrawingQuads(aRenderer, 0.0f, 0.0f, 1.0f); final IIcon aIcon = getIcon(ForgeDirection.SOUTH.ordinal()); new LightingHelper(aRenderer).setupLightingZPos(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.SOUTH.ordinal(), 0xffffff); + .setupColor(ForgeDirection.SOUTH.ordinal(), 0xffffff); aRenderer.renderFaceZPos(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -89,7 +89,7 @@ public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, I final IIcon aIcon = getIcon(ForgeDirection.NORTH.ordinal()); aRenderer.field_152631_f = true; new LightingHelper(aRenderer).setupLightingZNeg(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.NORTH.ordinal(), 0xffffff); + .setupColor(ForgeDirection.NORTH.ordinal(), 0xffffff); aRenderer.renderFaceZNeg(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); aRenderer.field_152631_f = false; diff --git a/src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java b/src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java index c96c57398d..90caaf85cd 100644 --- a/src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java +++ b/src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java @@ -42,9 +42,10 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc final IIcon aIcon = getIcon(ForgeDirection.EAST.ordinal(), aX, aY, aZ, aRenderer); aRenderer.field_152631_f = true; startDrawingQuads(aRenderer, 1.0f, 0.0f, 0.0f); - new LightingHelper(aRenderer).setupLightingXPos(aBlock, aX, aY, aZ).setupColor( - ForgeDirection.EAST.ordinal(), - mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); + new LightingHelper(aRenderer).setupLightingXPos(aBlock, aX, aY, aZ) + .setupColor( + ForgeDirection.EAST.ordinal(), + mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); aRenderer.renderFaceXPos(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); aRenderer.field_152631_f = false; @@ -54,9 +55,10 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc public void renderXNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) { startDrawingQuads(aRenderer, -1.0f, 0.0f, 0.0f); final IIcon aIcon = getIcon(ForgeDirection.WEST.ordinal(), aX, aY, aZ, aRenderer); - new LightingHelper(aRenderer).setupLightingXNeg(aBlock, aX, aY, aZ).setupColor( - ForgeDirection.WEST.ordinal(), - mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); + new LightingHelper(aRenderer).setupLightingXNeg(aBlock, aX, aY, aZ) + .setupColor( + ForgeDirection.WEST.ordinal(), + mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); aRenderer.renderFaceXNeg(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -66,7 +68,9 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc startDrawingQuads(aRenderer, 0.0f, 1.0f, 0.0f); final IIcon aIcon = getIcon(ForgeDirection.UP.ordinal(), aX, aY, aZ, aRenderer); new LightingHelper(aRenderer).setupLightingYPos(aBlock, aX, aY, aZ) - .setupColor(ForgeDirection.UP.ordinal(), mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); + .setupColor( + ForgeDirection.UP.ordinal(), + mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); aRenderer.renderFaceYPos(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -75,9 +79,10 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc public void renderYNeg(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) { startDrawingQuads(aRenderer, 0.0f, -1.0f, 0.0f); final IIcon aIcon = getIcon(ForgeDirection.DOWN.ordinal(), aX, aY, aZ, aRenderer); - new LightingHelper(aRenderer).setupLightingYNeg(aBlock, aX, aY, aZ).setupColor( - ForgeDirection.DOWN.ordinal(), - mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); + new LightingHelper(aRenderer).setupLightingYNeg(aBlock, aX, aY, aZ) + .setupColor( + ForgeDirection.DOWN.ordinal(), + mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); aRenderer.renderFaceYNeg(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -86,9 +91,10 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc public void renderZPos(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ) { startDrawingQuads(aRenderer, 0.0f, 0.0f, 1.0f); final IIcon aIcon = getIcon(ForgeDirection.SOUTH.ordinal(), aX, aY, aZ, aRenderer); - new LightingHelper(aRenderer).setupLightingZPos(aBlock, aX, aY, aZ).setupColor( - ForgeDirection.SOUTH.ordinal(), - mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); + new LightingHelper(aRenderer).setupLightingZPos(aBlock, aX, aY, aZ) + .setupColor( + ForgeDirection.SOUTH.ordinal(), + mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); aRenderer.renderFaceZPos(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); } @@ -98,9 +104,10 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc startDrawingQuads(aRenderer, 0.0f, 0.0f, -1.0f); final IIcon aIcon = getIcon(ForgeDirection.NORTH.ordinal(), aX, aY, aZ, aRenderer); aRenderer.field_152631_f = true; - new LightingHelper(aRenderer).setupLightingZNeg(aBlock, aX, aY, aZ).setupColor( - ForgeDirection.NORTH.ordinal(), - mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); + new LightingHelper(aRenderer).setupLightingZNeg(aBlock, aX, aY, aZ) + .setupColor( + ForgeDirection.NORTH.ordinal(), + mBlock.colorMultiplier(getBlockAccess(aRenderer), aX, aY, aZ)); aRenderer.renderFaceZNeg(aBlock, aX, aY, aZ, aIcon); draw(aRenderer); aRenderer.field_152631_f = false; diff --git a/src/main/java/gregtech/common/render/GT_FlaskRenderer.java b/src/main/java/gregtech/common/render/GT_FlaskRenderer.java index 3523b0f4b6..bf29fe0528 100644 --- a/src/main/java/gregtech/common/render/GT_FlaskRenderer.java +++ b/src/main/java/gregtech/common/render/GT_FlaskRenderer.java @@ -56,8 +56,10 @@ public final class GT_FlaskRenderer implements IItemRenderer { FluidStack fs = cell.getFluid(item); if (fs != null) { IIcon iconWindow = cell.iconWindow; - IIcon fluidicon = fs.getFluid().getIcon(fs); - int fluidColor = fs.getFluid().getColor(fs); + IIcon fluidicon = fs.getFluid() + .getIcon(fs); + int fluidColor = fs.getFluid() + .getColor(fs); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); GL11.glBlendFunc(GL11.GL_ZERO, GL11.GL_ONE); if (type.equals(ItemRenderType.INVENTORY)) { diff --git a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java b/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java index 43865c9bdb..9d8d2afe70 100644 --- a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java +++ b/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java @@ -48,7 +48,8 @@ public class GT_FluidDisplayStackRenderer implements IItemRenderer { Materials associatedFluidMaterial = Materials.get(item.stackTagCompound.getString("mFluidMaterialName")); if (associatedFluidMaterial.renderer == null || !associatedFluidMaterial.renderer.renderFluidDisplayItem(type, item, data)) { - IIcon icon = item.getItem().getIconFromDamage(item.getItemDamage()); + IIcon icon = item.getItem() + .getIconFromDamage(item.getItemDamage()); Tessellator tess = Tessellator.instance; tess.startDrawingQuads(); // draw a simple rectangle for the inventory icon @@ -70,8 +71,10 @@ public class GT_FluidDisplayStackRenderer implements IItemRenderer { } // Render Fluid amount text - long fluidAmount = item.getTagCompound().getLong("mFluidDisplayAmount"); - if (fluidAmount > 0L && !item.getTagCompound().getBoolean("mHideStackSize")) { + long fluidAmount = item.getTagCompound() + .getLong("mFluidDisplayAmount"); + if (fluidAmount > 0L && !item.getTagCompound() + .getBoolean("mHideStackSize")) { String amountString; if (fluidAmount < 10_000) { diff --git a/src/main/java/gregtech/common/render/GT_MetaGenerated_Tool_Renderer.java b/src/main/java/gregtech/common/render/GT_MetaGenerated_Tool_Renderer.java index b03b7d2f2d..12dcec1291 100644 --- a/src/main/java/gregtech/common/render/GT_MetaGenerated_Tool_Renderer.java +++ b/src/main/java/gregtech/common/render/GT_MetaGenerated_Tool_Renderer.java @@ -160,8 +160,9 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { } else if (tDamage >= tMaxDamage) { aIcon = gregtech.api.enums.Textures.ItemIcons.DURABILITY_BAR[0]; } else { - aIcon = gregtech.api.enums.Textures.ItemIcons.DURABILITY_BAR[((int) java.lang.Math - .max(0L, java.lang.Math.min(7L, (tMaxDamage - tDamage) * 8L / tMaxDamage)))]; + aIcon = gregtech.api.enums.Textures.ItemIcons.DURABILITY_BAR[((int) java.lang.Math.max( + 0L, + java.lang.Math.min(7L, (tMaxDamage - tDamage) * 8L / tMaxDamage)))]; } if (aIcon != null) { IIcon tIcon = aIcon.getIcon(); @@ -209,8 +210,9 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { } else if (tCharge >= tStats[0]) { aIcon = gregtech.api.enums.Textures.ItemIcons.ENERGY_BAR[8]; } else { - aIcon = gregtech.api.enums.Textures.ItemIcons.ENERGY_BAR[(7 - (int) java.lang.Math - .max(0L, java.lang.Math.min(6L, (tStats[0] - tCharge) * 7L / tStats[0])))]; + aIcon = gregtech.api.enums.Textures.ItemIcons.ENERGY_BAR[(7 - (int) java.lang.Math.max( + 0L, + java.lang.Math.min(6L, (tStats[0] - tCharge) * 7L / tStats[0])))]; } } else { aIcon = null; diff --git a/src/main/java/gregtech/common/render/GT_PollutionRenderer.java b/src/main/java/gregtech/common/render/GT_PollutionRenderer.java index ea8d5d1310..e98d90c659 100644 --- a/src/main/java/gregtech/common/render/GT_PollutionRenderer.java +++ b/src/main/java/gregtech/common/render/GT_PollutionRenderer.java @@ -57,7 +57,9 @@ public class GT_PollutionRenderer { public void preLoad() { net.minecraftforge.common.MinecraftForge.EVENT_BUS.register(this); - FMLCommonHandler.instance().bus().register(this); + FMLCommonHandler.instance() + .bus() + .register(this); } public void processPacket(ChunkCoordIntPair chunk, int pollution) { diff --git a/src/main/java/gregtech/common/render/GT_RenderedTexture.java b/src/main/java/gregtech/common/render/GT_RenderedTexture.java index 5346a101d1..a4c19c79d3 100644 --- a/src/main/java/gregtech/common/render/GT_RenderedTexture.java +++ b/src/main/java/gregtech/common/render/GT_RenderedTexture.java @@ -63,7 +63,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol lighting.setLightnessOverride(1.0F); if (enableAO) lighting.setBrightnessOverride(MAX_BRIGHTNESS); } - lighting.setupLightingXPos(aBlock, aX, aY, aZ).setupColor(ForgeDirection.EAST.ordinal(), mRGBa); + lighting.setupLightingXPos(aBlock, aX, aY, aZ) + .setupColor(ForgeDirection.EAST.ordinal(), mRGBa); final ExtendedFacing rotation = getExtendedFacing(aX, aY, aZ); renderFaceXPos(aRenderer, aX, aY, aZ, mIconContainer.getIcon(), rotation); if (mIconContainer.getOverlayIcon() != null) { @@ -88,7 +89,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol lighting.setLightnessOverride(1.0F); lighting.setBrightnessOverride(MAX_BRIGHTNESS); } - lighting.setupLightingXNeg(aBlock, aX, aY, aZ).setupColor(ForgeDirection.WEST.ordinal(), mRGBa); + lighting.setupLightingXNeg(aBlock, aX, aY, aZ) + .setupColor(ForgeDirection.WEST.ordinal(), mRGBa); final ExtendedFacing rotation = getExtendedFacing(aX, aY, aZ); renderFaceXNeg(aRenderer, aX, aY, aZ, mIconContainer.getIcon(), rotation); if (mIconContainer.getOverlayIcon() != null) { @@ -113,7 +115,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol lighting.setLightnessOverride(1.0F); lighting.setBrightnessOverride(MAX_BRIGHTNESS); } - lighting.setupLightingYPos(aBlock, aX, aY, aZ).setupColor(ForgeDirection.UP.ordinal(), mRGBa); + lighting.setupLightingYPos(aBlock, aX, aY, aZ) + .setupColor(ForgeDirection.UP.ordinal(), mRGBa); final ExtendedFacing rotation = getExtendedFacing(aX, aY, aZ); renderFaceYPos(aRenderer, aX, aY, aZ, mIconContainer.getIcon(), rotation); if (mIconContainer.getOverlayIcon() != null) { @@ -138,7 +141,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol lighting.setLightnessOverride(1.0F); lighting.setBrightnessOverride(MAX_BRIGHTNESS); } - lighting.setupLightingYNeg(aBlock, aX, aY, aZ).setupColor(ForgeDirection.DOWN.ordinal(), mRGBa); + lighting.setupLightingYNeg(aBlock, aX, aY, aZ) + .setupColor(ForgeDirection.DOWN.ordinal(), mRGBa); final ExtendedFacing rotation = getExtendedFacing(aX, aY, aZ); renderFaceYNeg(aRenderer, aX, aY, aZ, mIconContainer.getIcon(), rotation); if (mIconContainer.getOverlayIcon() != null) { @@ -163,7 +167,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol lighting.setLightnessOverride(1.0F); lighting.setBrightnessOverride(MAX_BRIGHTNESS); } - lighting.setupLightingZPos(aBlock, aX, aY, aZ).setupColor(ForgeDirection.SOUTH.ordinal(), mRGBa); + lighting.setupLightingZPos(aBlock, aX, aY, aZ) + .setupColor(ForgeDirection.SOUTH.ordinal(), mRGBa); final ExtendedFacing rotation = getExtendedFacing(aX, aY, aZ); renderFaceZPos(aRenderer, aX, aY, aZ, mIconContainer.getIcon(), rotation); if (mIconContainer.getOverlayIcon() != null) { @@ -188,7 +193,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol lighting.setLightnessOverride(1.0F); lighting.setBrightnessOverride(MAX_BRIGHTNESS); } - lighting.setupLightingZNeg(aBlock, aX, aY, aZ).setupColor(ForgeDirection.NORTH.ordinal(), mRGBa); + lighting.setupLightingZNeg(aBlock, aX, aY, aZ) + .setupColor(ForgeDirection.NORTH.ordinal(), mRGBa); final ExtendedFacing rotation = getExtendedFacing(aX, aY, aZ); renderFaceZNeg(aRenderer, aX, aY, aZ, mIconContainer.getIcon(), rotation); if (mIconContainer.getOverlayIcon() != null) { @@ -427,7 +433,10 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol if (meta instanceof IAlignmentProvider) { alignment = ((IAlignmentProvider) meta).getAlignment(); } else if (meta != null) { - return ExtendedFacing.of(ForgeDirection.getOrientation(meta.getBaseMetaTileEntity().getFrontFacing())); + return ExtendedFacing.of( + ForgeDirection.getOrientation( + meta.getBaseMetaTileEntity() + .getFrontFacing())); } } else if (te instanceof IAlignmentProvider) { alignment = ((IAlignmentProvider) te).getAlignment(); diff --git a/src/main/java/gregtech/common/render/GT_Renderer_Block.java b/src/main/java/gregtech/common/render/GT_Renderer_Block.java index 454982b48c..f17618829b 100644 --- a/src/main/java/gregtech/common/render/GT_Renderer_Block.java +++ b/src/main/java/gregtech/common/render/GT_Renderer_Block.java @@ -507,7 +507,9 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { 0.0, block, block.getDamageValue(world, x, y, z), - side)).applyColourMultiplier(x, y, z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F)); + side)).applyColourMultiplier(x, y, z) + .multiplyVelocity(0.2F) + .multipleParticleScaleBy(0.6F)); } @SideOnly(Side.CLIENT) @@ -900,8 +902,8 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY - 1, aZ, 0))) return; - Tessellator.instance - .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY - 1 : aY, aZ)); + Tessellator.instance.setBrightness( + aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY - 1 : aY, aZ)); } if (aIcon == null) return; for (ITexture iTexture : aIcon) { @@ -915,8 +917,8 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY + 1, aZ, 1))) return; - Tessellator.instance - .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY + 1 : aY, aZ)); + Tessellator.instance.setBrightness( + aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY + 1 : aY, aZ)); } if (aIcon == null) return; for (ITexture iTexture : aIcon) { @@ -930,8 +932,8 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY, aZ - 1, 2))) return; - Tessellator.instance - .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ - 1 : aZ)); + Tessellator.instance.setBrightness( + aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ - 1 : aZ)); } if (aIcon == null) return; for (ITexture iTexture : aIcon) { @@ -945,8 +947,8 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX, aY, aZ + 1, 3))) return; - Tessellator.instance - .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ + 1 : aZ)); + Tessellator.instance.setBrightness( + aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ + 1 : aZ)); } if (aIcon == null) return; for (ITexture iTexture : aIcon) { @@ -960,8 +962,8 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX - 1, aY, aZ, 4))) return; - Tessellator.instance - .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX - 1 : aX, aY, aZ)); + Tessellator.instance.setBrightness( + aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX - 1 : aX, aY, aZ)); } if (aIcon == null) return; for (ITexture iTexture : aIcon) { @@ -975,8 +977,8 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { int aZ, ITexture[] aIcon, boolean aFullBlock) { if (aWorld != null) { if ((aFullBlock) && (!aBlock.shouldSideBeRendered(aWorld, aX + 1, aY, aZ, 5))) return; - Tessellator.instance - .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX + 1 : aX, aY, aZ)); + Tessellator.instance.setBrightness( + aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX + 1 : aX, aY, aZ)); } if (aIcon == null) return; for (ITexture iTexture : aIcon) { @@ -1002,11 +1004,18 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { } else { final boolean[] tSides = new boolean[6]; if (tRenderer instanceof IRenderedBlockSideCheck) { - for (byte tSide : ALL_VALID_SIDES) rReturn |= (tSides[tSide] = ((IRenderedBlockSideCheck) tRenderer) - .renderFullBlockSide(aBlock, aRenderer, tSide)); + for (byte tSide : ALL_VALID_SIDES) + rReturn |= (tSides[tSide] = ((IRenderedBlockSideCheck) tRenderer).renderFullBlockSide( + aBlock, + aRenderer, + tSide)); } else { - for (byte tSide : ALL_VALID_SIDES) rReturn |= (tSides[tSide] = aBlock - .shouldSideBeRendered(aWorld, aX + OFFX[tSide], aY + OFFY[tSide], aZ + OFFZ[tSide], tSide)); + for (byte tSide : ALL_VALID_SIDES) rReturn |= (tSides[tSide] = aBlock.shouldSideBeRendered( + aWorld, + aX + OFFX[tSide], + aY + OFFY[tSide], + aZ + OFFZ[tSide], + tSide)); } for (int i = 0, j = tRenderer.getRenderPasses(aBlock); i < j; i++) { if (tRenderer.usesRenderPass(i)) { diff --git a/src/main/java/gregtech/common/render/GT_TextureBuilder.java b/src/main/java/gregtech/common/render/GT_TextureBuilder.java index d3941bea24..1cb613b32e 100644 --- a/src/main/java/gregtech/common/render/GT_TextureBuilder.java +++ b/src/main/java/gregtech/common/render/GT_TextureBuilder.java @@ -137,8 +137,10 @@ public class GT_TextureBuilder implements ITextureBuilder { } private boolean isCTMBlock(Block fromBlock, int fromMeta) { - return GT_Mod.gregtechproxy.mCTMBlockCache - .computeIfAbsent(fromBlock, (byte) fromMeta, GT_TextureBuilder::apply); + return GT_Mod.gregtechproxy.mCTMBlockCache.computeIfAbsent( + fromBlock, + (byte) fromMeta, + GT_TextureBuilder::apply); } private static Boolean apply(Block b, Byte m) { diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java b/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java index 2484cf1c1f..398465d586 100644 --- a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java +++ b/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java @@ -148,8 +148,10 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer { FluidStack fluidStack = GT_Utility.getFluidForFilledItem(stack, true); if (fluidStack != null && fluidStack.getFluid() != null) { - IIcon fluidIcon = fluidStack.getFluid().getIcon(fluidStack); - int fluidColor = fluidStack.getFluid().getColor(fluidStack); + IIcon fluidIcon = fluidStack.getFluid() + .getIcon(fluidStack); + int fluidColor = fluidStack.getFluid() + .getColor(fluidStack); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); markNeedsAnimationUpdate(fluidIcon); diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java b/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java index faa0d70c7c..4e8a85cace 100644 --- a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java +++ b/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java @@ -72,7 +72,8 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { } if (tOverlay != null && aFluid != null && aFluid.getFluid() != null) { - IIcon fluidIcon = aFluid.getFluid().getIcon(aFluid); + IIcon fluidIcon = aFluid.getFluid() + .getIcon(aFluid); if (fluidIcon != null) { markNeedsAnimationUpdate(fluidIcon); // Adds colour to a cells fluid. Does not colour full fluid icons as shown in NEI etc. diff --git a/src/main/java/gregtech/common/render/items/InfinityRenderer.java b/src/main/java/gregtech/common/render/items/InfinityRenderer.java index 7450ff8fdb..0441ab2272 100644 --- a/src/main/java/gregtech/common/render/items/InfinityRenderer.java +++ b/src/main/java/gregtech/common/render/items/InfinityRenderer.java @@ -61,7 +61,8 @@ public class InfinityRenderer extends GT_GeneratedMaterial_Renderer { } if (tOverlay != null && aFluid != null && aFluid.getFluid() != null) { - IIcon fluidIcon = aFluid.getFluid().getIcon(aFluid); + IIcon fluidIcon = aFluid.getFluid() + .getIcon(aFluid); if (fluidIcon != null) { markNeedsAnimationUpdate(fluidIcon); // Adds colour to a cells fluid. Does not colour full fluid icons as shown in NEI etc. diff --git a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java index b5caa6f59e..a2369128b0 100644 --- a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java +++ b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java @@ -35,7 +35,8 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { magicRenderMethod( type, ItemList.Emitter_UEV.get(1), // hack to make it render correctly - aStack.getItem().getIconFromDamage(aStack.getItemDamage()), + aStack.getItem() + .getIconFromDamage(aStack.getItemDamage()), true, data); return true; @@ -114,8 +115,9 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { if (fluidDisplay) { // this somehow makes shader render correctly ResourceLocation resourcelocation = mc.getTextureManager() - .getResourceLocation(aStack.getItemSpriteNumber()); - mc.getTextureManager().bindTexture(resourcelocation); + .getResourceLocation(aStack.getItemSpriteNumber()); + mc.getTextureManager() + .bindTexture(resourcelocation); } else { r.renderItemIntoGUI(mc.fontRenderer, mc.getTextureManager(), aStack, 0, 0, true); } @@ -185,8 +187,15 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); // RENDER ITEM IN HAND - ItemRenderer - .renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); + ItemRenderer.renderItemIn2D( + Tessellator.instance, + f1, + f2, + f, + f3, + icon.getIconWidth(), + icon.getIconHeight(), + scale); GL11.glDisable(GL11.GL_ALPHA_TEST); GL11.glDepthFunc(GL11.GL_EQUAL); diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java index 52cc1b1b96..f1641bda0b 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java @@ -65,7 +65,10 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer impl public ITexture getOverlayIcon() { return TextureFactory.of( TextureFactory.of(AUTOMATION_CHESTBUFFER), - TextureFactory.builder().addIcon(AUTOMATION_CHESTBUFFER_GLOW).glow().build()); + TextureFactory.builder() + .addIcon(AUTOMATION_CHESTBUFFER_GLOW) + .glow() + .build()); } @Override @@ -122,8 +125,9 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer impl addInvertRedstoneButton(builder); addStockingModeButton(builder); builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_22_RED.apply(69, true)).setPos(80, 60) - .setSize(69, 22)); + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_22_RED.apply(69, true)) + .setPos(80, 60) + .setSize(69, 22)); addMainUI(builder); } diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java index 70e2673421..6fc2b45289 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java @@ -61,7 +61,10 @@ public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_Buffer implement public ITexture getOverlayIcon() { return TextureFactory.of( TextureFactory.of(AUTOMATION_FILTER), - TextureFactory.builder().addIcon(AUTOMATION_FILTER_GLOW).glow().build()); + TextureFactory.builder() + .addIcon(AUTOMATION_FILTER_GLOW) + .glow() + .build()); } @Override @@ -119,45 +122,70 @@ public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_Buffer implement builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { bInvertFilter = !bInvertFilter; if (bInvertFilter) { - GT_Utility.sendChatToPlayer(widget.getContext().getPlayer(), GT_Utility.trans("124", "Invert Filter")); + GT_Utility.sendChatToPlayer( + widget.getContext() + .getPlayer(), + GT_Utility.trans("124", "Invert Filter")); } else { GT_Utility.sendChatToPlayer( - widget.getContext().getPlayer(), + widget.getContext() + .getPlayer(), GT_Utility.trans("125", "Don't invert Filter")); } - }).setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_INVERT_FILTER).setPos(61, 62) - .setSize(18, 18)).widget(new ButtonWidget().setOnClick((clickData, widget) -> { - bIgnoreNBT = !bIgnoreNBT; - if (bIgnoreNBT) { - GT_Utility.sendChatToPlayer( - widget.getContext().getPlayer(), - GT_Utility.trans("126", "Ignore NBT")); - } else { - GT_Utility.sendChatToPlayer( - widget.getContext().getPlayer(), - GT_Utility.trans("127", "NBT has to match")); - } - }).setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_NBT).setPos(79, 62) - .setSize(18, 18)) - .widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_WHITE.apply(9, false)) - .setPos(6, 19).setSize(9, 24)) - .widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_BLUE.apply(24, true)) - .setPos(71, 19).setSize(24, 24)) - .widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_RED.apply(19, true)) - .setPos(152, 19).setSize(19, 24)) - .widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3).setPos(16, 4) - .setSize(54, 54)) - .widget( - SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(9).endAtSlot(17).phantom(true) + }) + .setBackground( + GT_UITextures.BUTTON_STANDARD, + GT_UITextures.OVERLAY_BUTTON_INVERT_FILTER) + .setPos(61, 62) + .setSize(18, 18)) + .widget(new ButtonWidget().setOnClick((clickData, widget) -> { + bIgnoreNBT = !bIgnoreNBT; + if (bIgnoreNBT) { + GT_Utility.sendChatToPlayer( + widget.getContext() + .getPlayer(), + GT_Utility.trans("126", "Ignore NBT")); + } else { + GT_Utility.sendChatToPlayer( + widget.getContext() + .getPlayer(), + GT_Utility.trans("127", "NBT has to match")); + } + }) + .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_NBT) + .setPos(79, 62) + .setSize(18, 18)) + .widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_WHITE.apply(9, false)) + .setPos(6, 19) + .setSize(9, 24)) + .widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_BLUE.apply(24, true)) + .setPos(71, 19) + .setSize(24, 24)) + .widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_24_RED.apply(19, true)) + .setPos(152, 19) + .setSize(19, 24)) + .widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3) + .setPos(16, 4) + .setSize(54, 54)) + .widget( + SlotGroup.ofItemHandler(inventoryHandler, 3) + .startFromSlot(9) + .endAtSlot(17) + .phantom(true) .applyForWidget( - widget -> widget.disableShiftInsert().setBackground(GT_UITextures.TRANSPARENT)) - .build().setPos(16, 4)) - .widget( - SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(0).endAtSlot(8).build() + widget -> widget.disableShiftInsert() + .setBackground(GT_UITextures.TRANSPARENT)) + .build() + .setPos(16, 4)) + .widget( + SlotGroup.ofItemHandler(inventoryHandler, 3) + .startFromSlot(0) + .endAtSlot(8) + .build() .setPos(97, 4)); } } diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java index e601847a72..97bf8190b0 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ItemDistributor.java @@ -68,7 +68,10 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer public ITexture getOverlayIcon() { return TextureFactory.of( TextureFactory.of(AUTOMATION_ITEMDISTRIBUTOR), - TextureFactory.builder().addIcon(AUTOMATION_ITEMDISTRIBUTOR_GLOW).glow().build()); + TextureFactory.builder() + .addIcon(AUTOMATION_ITEMDISTRIBUTOR_GLOW) + .glow() + .build()); } @Override @@ -188,8 +191,9 @@ public class GT_MetaTileEntity_ItemDistributor extends GT_MetaTileEntity_Buffer addEmitRedstoneButton(builder); addInvertRedstoneButton(builder); builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_22_RED.apply(87, true)).setPos(62, 60) - .setSize(87, 22)); + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_22_RED.apply(87, true)) + .setPos(62, 60) + .setSize(87, 22)); addInventorySlots(builder); } } diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java index 7502ae73de..00f1700d98 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java @@ -76,7 +76,10 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil public ITexture getOverlayIcon() { return TextureFactory.of( TextureFactory.of(AUTOMATION_RECIPEFILTER), - TextureFactory.builder().addIcon(AUTOMATION_RECIPEFILTER_GLOW).glow().build()); + TextureFactory.builder() + .addIcon(AUTOMATION_RECIPEFILTER_GLOW) + .glow() + .build()); } @Override diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java index af4426932a..e743dd47e4 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java @@ -66,7 +66,10 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer implem public ITexture getOverlayIcon() { return TextureFactory.of( TextureFactory.of(AUTOMATION_REGULATOR), - TextureFactory.builder().addIcon(AUTOMATION_REGULATOR_GLOW).glow().build()); + TextureFactory.builder() + .addIcon(AUTOMATION_REGULATOR_GLOW) + .glow() + .build()); } @Override @@ -171,21 +174,33 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer implem addEmitEnergyButton(builder); builder.widget(createChargerSlot(43, 62)); builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_22_RED.apply(84, true)).setPos(65, 60) - .setSize(84, 22)) - .widget(SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(0).endAtSlot(8).build().setPos(7, 5)) - .widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3).setPos(62, 5) - .setSize(54, 54)) - .widget( - SlotGroup.ofItemHandler(inventoryHandler, 3).phantom(true).startFromSlot(9).endAtSlot(17) + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_22_RED.apply(84, true)) + .setPos(65, 60) + .setSize(84, 22)) + .widget( + SlotGroup.ofItemHandler(inventoryHandler, 3) + .startFromSlot(0) + .endAtSlot(8) + .build() + .setPos(7, 5)) + .widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3) + .setPos(62, 5) + .setSize(54, 54)) + .widget( + SlotGroup.ofItemHandler(inventoryHandler, 3) + .phantom(true) + .startFromSlot(9) + .endAtSlot(17) .applyForWidget( widget -> widget.setControlsAmount(true) - .setBackground(GT_UITextures.TRANSPARENT)) - .build().setPos(62, 5)) - .widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3).setPos(117, 5) - .setSize(54, 54)); + .setBackground(GT_UITextures.TRANSPARENT)) + .build() + .setPos(62, 5)) + .widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3) + .setPos(117, 5) + .setSize(54, 54)); int xBase = 117, yBase = 5; for (int i = 0; i < mTargetSlots.length; i++) { @@ -202,10 +217,12 @@ public class GT_MetaTileEntity_Regulator extends GT_MetaTileEntity_Buffer implem mTargetSlots[index] + (clickData.mouseButton == 0 ? -1 : 1) * (clickData.shift ? 16 : 1))); } - }.setBackground(GT_UITextures.TRANSPARENT).setPos(xPos, yPos)).widget( - TextWidget.dynamicString(() -> String.valueOf(mTargetSlots[index])) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setPos(xPos + 2 + (i % 3 == 0 ? 1 : 0), yPos + 3 + (i / 3 == 0 ? 1 : 0))); + }.setBackground(GT_UITextures.TRANSPARENT) + .setPos(xPos, yPos)) + .widget( + TextWidget.dynamicString(() -> String.valueOf(mTargetSlots[index])) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(xPos + 2 + (i % 3 == 0 ? 1 : 0), yPos + 3 + (i / 3 == 0 ? 1 : 0))); } } } diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java index cefd3152c1..1b913af896 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java @@ -57,7 +57,10 @@ public class GT_MetaTileEntity_SuperBuffer extends GT_MetaTileEntity_ChestBuffer public ITexture getOverlayIcon() { return TextureFactory.of( TextureFactory.of(AUTOMATION_SUPERBUFFER), - TextureFactory.builder().addIcon(AUTOMATION_SUPERBUFFER_GLOW).glow().build()); + TextureFactory.builder() + .addIcon(AUTOMATION_SUPERBUFFER_GLOW) + .glow() + .build()); } @Override @@ -82,7 +85,8 @@ public class GT_MetaTileEntity_SuperBuffer extends GT_MetaTileEntity_ChestBuffer for (Map.Entry<GT_Utility.ItemId, Integer> entry : slots.entrySet()) { do { int slot = validSlots.get(i); - mInventory[slot] = stacks.get(entry.getKey()).copy(); + mInventory[slot] = stacks.get(entry.getKey()) + .copy(); int toSet = Math.min(entry.getValue(), mInventory[slot].getMaxStackSize()); mInventory[slot].stackSize = toSet; entry.setValue(entry.getValue() - toSet); @@ -94,6 +98,8 @@ public class GT_MetaTileEntity_SuperBuffer extends GT_MetaTileEntity_ChestBuffer @Override protected void addMainUI(ModularWindow.Builder builder) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SUPER_BUFFER).setPos(61, 4).setSize(54, 54)); + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SUPER_BUFFER) + .setPos(61, 4) + .setSize(54, 54)); } } diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java index 64b5a43ad8..609342ed82 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java @@ -78,7 +78,10 @@ public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilte public ITexture getOverlayIcon() { return TextureFactory.of( TextureFactory.of(AUTOMATION_TYPEFILTER), - TextureFactory.builder().addIcon(AUTOMATION_TYPEFILTER_GLOW).glow().build()); + TextureFactory.builder() + .addIcon(AUTOMATION_TYPEFILTER_GLOW) + .glow() + .build()); } @Override @@ -128,8 +131,8 @@ public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_SpecialFilte } this.mInventory[SPECIAL_SLOT_INDEX] = GT_Utility.copyAmount( 1L, - this.mPrefix.mPrefixedItems - .get(this.mRotationIndex = (this.mRotationIndex + 1) % this.mPrefix.mPrefixedItems.size())); + this.mPrefix.mPrefixedItems.get( + this.mRotationIndex = (this.mRotationIndex + 1) % this.mPrefix.mPrefixedItems.size())); if (this.mInventory[SPECIAL_SLOT_INDEX] == null) return; if (this.mInventory[SPECIAL_SLOT_INDEX].getItemDamage() == W) this.mInventory[9].setItemDamage(0); this.mInventory[SPECIAL_SLOT_INDEX].setStackDisplayName(this.mPrefix.toString()); diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java index 2519afd4a5..ed22d41f70 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java @@ -135,7 +135,8 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa fill(Materials.Water.getFluid(1000L * (long) aPlayer.getCurrentEquippedItem().stackSize), true); if (!aPlayer.capabilities.isCreativeMode) { - aPlayer.getCurrentEquippedItem().func_150996_a(Items.bucket); + aPlayer.getCurrentEquippedItem() + .func_150996_a(Items.bucket); } } else { GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); @@ -197,7 +198,8 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa @Override public boolean allowCoverOnSide(byte aSide, GT_ItemStack aCover) { - return GregTech_API.getCoverBehaviorNew(aCover.toStack()).isSimpleCover(); + return GregTech_API.getCoverBehaviorNew(aCover.toStack()) + .isSimpleCover(); } @Override @@ -328,13 +330,20 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa if (mSteam == null || mSteam.amount == 0) return; IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide((byte) aSide); if (tTileEntity == null) return; - FluidStack tDrained = aBaseMetaTileEntity - .drain(ForgeDirection.getOrientation(aSide), Math.max(1, this.mSteam.amount / 2), false); + FluidStack tDrained = aBaseMetaTileEntity.drain( + ForgeDirection.getOrientation(aSide), + Math.max(1, this.mSteam.amount / 2), + false); if (tDrained == null) return; - int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(aSide).getOpposite(), tDrained, false); + int tFilledAmount = tTileEntity.fill( + ForgeDirection.getOrientation(aSide) + .getOpposite(), + tDrained, + false); if (tFilledAmount <= 0) return; tTileEntity.fill( - ForgeDirection.getOrientation(aSide).getOpposite(), + ForgeDirection.getOrientation(aSide) + .getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(aSide), tFilledAmount, true), true); } @@ -378,13 +387,16 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa if (aIndex == GT_MetaTileEntity_Boiler.SOUND_EVENT_LET_OFF_EXCESS_STEAM) { GT_Utility.doSoundAtClient(SoundResource.RANDOM_FIZZ, 2, 1.0F, aX, aY, aZ); - new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD).setWorld(getBaseMetaTileEntity().getWorld()) - .setMotion(0D, 0D, 0D).<ParticleEventBuilder>times( - 8, - x -> x.setPosition( - aX - 0.5D + XSTR_INSTANCE.nextFloat(), - aY, - aZ - 0.5D + XSTR_INSTANCE.nextFloat()).run()); + new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD) + .setWorld(getBaseMetaTileEntity().getWorld()) + .setMotion(0D, 0D, 0D) + .<ParticleEventBuilder>times( + 8, + x -> x.setPosition( + aX - 0.5D + XSTR_INSTANCE.nextFloat(), + aY, + aZ - 0.5D + XSTR_INSTANCE.nextFloat()) + .run()); } } @@ -442,48 +454,58 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( new SlotWidget(inventoryHandler, 0).setPos(43, 25) - .setBackground(getGUITextureSet().getItemSlot(), getOverlaySlotIn())) - .widget( - new SlotWidget(inventoryHandler, 1).setPos( - 43, - 61).setBackground( - getGUITextureSet().getItemSlot(), - getOverlaySlotOut())) - .widget(createFuelSlot()).widget( - createAshSlot()) - .widget( - new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity()) - .setTexture( - getProgressbarEmpty(), - GT_UITextures.PROGRESSBAR_BOILER_STEAM, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(70, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> mFluid == null ? 0 : (float) mFluid.amount / getCapacity()) - .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_WATER, 10) - .setDirection(ProgressBar.Direction.UP).setPos(83, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> (float) mTemperature / maxProgresstime()) - .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_HEAT, 10) - .setDirection(ProgressBar.Direction.UP).setPos(96, 25).setSize(10, 54)) - .widget( - new ProgressBar() - // cap minimum so that one can easily see there's fuel remaining - .setProgress( - () -> mProcessingEnergy > 0 ? Math.max((float) mProcessingEnergy / 1000, 1f / 5) - : 0) - .setTexture(getProgressbarFuel(), 14).setDirection(ProgressBar.Direction.UP) - .setPos(116, 45).setSize(14, 14)) - .widget(new DrawableWidget().setDrawable(getOverlaySlotCanister()).setPos(43, 43).setSize(18, 18)); + .setBackground(getGUITextureSet().getItemSlot(), getOverlaySlotIn())) + .widget( + new SlotWidget(inventoryHandler, 1).setPos(43, 61) + .setBackground( + getGUITextureSet().getItemSlot(), + getOverlaySlotOut())) + .widget(createFuelSlot()) + .widget(createAshSlot()) + .widget( + new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity()) + .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_STEAM, 10) + .setDirection(ProgressBar.Direction.UP) + .setPos(70, 25) + .setSize(10, 54)) + .widget( + new ProgressBar().setProgress(() -> mFluid == null ? 0 : (float) mFluid.amount / getCapacity()) + .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_WATER, 10) + .setDirection(ProgressBar.Direction.UP) + .setPos(83, 25) + .setSize(10, 54)) + .widget( + new ProgressBar().setProgress(() -> (float) mTemperature / maxProgresstime()) + .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_HEAT, 10) + .setDirection(ProgressBar.Direction.UP) + .setPos(96, 25) + .setSize(10, 54)) + .widget( + new ProgressBar() + // cap minimum so that one can easily see there's fuel remaining + .setProgress( + () -> mProcessingEnergy > 0 + ? Math.max((float) mProcessingEnergy / 1000, 1f / 5) + : 0) + .setTexture(getProgressbarFuel(), 14) + .setDirection(ProgressBar.Direction.UP) + .setPos(116, 45) + .setSize(14, 14)) + .widget( + new DrawableWidget().setDrawable(getOverlaySlotCanister()) + .setPos(43, 43) + .setSize(18, 18)); } protected SlotWidget createFuelSlot() { - return (SlotWidget) new SlotWidget(inventoryHandler, 2).setPos(115, 61).setBackground(getFuelSlotBackground()); + return (SlotWidget) new SlotWidget(inventoryHandler, 2).setPos(115, 61) + .setBackground(getFuelSlotBackground()); } protected SlotWidget createAshSlot() { - return (SlotWidget) new SlotWidget(inventoryHandler, 3).setAccess(true, false).setPos(115, 25) - .setBackground(getAshSlotBackground()); + return (SlotWidget) new SlotWidget(inventoryHandler, 3).setAccess(true, false) + .setPos(115, 25) + .setBackground(getAshSlotBackground()); } @Override diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java index e88a35c617..0e617312df 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java @@ -62,9 +62,15 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { texTop = { TextureFactory.of(MACHINE_BRONZEBRICKS_TOP), TextureFactory.of(OVERLAY_PIPE) }, texSide = { TextureFactory.of(MACHINE_BRONZEBRICKS_SIDE), TextureFactory.of(OVERLAY_PIPE) }, texFront = { TextureFactory.of(MACHINE_BRONZEBRICKS_SIDE), TextureFactory.of(BOILER_FRONT), - TextureFactory.builder().addIcon(BOILER_FRONT_GLOW).glow().build() }, + TextureFactory.builder() + .addIcon(BOILER_FRONT_GLOW) + .glow() + .build() }, texFrontActive = { TextureFactory.of(MACHINE_BRONZEBRICKS_SIDE), TextureFactory.of(BOILER_FRONT_ACTIVE), - TextureFactory.builder().addIcon(BOILER_FRONT_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(BOILER_FRONT_ACTIVE_GLOW) + .glow() + .build() }; for (int i = 0; i < 17; i++) { rTextures[0][i] = texBottom; rTextures[1][i] = texTop; @@ -126,9 +132,13 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { } ParticleEventBuilder particleEventBuilder = (new ParticleEventBuilder()).setMotion(0D, 0D, 0D) - .setPosition(x, y, z).setWorld(getBaseMetaTileEntity().getWorld()); - particleEventBuilder.setIdentifier(ParticleFX.SMOKE).run(); - particleEventBuilder.setIdentifier(ParticleFX.FLAME).run(); + .setPosition(x, y, z) + .setWorld( + getBaseMetaTileEntity().getWorld()); + particleEventBuilder.setIdentifier(ParticleFX.SMOKE) + .run(); + particleEventBuilder.setIdentifier(ParticleFX.FLAME) + .run(); } } } @@ -206,38 +216,55 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { } else if ( // If its a block of the following materials GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.block.get(Materials.Coal)) - || GT_OreDictUnificator - .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.block.get(Materials.Lignite)) - || GT_OreDictUnificator - .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.block.get(Materials.Charcoal)) - || GT_OreDictUnificator - .isItemStackInstanceOf(this.mInventory[2], OrePrefixes.block.get(Materials.Diamond)) + || GT_OreDictUnificator.isItemStackInstanceOf( + this.mInventory[2], + OrePrefixes.block.get(Materials.Lignite)) + || GT_OreDictUnificator.isItemStackInstanceOf( + this.mInventory[2], + OrePrefixes.block.get(Materials.Charcoal)) + || GT_OreDictUnificator.isItemStackInstanceOf( + this.mInventory[2], + OrePrefixes.block.get(Materials.Diamond)) || // if its either a Railcraft Coke Block or a custom GTNH compressed Coal/charcoal/lignite/coke block (Block.getBlockFromItem(this.mInventory[2].getItem()) != null && // check if the block exists - (Block.getBlockFromItem(this.mInventory[2].getItem()).getUnlocalizedName().toLowerCase() - .contains("tile") && // check if the block is a tile -> block + (Block.getBlockFromItem(this.mInventory[2].getItem()) + .getUnlocalizedName() + .toLowerCase() + .contains("tile") && // check if the block is a tile -> block ( // If the name of the block contains these names - Block.getBlockFromItem(this.mInventory[2].getItem()).getUnlocalizedName().toLowerCase() - .contains("charcoal") - || Block.getBlockFromItem(this.mInventory[2].getItem()).getUnlocalizedName() - .toLowerCase().contains("coal") - || Block.getBlockFromItem(this.mInventory[2].getItem()).getUnlocalizedName() - .toLowerCase().contains("diamond") - || Block.getBlockFromItem(this.mInventory[2].getItem()).getUnlocalizedName() - .toLowerCase().contains("coke") - || Block.getBlockFromItem(this.mInventory[2].getItem()).getUnlocalizedName() - .toLowerCase().contains("railcraft.cube") - || Block.getBlockFromItem(this.mInventory[2].getItem()).getUnlocalizedName() - .toLowerCase().contains("lignite"))))) { + Block.getBlockFromItem(this.mInventory[2].getItem()) + .getUnlocalizedName() + .toLowerCase() + .contains("charcoal") + || Block.getBlockFromItem(this.mInventory[2].getItem()) + .getUnlocalizedName() + .toLowerCase() + .contains("coal") + || Block.getBlockFromItem(this.mInventory[2].getItem()) + .getUnlocalizedName() + .toLowerCase() + .contains("diamond") + || Block.getBlockFromItem(this.mInventory[2].getItem()) + .getUnlocalizedName() + .toLowerCase() + .contains("coke") + || Block.getBlockFromItem(this.mInventory[2].getItem()) + .getUnlocalizedName() + .toLowerCase() + .contains("railcraft.cube") + || Block.getBlockFromItem(this.mInventory[2].getItem()) + .getUnlocalizedName() + .toLowerCase() + .contains("lignite"))))) { // try to add 10% of the burnvalue as Processing energy, no boost // for coal coke here if ((TileEntityFurnace.getItemBurnTime(this.mInventory[2]) / 10) > 0) { - this.mProcessingEnergy += (TileEntityFurnace - .getItemBurnTime(this.mInventory[2]) / 10); + this.mProcessingEnergy += (TileEntityFurnace.getItemBurnTime( + this.mInventory[2]) / 10); aBaseMetaTileEntity.decrStackSize(2, 1); aBaseMetaTileEntity.addStackToSlot( 3, @@ -252,7 +279,8 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { || Block.getBlockFromItem( this.mInventory[2].getItem()) .getUnlocalizedName() - .toLowerCase().contains("coal") + .toLowerCase() + .contains("coal") || Block.getBlockFromItem( this.mInventory[2].getItem()) .getUnlocalizedName() @@ -268,22 +296,28 @@ public class GT_MetaTileEntity_Boiler_Bronze extends GT_MetaTileEntity_Boiler { // same goes for lava } else if ((TileEntityFurnace.getItemBurnTime(this.mInventory[2])) >= 2000 - && !(this.mInventory[2].getUnlocalizedName().toLowerCase().contains("bucket") - || this.mInventory[2].getUnlocalizedName().toLowerCase().contains("cell"))) { - this.mProcessingEnergy += (TileEntityFurnace.getItemBurnTime(this.mInventory[2]) / 10); - aBaseMetaTileEntity.decrStackSize(2, 1); - // adds tiny pile of ash for burntime under 10k, small pile for under 100k and pile for - // bigger values - if (XSTR.XSTR_INSTANCE.nextInt(2) == 0) aBaseMetaTileEntity.addStackToSlot( - 3, - GT_OreDictUnificator.get( - (TileEntityFurnace.getItemBurnTime(this.mInventory[2]) >= 10000 - ? TileEntityFurnace.getItemBurnTime(this.mInventory[2]) - >= 100000 ? OrePrefixes.dust : OrePrefixes.dustSmall - : OrePrefixes.dustTiny), - Materials.Ash, - 1L)); - } + && !(this.mInventory[2].getUnlocalizedName() + .toLowerCase() + .contains("bucket") + || this.mInventory[2].getUnlocalizedName() + .toLowerCase() + .contains("cell"))) { + this.mProcessingEnergy += (TileEntityFurnace.getItemBurnTime( + this.mInventory[2]) / 10); + aBaseMetaTileEntity.decrStackSize(2, 1); + // adds tiny pile of ash for burntime under 10k, small pile for + // under 100k and pile for + // bigger values + if (XSTR.XSTR_INSTANCE.nextInt(2) == 0) + aBaseMetaTileEntity.addStackToSlot( + 3, + GT_OreDictUnificator.get( + (TileEntityFurnace.getItemBurnTime( + this.mInventory[2]) + >= 10000 ? TileEntityFurnace.getItemBurnTime(this.mInventory[2]) >= 100000 ? OrePrefixes.dust : OrePrefixes.dustSmall : OrePrefixes.dustTiny), + Materials.Ash, + 1L)); + } } @Override diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java index 9e17dc12ee..b6b293d8d1 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java @@ -124,8 +124,10 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { rTextures[3][i] = new ITexture[] { TextureFactory.of(MACHINE_STEELBRICKS_SIDE, colorModulation), TextureFactory.of(BOILER_LAVA_FRONT, colorModulation), TextureFactory.of(BOILER_LAVA_FRONT_GLOW) }; rTextures[4][i] = new ITexture[] { TextureFactory.of(MACHINE_STEELBRICKS_SIDE, colorModulation), - TextureFactory.of(BOILER_LAVA_FRONT_ACTIVE), - TextureFactory.builder().addIcon(BOILER_LAVA_FRONT_ACTIVE_GLOW).glow().build() }; + TextureFactory.of(BOILER_LAVA_FRONT_ACTIVE), TextureFactory.builder() + .addIcon(BOILER_LAVA_FRONT_ACTIVE_GLOW) + .glow() + .build() }; rTextures[5][i] = new ITexture[] { TextureFactory.of(MACHINE_STEELBRICKS_SIDE, colorModulation), TextureFactory.of(OVERLAY_PIPE_OUT), TextureFactory.of(FLUID_OUT_SIGN) }; } @@ -222,13 +224,14 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { if (returnedItemStack != null && !aPlayer.capabilities.isCreativeMode) { if (equippedItemStack.stackSize > 1) { if (!aPlayer.inventory.addItemStackToInventory(returnedItemStack)) { - aBaseMetaTileEntity.getWorld().spawnEntityInWorld( - new EntityItem( - aBaseMetaTileEntity.getWorld(), - (double) aBaseMetaTileEntity.getXCoord() + 0.5D, - (double) aBaseMetaTileEntity.getYCoord() + 1.5D, - (double) aBaseMetaTileEntity.getZCoord() + 0.5D, - equippedItemStack)); + aBaseMetaTileEntity.getWorld() + .spawnEntityInWorld( + new EntityItem( + aBaseMetaTileEntity.getWorld(), + (double) aBaseMetaTileEntity.getXCoord() + 0.5D, + (double) aBaseMetaTileEntity.getYCoord() + 1.5D, + (double) aBaseMetaTileEntity.getZCoord() + 0.5D, + equippedItemStack)); } else if (aPlayer instanceof EntityPlayerMP) { ((EntityPlayerMP) aPlayer).sendContainerToPlayer(aPlayer.inventoryContainer); } @@ -243,7 +246,10 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { @Override public void saveNBTData(NBTTagCompound aNBT) { super.saveNBTData(aNBT); - if (lavaTank.getFluid() != null) aNBT.setTag("mLava", lavaTank.getFluid().writeToNBT(new NBTTagCompound())); + if (lavaTank.getFluid() != null) aNBT.setTag( + "mLava", + lavaTank.getFluid() + .writeToNBT(new NBTTagCompound())); aNBT.setInteger("mCooledLava", this.mCooledLava); } @@ -264,7 +270,9 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { if (mSteam == null || mSteam.amount == 0) return; pushSteamToSide( aBaseMetaTileEntity, - ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()).getOpposite().ordinal()); + ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()) + .getOpposite() + .ordinal()); } /** @@ -352,9 +360,13 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { } ParticleEventBuilder particleEventBuilder = (new ParticleEventBuilder()).setMotion(0D, 0D, 0D) - .setPosition(x, y, z).setWorld(getBaseMetaTileEntity().getWorld()); - particleEventBuilder.setIdentifier(ParticleFX.SMOKE).run(); - particleEventBuilder.setIdentifier(ParticleFX.FLAME).run(); + .setPosition(x, y, z) + .setWorld( + getBaseMetaTileEntity().getWorld()); + particleEventBuilder.setIdentifier(ParticleFX.SMOKE) + .run(); + particleEventBuilder.setIdentifier(ParticleFX.FLAME) + .run(); } } } @@ -401,7 +413,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { if (aIndex != GT_MetaTileEntity_Boiler.SOUND_EVENT_LET_OFF_EXCESS_STEAM) return; final ForgeDirection rearDirection = ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()) - .getOpposite(); + .getOpposite(); GT_Utility.doSoundAtClient( SoundResource.RANDOM_FIZZ, 2, @@ -411,12 +423,18 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { aY, aZ + 0.5 * rearDirection.offsetZ); - new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD).setWorld(getBaseMetaTileEntity().getWorld()) - // Particles emitted with a 1 block/s velocity toward rear - .setMotion(rearDirection.offsetX / 20D, 0D, rearDirection.offsetZ / 20D).<ParticleEventBuilder>times( - 8, - // Particles emitted from center of rear face (Steam Output) - x -> x.setPosition(aX + rearDirection.offsetX / 2D, aY, aZ + rearDirection.offsetZ / 2D).run()); + new ParticleEventBuilder().setIdentifier(ParticleFX.CLOUD) + .setWorld(getBaseMetaTileEntity().getWorld()) + // Particles emitted with a 1 block/s velocity toward rear + .setMotion(rearDirection.offsetX / 20D, 0D, rearDirection.offsetZ / 20D) + .<ParticleEventBuilder>times( + 8, + // Particles emitted from center of rear face (Steam Output) + x -> x.setPosition( + aX + rearDirection.offsetX / 2D, + aY, + aZ + rearDirection.offsetZ / 2D) + .run()); } @Override @@ -464,39 +482,53 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( new SlotWidget(inventoryHandler, 0).setPos(43, 25) - .setBackground(getGUITextureSet().getItemSlot(), getOverlaySlotIn())) - .widget( - new SlotWidget(inventoryHandler, 1).setAccess(true, false).setPos(43, 61) - .setBackground(getGUITextureSet().getItemSlot(), getOverlaySlotOut())) - .widget( - new FluidSlotWidget(lavaTank) - .setBackground(getGUITextureSet().getFluidSlot(), getOverlaySlotIn()).setPos(115, 61)) - .widget( - createAshSlot()) - .widget( - new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity()) - .setTexture( - getProgressbarEmpty(), - GT_UITextures.PROGRESSBAR_BOILER_STEAM, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(70, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> mFluid == null ? 0 : (float) mFluid.amount / getCapacity()) - .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_WATER, 10) - .setDirection(ProgressBar.Direction.UP).setPos(83, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> (float) mTemperature / maxProgresstime()) - .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_HEAT, 10) - .setDirection(ProgressBar.Direction.UP).setPos(96, 25).setSize(10, 54)) - .widget( - new ProgressBar() - // cap minimum so that one can easily see there's fuel remaining - .setProgress( - () -> mProcessingEnergy > 0 ? Math.max((float) mProcessingEnergy / 1000, 1f / 5) - : 0) - .setTexture(getProgressbarFuel(), 14).setDirection(ProgressBar.Direction.UP) - .setPos(116, 45).setSize(14, 14)) - .widget(new DrawableWidget().setDrawable(getOverlaySlotCanister()).setPos(43, 43).setSize(18, 18)); + .setBackground(getGUITextureSet().getItemSlot(), getOverlaySlotIn())) + .widget( + new SlotWidget(inventoryHandler, 1).setAccess(true, false) + .setPos(43, 61) + .setBackground( + getGUITextureSet().getItemSlot(), + getOverlaySlotOut())) + .widget( + new FluidSlotWidget(lavaTank) + .setBackground( + getGUITextureSet().getFluidSlot(), + getOverlaySlotIn()) + .setPos(115, 61)) + .widget(createAshSlot()) + .widget( + new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity()) + .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_STEAM, 10) + .setDirection(ProgressBar.Direction.UP) + .setPos(70, 25) + .setSize(10, 54)) + .widget( + new ProgressBar().setProgress(() -> mFluid == null ? 0 : (float) mFluid.amount / getCapacity()) + .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_WATER, 10) + .setDirection(ProgressBar.Direction.UP) + .setPos(83, 25) + .setSize(10, 54)) + .widget( + new ProgressBar().setProgress(() -> (float) mTemperature / maxProgresstime()) + .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_HEAT, 10) + .setDirection(ProgressBar.Direction.UP) + .setPos(96, 25) + .setSize(10, 54)) + .widget( + new ProgressBar() + // cap minimum so that one can easily see there's fuel remaining + .setProgress( + () -> mProcessingEnergy > 0 + ? Math.max((float) mProcessingEnergy / 1000, 1f / 5) + : 0) + .setTexture(getProgressbarFuel(), 14) + .setDirection(ProgressBar.Direction.UP) + .setPos(116, 45) + .setSize(14, 14)) + .widget( + new DrawableWidget().setDrawable(getOverlaySlotCanister()) + .setPos(43, 43) + .setSize(18, 18)); } static class LavaTank extends FluidTank { diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java index 746f0602d6..04fa676c16 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java @@ -100,7 +100,8 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { return String.format( localizedDescFormat, GT_Utility.formatNumbers(getMaxOutputPerSecond()), - GT_Utility.formatNumbers(getMinOutputPerSecond())).split("\\R"); + GT_Utility.formatNumbers(getMinOutputPerSecond())) + .split("\\R"); } public int getMinOutputPerSecond() { @@ -278,7 +279,8 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { GT_Utility.formatNumbers(getHotTimeSeconds()), GT_Utility.formatNumbers(getMinOutputPerSecond()), GT_Utility.formatNumbers(getMaxOutputPerSecond()), - GT_Utility.formatNumbers(getProductionPerSecond())).split("\\R"); + GT_Utility.formatNumbers(getProductionPerSecond())) + .split("\\R"); } public int getHeatCapacityPercent() { @@ -368,9 +370,12 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { protected int get(final String aCategory, final String aKey, final int aDefaultValue, final String... aComments) { final StringBuilder tCommentBuilder = new StringBuilder(); - for (String tComment : aComments) tCommentBuilder.append(tComment).append('\n'); - tCommentBuilder.append("Default: ").append(aDefaultValue); - return sMachineFile.mConfig.get(aCategory, aKey, aDefaultValue, tCommentBuilder.toString()).getInt(); + for (String tComment : aComments) tCommentBuilder.append(tComment) + .append('\n'); + tCommentBuilder.append("Default: ") + .append(aDefaultValue); + return sMachineFile.mConfig.get(aCategory, aKey, aDefaultValue, tCommentBuilder.toString()) + .getInt(); } public int getCalcificationTicks() { diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java index 719fd13317..42e0fc6117 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java @@ -43,9 +43,15 @@ public class GT_MetaTileEntity_Boiler_Steel extends GT_MetaTileEntity_Boiler_Bro texTop = { TextureFactory.of(MACHINE_STEELBRICKS_TOP), TextureFactory.of(OVERLAY_PIPE) }, texSide = { TextureFactory.of(MACHINE_STEELBRICKS_SIDE), TextureFactory.of(OVERLAY_PIPE) }, texFront = { TextureFactory.of(MACHINE_STEELBRICKS_SIDE), TextureFactory.of(BOILER_FRONT), - TextureFactory.builder().addIcon(BOILER_FRONT_GLOW).glow().build() }, + TextureFactory.builder() + .addIcon(BOILER_FRONT_GLOW) + .glow() + .build() }, texFrontActive = { TextureFactory.of(MACHINE_STEELBRICKS_SIDE), TextureFactory.of(BOILER_FRONT_ACTIVE), - TextureFactory.builder().addIcon(BOILER_FRONT_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(BOILER_FRONT_ACTIVE_GLOW) + .glow() + .build() }; for (int i = 0; i < 17; i++) { rTextures[0][i] = texBottom; rTextures[1][i] = texTop; diff --git a/src/main/java/gregtech/common/tileentities/casings/upgrade/InventoryUpgrade.java b/src/main/java/gregtech/common/tileentities/casings/upgrade/InventoryUpgrade.java index de144caf11..ef57f40e65 100644 --- a/src/main/java/gregtech/common/tileentities/casings/upgrade/InventoryUpgrade.java +++ b/src/main/java/gregtech/common/tileentities/casings/upgrade/InventoryUpgrade.java @@ -85,13 +85,20 @@ public class InventoryUpgrade extends UpgradeCasing { @Override public void addUIWidgets(Builder builder, UIBuildContext buildContext) { - builder.widget(new TextFieldWidget().setGetter(() -> mInventoryName).setSetter((val) -> { - mInventoryName = val; - final IMultiBlockController controller = getTarget(false); - if (controller != null) { - controller.changeInventoryName(mInventoryName, mInventoryID.toString(), mType); - } - }).setSize(100, 25).setPos(50, 30)); + builder.widget( + new TextFieldWidget().setGetter(() -> mInventoryName) + .setSetter((val) -> { + mInventoryName = val; + final IMultiBlockController controller = getTarget(false); + if (controller != null) { + controller.changeInventoryName( + mInventoryName, + mInventoryID.toString(), + mType); + } + }) + .setSize(100, 25) + .setPos(50, 30)); } @Override diff --git a/src/main/java/gregtech/common/tileentities/debug/GT_MetaTileEntity_AdvDebugStructureWriter.java b/src/main/java/gregtech/common/tileentities/debug/GT_MetaTileEntity_AdvDebugStructureWriter.java index fbc2e4af14..5f77c09e15 100644 --- a/src/main/java/gregtech/common/tileentities/debug/GT_MetaTileEntity_AdvDebugStructureWriter.java +++ b/src/main/java/gregtech/common/tileentities/debug/GT_MetaTileEntity_AdvDebugStructureWriter.java @@ -72,11 +72,17 @@ public class GT_MetaTileEntity_AdvDebugStructureWriter extends GT_MetaTileEntity @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1], - aSide != aFacing ? TextureFactory.of( - TextureFactory.builder().addIcon(Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE).glow().build()) - : TextureFactory.of( - TextureFactory.builder().addIcon(Textures.BlockIcons.STRUCTURE_MARK).glow().build()) }; + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1], aSide != aFacing + ? TextureFactory.of( + TextureFactory.builder() + .addIcon(Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE) + .glow() + .build()) + : TextureFactory.of( + TextureFactory.builder() + .addIcon(Textures.BlockIcons.STRUCTURE_MARK) + .glow() + .build()) }; } @Override @@ -126,8 +132,8 @@ public class GT_MetaTileEntity_AdvDebugStructureWriter extends GT_MetaTileEntity @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide()) { - ExtendedFacing writerFacing = ExtendedFacing - .of(ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing())); + ExtendedFacing writerFacing = ExtendedFacing.of( + ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing())); double[] abc = new double[3]; double[] xyz = new double[3]; boundingBox.dim = aBaseMetaTileEntity.getWorld().provider.dimensionId; @@ -174,7 +180,8 @@ public class GT_MetaTileEntity_AdvDebugStructureWriter extends GT_MetaTileEntity numbers[0], numbers[1], numbers[2], - te -> te.getClass().getCanonicalName(), + te -> te.getClass() + .getCanonicalName(), numbers[3], numbers[4], numbers[5], @@ -233,56 +240,86 @@ public class GT_MetaTileEntity_AdvDebugStructureWriter extends GT_MetaTileEntity @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setSize(90, 112).setPos(43, 4)) - .widget(new ButtonWidget().setOnClick((clickData, widget) -> { - if (getBaseMetaTileEntity().isServerSide()) { - printStructure(widget.getContext().getPlayer()); - } - }).setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_PRINT).setSize(18, 18) - .setPos(11, 128) - .addTooltip(translateToLocal("GT5U.machines.advdebugstructurewriter.gui.print.tooltip"))) - .widget( - new CycleButtonWidget().setToggle(() -> transpose, aBoolean -> transpose = aBoolean) - .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_TRANSPOSE).setSize(18, 18) - .setPos(32, 128).addTooltip( - translateToLocal( - "GT5U.machines.advdebugstructurewriter.gui.transpose.tooltip"))) - .widget( - new CycleButtonWidget() - .setToggle(() -> showHighlightBox, aBoolean -> showHighlightBox = aBoolean) - .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BOUNDING_BOX).setSize(18, 18) - .setPos(53, 128).addTooltip( - translateToLocal( - "GT5U.machines.advdebugstructurewriter.gui.highlight.tooltip"))) - .widget( - new MultiChildWidget().addChild( - new TextWidget(translateToLocal("GT5U.machines.advdebugstructurewriter.gui.origin")) - .setDefaultColor(0xf0f0ff).setPos(0, 0)) - .addChild( - TextWidget.dynamicString(() -> "A: " + numbers[0]).setDefaultColor(0xf0f0ff) - .setPos(0, 10)) - .addChild( - TextWidget.dynamicString(() -> "B: " + numbers[1]).setDefaultColor(0xf0f0ff) - .setPos(0, 18)) - .addChild( - TextWidget.dynamicString(() -> "C: " + numbers[2]).setDefaultColor(0xf0f0ff) - .setPos(0, 26)) - .addChild( - new TextWidget( - translateToLocal("GT5U.machines.advdebugstructurewriter.gui.size")) - .setDefaultColor(0xf0f0ff).setPos(0, 52)) - .addChild( - TextWidget.dynamicString(() -> "A: " + numbers[3]).setDefaultColor(0xf0f0ff) - .setPos(0, 62)) - .addChild( - TextWidget.dynamicString(() -> "B: " + numbers[4]).setDefaultColor(0xf0f0ff) - .setPos(0, 70)) - .addChild( - TextWidget.dynamicString(() -> "C: " + numbers[5]).setDefaultColor(0xf0f0ff) - .setPos(0, 78)) - .setPos(46, 8)); + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + .setSize(90, 112) + .setPos(43, 4)) + .widget(new ButtonWidget().setOnClick((clickData, widget) -> { + if (getBaseMetaTileEntity().isServerSide()) { + printStructure( + widget.getContext() + .getPlayer()); + } + }) + .setBackground( + GT_UITextures.BUTTON_STANDARD, + GT_UITextures.OVERLAY_BUTTON_PRINT) + .setSize(18, 18) + .setPos(11, 128) + .addTooltip( + translateToLocal( + "GT5U.machines.advdebugstructurewriter.gui.print.tooltip"))) + .widget( + new CycleButtonWidget().setToggle(() -> transpose, aBoolean -> transpose = aBoolean) + .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) + .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_TRANSPOSE) + .setSize(18, 18) + .setPos(32, 128) + .addTooltip( + translateToLocal( + "GT5U.machines.advdebugstructurewriter.gui.transpose.tooltip"))) + .widget( + new CycleButtonWidget().setToggle( + () -> showHighlightBox, + aBoolean -> showHighlightBox = aBoolean) + .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) + .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_BOUNDING_BOX) + .setSize(18, 18) + .setPos(53, 128) + .addTooltip( + translateToLocal( + "GT5U.machines.advdebugstructurewriter.gui.highlight.tooltip"))) + .widget( + new MultiChildWidget().addChild( + new TextWidget( + translateToLocal("GT5U.machines.advdebugstructurewriter.gui.origin")) + .setDefaultColor( + 0xf0f0ff) + .setPos( + 0, + 0)) + .addChild( + TextWidget.dynamicString(() -> "A: " + numbers[0]) + .setDefaultColor(0xf0f0ff) + .setPos(0, 10)) + .addChild( + TextWidget.dynamicString(() -> "B: " + numbers[1]) + .setDefaultColor(0xf0f0ff) + .setPos(0, 18)) + .addChild( + TextWidget.dynamicString(() -> "C: " + numbers[2]) + .setDefaultColor(0xf0f0ff) + .setPos(0, 26)) + .addChild( + new TextWidget( + translateToLocal( + "GT5U.machines.advdebugstructurewriter.gui.size")).setDefaultColor( + 0xf0f0ff) + .setPos( + 0, + 52)) + .addChild( + TextWidget.dynamicString(() -> "A: " + numbers[3]) + .setDefaultColor(0xf0f0ff) + .setPos(0, 62)) + .addChild( + TextWidget.dynamicString(() -> "B: " + numbers[4]) + .setDefaultColor(0xf0f0ff) + .setPos(0, 70)) + .addChild( + TextWidget.dynamicString(() -> "C: " + numbers[5]) + .setDefaultColor(0xf0f0ff) + .setPos(0, 78)) + .setPos(46, 8)); addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, -512, -64, 7); addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, -16, -1, 25); addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_PLUS_SMALL, 16, 1, 133); @@ -297,8 +334,9 @@ public class GT_MetaTileEntity_AdvDebugStructureWriter extends GT_MetaTileEntity builder.widget( new ButtonWidget().setOnClick( (clickData, widget) -> numbers[index] += clickData.shift ? addNumberShift : addNumber) - .setBackground(GT_UITextures.BUTTON_STANDARD, overlay).setSize(18, 18) - .setPos(xPos, yPos[index])); + .setBackground(GT_UITextures.BUTTON_STANDARD, overlay) + .setSize(18, 18) + .setPos(xPos, yPos[index])); } } @@ -310,7 +348,9 @@ public class GT_MetaTileEntity_AdvDebugStructureWriter extends GT_MetaTileEntity @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17).setPos(113, 96)); + new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()) + .setSize(17, 17) + .setPos(113, 96)); } @Override diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java index d2304cc948..3db3a5eef9 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java @@ -135,8 +135,11 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe final double z = aBaseMetaTileEntity.getOffsetZ(topFacing, 1) + 2D / 16D + XSTR_INSTANCE.nextFloat() * 14D / 16D; - new ParticleEventBuilder().setMotion(0D, 0D, 0D).setPosition(x, y, z) - .setWorld(getBaseMetaTileEntity().getWorld()).setIdentifier(ParticleFX.SMOKE).run(); + new ParticleEventBuilder().setMotion(0D, 0D, 0D) + .setPosition(x, y, z) + .setWorld(getBaseMetaTileEntity().getWorld()) + .setIdentifier(ParticleFX.SMOKE) + .run(); } } } @@ -146,7 +149,10 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getFront(aColor)[0], TextureFactory.of( TextureFactory.of(DIESEL_GENERATOR_FRONT), - TextureFactory.builder().addIcon(DIESEL_GENERATOR_FRONT_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(DIESEL_GENERATOR_FRONT_GLOW) + .glow() + .build()), OVERLAYS_ENERGY_OUT[this.mTier] }; } @@ -155,7 +161,10 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getBack(aColor)[0], TextureFactory.of( TextureFactory.of(DIESEL_GENERATOR_BACK), - TextureFactory.builder().addIcon(DIESEL_GENERATOR_BACK_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(DIESEL_GENERATOR_BACK_GLOW) + .glow() + .build()) }; } @Override @@ -163,7 +172,10 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getBottom(aColor)[0], TextureFactory.of( TextureFactory.of(DIESEL_GENERATOR_BOTTOM), - TextureFactory.builder().addIcon(DIESEL_GENERATOR_BOTTOM_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(DIESEL_GENERATOR_BOTTOM_GLOW) + .glow() + .build()) }; } @Override @@ -171,7 +183,10 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getTop(aColor)[0], TextureFactory.of( TextureFactory.of(DIESEL_GENERATOR_TOP), - TextureFactory.builder().addIcon(DIESEL_GENERATOR_TOP_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(DIESEL_GENERATOR_TOP_GLOW) + .glow() + .build()) }; } @Override @@ -179,7 +194,10 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getSides(aColor)[0], TextureFactory.of( TextureFactory.of(DIESEL_GENERATOR_SIDE), - TextureFactory.builder().addIcon(DIESEL_GENERATOR_SIDE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(DIESEL_GENERATOR_SIDE_GLOW) + .glow() + .build()) }; } @Override @@ -187,7 +205,10 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getFrontActive(aColor)[0], TextureFactory.of( TextureFactory.of(DIESEL_GENERATOR_FRONT_ACTIVE), - TextureFactory.builder().addIcon(DIESEL_GENERATOR_FRONT_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(DIESEL_GENERATOR_FRONT_ACTIVE_GLOW) + .glow() + .build()), OVERLAYS_ENERGY_OUT[this.mTier] }; } @@ -196,7 +217,10 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getBackActive(aColor)[0], TextureFactory.of( TextureFactory.of(DIESEL_GENERATOR_BACK_ACTIVE), - TextureFactory.builder().addIcon(DIESEL_GENERATOR_BACK_ACTIVE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(DIESEL_GENERATOR_BACK_ACTIVE_GLOW) + .glow() + .build()) }; } @Override @@ -204,7 +228,10 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getBottomActive(aColor)[0], TextureFactory.of( TextureFactory.of(DIESEL_GENERATOR_BOTTOM_ACTIVE), - TextureFactory.builder().addIcon(DIESEL_GENERATOR_BOTTOM_ACTIVE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(DIESEL_GENERATOR_BOTTOM_ACTIVE_GLOW) + .glow() + .build()) }; } @Override @@ -212,7 +239,10 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getTopActive(aColor)[0], TextureFactory.of( TextureFactory.of(DIESEL_GENERATOR_TOP_ACTIVE), - TextureFactory.builder().addIcon(DIESEL_GENERATOR_TOP_ACTIVE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(DIESEL_GENERATOR_TOP_ACTIVE_GLOW) + .glow() + .build()) }; } @Override @@ -220,7 +250,10 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getSidesActive(aColor)[0], TextureFactory.of( TextureFactory.of(DIESEL_GENERATOR_SIDE_ACTIVE), - TextureFactory.builder().addIcon(DIESEL_GENERATOR_SIDE_ACTIVE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(DIESEL_GENERATOR_SIDE_ACTIVE_GLOW) + .glow() + .build()) }; } @Override diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java index 90b076abaa..2e0279552a 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java @@ -94,8 +94,10 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat } public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, this.mEfficiency); + this.mEfficiency = GregTech_API.sMachineFile.get( + ConfigCategories.machineconfig, + "GasTurbine.efficiency.tier." + this.mTier, + this.mEfficiency); } @Override @@ -108,7 +110,10 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat return new ITexture[] { super.getFront(aColor)[0], TextureFactory.of( TextureFactory.of(GAS_TURBINE_FRONT), - TextureFactory.builder().addIcon(GAS_TURBINE_FRONT_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(GAS_TURBINE_FRONT_GLOW) + .glow() + .build()), OVERLAYS_ENERGY_OUT[this.mTier] }; } @@ -117,7 +122,10 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat return new ITexture[] { super.getBack(aColor)[0], TextureFactory.of( TextureFactory.of(GAS_TURBINE_BACK), - TextureFactory.builder().addIcon(GAS_TURBINE_BACK_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(GAS_TURBINE_BACK_GLOW) + .glow() + .build()) }; } @Override @@ -125,7 +133,10 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat return new ITexture[] { super.getBottom(aColor)[0], TextureFactory.of( TextureFactory.of(GAS_TURBINE_BOTTOM), - TextureFactory.builder().addIcon(GAS_TURBINE_BOTTOM_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(GAS_TURBINE_BOTTOM_GLOW) + .glow() + .build()) }; } @Override @@ -133,7 +144,10 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat return new ITexture[] { super.getTop(aColor)[0], TextureFactory.of( TextureFactory.of(GAS_TURBINE_TOP), - TextureFactory.builder().addIcon(GAS_TURBINE_TOP_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(GAS_TURBINE_TOP_GLOW) + .glow() + .build()) }; } @Override @@ -141,7 +155,10 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat return new ITexture[] { super.getSides(aColor)[0], TextureFactory.of( TextureFactory.of(GAS_TURBINE_SIDE), - TextureFactory.builder().addIcon(GAS_TURBINE_SIDE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(GAS_TURBINE_SIDE_GLOW) + .glow() + .build()) }; } @Override @@ -149,7 +166,10 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat return new ITexture[] { super.getFrontActive(aColor)[0], TextureFactory.of( TextureFactory.of(GAS_TURBINE_FRONT_ACTIVE), - TextureFactory.builder().addIcon(GAS_TURBINE_FRONT_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(GAS_TURBINE_FRONT_ACTIVE_GLOW) + .glow() + .build()), OVERLAYS_ENERGY_OUT[this.mTier] }; } @@ -158,7 +178,10 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat return new ITexture[] { super.getBackActive(aColor)[0], TextureFactory.of( TextureFactory.of(GAS_TURBINE_BACK_ACTIVE), - TextureFactory.builder().addIcon(GAS_TURBINE_BACK_ACTIVE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(GAS_TURBINE_BACK_ACTIVE_GLOW) + .glow() + .build()) }; } @Override @@ -166,7 +189,10 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat return new ITexture[] { super.getBottomActive(aColor)[0], TextureFactory.of( TextureFactory.of(GAS_TURBINE_BOTTOM_ACTIVE), - TextureFactory.builder().addIcon(GAS_TURBINE_BOTTOM_ACTIVE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(GAS_TURBINE_BOTTOM_ACTIVE_GLOW) + .glow() + .build()) }; } @Override @@ -174,7 +200,10 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat return new ITexture[] { super.getTopActive(aColor)[0], TextureFactory.of( TextureFactory.of(GAS_TURBINE_TOP_ACTIVE), - TextureFactory.builder().addIcon(GAS_TURBINE_TOP_ACTIVE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(GAS_TURBINE_TOP_ACTIVE_GLOW) + .glow() + .build()) }; } @Override @@ -182,7 +211,10 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat return new ITexture[] { super.getSidesActive(aColor)[0], TextureFactory.of( TextureFactory.of(GAS_TURBINE_SIDE_ACTIVE), - TextureFactory.builder().addIcon(GAS_TURBINE_SIDE_ACTIVE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(GAS_TURBINE_SIDE_ACTIVE_GLOW) + .glow() + .build()) }; } @Override diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java index 2436beba77..152a849d5a 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java @@ -42,9 +42,13 @@ public class GT_MetaTileEntity_LightningRod extends GT_MetaTileEntity_TieredMach } if (!aActive) return new ITexture[] { BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1], TextureFactory.of(BlockIcons.MACHINE_CASING_FUSION_GLASS) }; - return new ITexture[] { BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1], - TextureFactory.of(BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW), - TextureFactory.builder().addIcon(BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW).glow().build() }; + return new ITexture[] { + BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1], TextureFactory.of( + BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW), + TextureFactory.builder() + .addIcon(BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW) + .glow() + .build() }; } @Override @@ -81,8 +85,9 @@ public class GT_MetaTileEntity_LightningRod extends GT_MetaTileEntity_TieredMach int aZ = aBaseMetaTileEntity.getZCoord(); for (int i = aBaseMetaTileEntity.getYCoord() + 1; i < aWorld.getHeight() - 1; i++) { - if (isRodValid - && aBaseMetaTileEntity.getBlock(aX, i, aZ).getUnlocalizedName().equals("blockFenceIron")) { + if (isRodValid && aBaseMetaTileEntity.getBlock(aX, i, aZ) + .getUnlocalizedName() + .equals("blockFenceIron")) { aRodValue++; } else { isRodValid = false; @@ -94,8 +99,9 @@ public class GT_MetaTileEntity_LightningRod extends GT_MetaTileEntity_TieredMach } if (!aWorld.isThundering() && ((aY + aRodValue) < 128)) aRodValue = 0; if (XSTR_INSTANCE.nextInt(4 * aWorld.getHeight()) < (aRodValue * (aY + aRodValue))) { - aBaseMetaTileEntity - .increaseStoredEnergyUnits(maxEUStore() - aBaseMetaTileEntity.getStoredEU(), false); + aBaseMetaTileEntity.increaseStoredEnergyUnits( + maxEUStore() - aBaseMetaTileEntity.getStoredEU(), + false); aWorld.addWeatherEffect(new EntityLightningBolt(aWorld, aX, aY + aRodValue, aZ)); } } diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java index 6bc904d384..b67993770d 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java @@ -79,63 +79,93 @@ public class GT_MetaTileEntity_MagicEnergyConverter extends GT_MetaTileEntity_Ba @Override public ITexture[] getFront(byte aColor) { return new ITexture[] { super.getFront(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_GLOW).glow().build(), + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_GLOW) + .glow() + .build(), OVERLAYS_ENERGY_OUT[mTier] }; } @Override public ITexture[] getBack(byte aColor) { return new ITexture[] { super.getBack(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC_FRONT), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_FRONT_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_FRONT_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottom(byte aColor) { return new ITexture[] { super.getBottom(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTop(byte aColor) { return new ITexture[] { super.getTop(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSides(byte aColor) { return new ITexture[] { super.getSides(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontActive(byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC_ACTIVE), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW).glow().build(), + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW) + .glow() + .build(), OVERLAYS_ENERGY_OUT[mTier] }; } @Override public ITexture[] getBackActive(byte aColor) { return new ITexture[] { super.getBackActive(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC_FRONT_ACTIVE), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_FRONT_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_FRONT_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomActive(byte aColor) { return new ITexture[] { super.getBottomActive(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC_ACTIVE), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopActive(byte aColor) { return new ITexture[] { super.getTopActive(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC_ACTIVE), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSidesActive(byte aColor) { return new ITexture[] { super.getSidesActive(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC_ACTIVE), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW) + .glow() + .build() }; } @Override diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java index d197c264c7..491eeea306 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java @@ -119,8 +119,11 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B // noinspection UnstableApiUsage sAspectsEnergy.put( tAspect, - Enums.getIfPresent(TC_Aspects.class, tAspect.getTag().toUpperCase(Locale.ENGLISH)) - .or(TC_Aspects.AER).mValue * sEnergyPerEssentia); + Enums.getIfPresent( + TC_Aspects.class, + tAspect.getTag() + .toUpperCase(Locale.ENGLISH)) + .or(TC_Aspects.AER).mValue * sEnergyPerEssentia); } } } @@ -251,20 +254,29 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B @Override public ITexture[] getFront(byte aColor) { return new ITexture[] { super.getFront(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_GLOW).glow().build(), + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_GLOW) + .glow() + .build(), OVERLAYS_ENERGY_OUT[mTier] }; } @Override public ITexture[] getBack(byte aColor) { return new ITexture[] { super.getBack(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC_FRONT), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_FRONT_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_FRONT_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottom(byte aColor) { return new ITexture[] { super.getBottom(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_GLOW) + .glow() + .build() }; } @Override @@ -275,38 +287,56 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B @Override public ITexture[] getSides(byte aColor) { return new ITexture[] { super.getSides(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontActive(byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC_ACTIVE), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW).glow().build(), + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW) + .glow() + .build(), OVERLAYS_ENERGY_OUT[mTier] }; } @Override public ITexture[] getBackActive(byte aColor) { return new ITexture[] { super.getBackActive(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC_FRONT_ACTIVE), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_FRONT_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_FRONT_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomActive(byte aColor) { return new ITexture[] { super.getBottomActive(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC_ACTIVE), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopActive(byte aColor) { return new ITexture[] { super.getTopActive(aColor)[0], TextureFactory.of(MACHINE_CASING_DRAGONEGG), - TextureFactory.builder().addIcon(MACHINE_CASING_DRAGONEGG_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_DRAGONEGG_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSidesActive(byte aColor) { return new ITexture[] { super.getSidesActive(aColor)[0], TextureFactory.of(MACHINE_CASING_MAGIC_ACTIVE), - TextureFactory.builder().addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_MAGIC_ACTIVE_GLOW) + .glow() + .build() }; } @Override @@ -373,8 +403,10 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B final double oY = aBaseMetaTileEntity.getYCoord() + 17D / 32D; final double oZ = aBaseMetaTileEntity.getZCoord() + 8D / 16D; - final ParticleEventBuilder particleEventBuilder = new ParticleEventBuilder() - .setWorld(getBaseMetaTileEntity().getWorld()).setIdentifier(ParticleFX.PORTAL); + final ParticleEventBuilder particleEventBuilder = new ParticleEventBuilder().setWorld( + getBaseMetaTileEntity().getWorld()) + .setIdentifier( + ParticleFX.PORTAL); for (int i = 0; i < 9; i++) { final double dX = (XSTR_INSTANCE.nextFloat() - 0.5D) / 2D; @@ -390,7 +422,9 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B final double mY = -(dXZ * dY) / 4D; final double mZ = dZ * 4D; - particleEventBuilder.setMotion(mX, mY, mZ).setPosition(x, y, z).run(); + particleEventBuilder.setMotion(mX, mY, mZ) + .setPosition(x, y, z) + .run(); } } } @@ -423,7 +457,9 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B } private boolean isDisenchantableItem(ItemStack aStack) { - return ((aStack.isItemEnchanted()) && (aStack.getItem().getItemEnchantability() > 0)); + return ((aStack.isItemEnchanted()) && (aStack.getItem() + .getItemEnchantability() + > 0)); } private boolean isEnchantedBook(ItemStack aStack) { @@ -489,7 +525,8 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B if (!sAllowMultipleEggs) { if (sActiveSiphon != null && sActiveSiphon != this && sActiveSiphon.getBaseMetaTileEntity() != null - && !sActiveSiphon.getBaseMetaTileEntity().isInvalidTileEntity() + && !sActiveSiphon.getBaseMetaTileEntity() + .isInvalidTileEntity() && sActiveSiphon.isChunkLoaded() && sActiveSiphon.hasEgg()) { getBaseMetaTileEntity().doExplosion(Integer.MAX_VALUE); @@ -500,9 +537,10 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B Block egg = getBaseMetaTileEntity().getBlockOffset(0, 1, 0); if (egg == Blocks.dragon_egg) { return sDragonEggEnergyPerTick; - } else if (egg.getUnlocalizedName().contains("creeperEgg")) { - return sCreeperEggEnergyPerTick; - } + } else if (egg.getUnlocalizedName() + .contains("creeperEgg")) { + return sCreeperEggEnergyPerTick; + } return 0; } @@ -569,7 +607,8 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B if (aBlock == Blocks.air) return false; if (aBlock == Blocks.dragon_egg) return true; if (aBlock instanceof BlockDragonEgg) return true; - return (aBlock.getUnlocalizedName().equals("tile.dragonEgg")); + return (aBlock.getUnlocalizedName() + .equals("tile.dragonEgg")); } private boolean isChunkLoaded() { @@ -678,12 +717,18 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B double tX = tBaseMetaTileEntity.getXCoord(); double tY = tBaseMetaTileEntity.getYCoord(); double tZ = tBaseMetaTileEntity.getZCoord(); - return AxisAlignedBB - .getBoundingBox(tX - tRange, tY - tRange, tZ - tRange, tX + tRange, tY + tRange, tZ + tRange); + return AxisAlignedBB.getBoundingBox( + tX - tRange, + tY - tRange, + tZ - tRange, + tX + tRange, + tY + tRange, + tZ + tRange); } private void scanLivingCrystals() { - World tWorld = mAbsorber.getBaseMetaTileEntity().getWorld(); + World tWorld = mAbsorber.getBaseMetaTileEntity() + .getWorld(); mLivingCrystalIDs.clear(); for (Object o : tWorld.getEntitiesWithinAABB(EntityEnderCrystal.class, getAxisAlignedBB())) { if (((EntityEnderCrystal) o).isEntityAlive()) { @@ -698,7 +743,9 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B if (tBaseMetaTileEntity.isInvalidTileEntity()) return; int tRange = getRange(); int tY = tBaseMetaTileEntity.getYCoord(); - int tMaxY = tBaseMetaTileEntity.getWorld().getHeight() - 1; + int tMaxY = tBaseMetaTileEntity.getWorld() + .getHeight() + - 1; // Make sure relative Y range stays between 0 and world max Y int rYMin = (tY - tRange >= 0) ? -tRange : -(tY); int rYMax = (((tY + tRange) <= tMaxY) ? tRange : tMaxY - tY); @@ -739,8 +786,13 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B void update() { if (mAbsorber == null) return; if (mAbsorber.getBaseMetaTileEntity() == null) return; - if (mAbsorber.getBaseMetaTileEntity().isInvalidTileEntity()) return; - if (mAbsorber.getBaseMetaTileEntity().getWorld() == null) return; + if (mAbsorber.getBaseMetaTileEntity() + .isInvalidTileEntity()) + return; + if (mAbsorber.getBaseMetaTileEntity() + .getWorld() + == null) + return; scanLivingCrystals(); scanAvailableAspects(); if (mListener != null) { diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java index 5fe5107dc4..615f512ff0 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java @@ -90,8 +90,10 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe } public int onConfigLoad() { - return mEfficiency = GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "SolidNaquadah.efficiency.tier." + mTier, getBaseEff()); + return mEfficiency = GregTech_API.sMachineFile.get( + ConfigCategories.machineconfig, + "SolidNaquadah.efficiency.tier." + mTier, + getBaseEff()); } @Override @@ -99,7 +101,10 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getFront(aColor)[0], TextureFactory.of( TextureFactory.of(NAQUADAH_REACTOR_SOLID_FRONT), - TextureFactory.builder().addIcon(NAQUADAH_REACTOR_SOLID_FRONT_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(NAQUADAH_REACTOR_SOLID_FRONT_GLOW) + .glow() + .build()) }; } @Override @@ -107,7 +112,10 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getBack(aColor)[0], TextureFactory.of( TextureFactory.of(NAQUADAH_REACTOR_SOLID_BACK), - TextureFactory.builder().addIcon(NAQUADAH_REACTOR_SOLID_BACK_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(NAQUADAH_REACTOR_SOLID_BACK_GLOW) + .glow() + .build()) }; } @Override @@ -115,7 +123,10 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getBottom(aColor)[0], TextureFactory.of( TextureFactory.of(NAQUADAH_REACTOR_SOLID_BOTTOM), - TextureFactory.builder().addIcon(NAQUADAH_REACTOR_SOLID_BOTTOM_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(NAQUADAH_REACTOR_SOLID_BOTTOM_GLOW) + .glow() + .build()) }; } @Override @@ -123,7 +134,10 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getTop(aColor)[0], TextureFactory.of( TextureFactory.of(NAQUADAH_REACTOR_SOLID_TOP), - TextureFactory.builder().addIcon(NAQUADAH_REACTOR_SOLID_TOP_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(NAQUADAH_REACTOR_SOLID_TOP_GLOW) + .glow() + .build()) }; } @Override @@ -131,38 +145,56 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe return new ITexture[] { super.getSides(aColor)[0], TextureFactory.of( TextureFactory.of(NAQUADAH_REACTOR_SOLID_SIDE), - TextureFactory.builder().addIcon(NAQUADAH_REACTOR_SOLID_SIDE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(NAQUADAH_REACTOR_SOLID_SIDE_GLOW) + .glow() + .build()) }; } @Override public ITexture[] getFrontActive(byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], TextureFactory.of(NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE), - TextureFactory.builder().addIcon(NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBackActive(byte aColor) { return new ITexture[] { super.getBackActive(aColor)[0], TextureFactory.of(NAQUADAH_REACTOR_SOLID_BACK_ACTIVE), - TextureFactory.builder().addIcon(NAQUADAH_REACTOR_SOLID_BACK_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(NAQUADAH_REACTOR_SOLID_BACK_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomActive(byte aColor) { - return new ITexture[] { super.getBottomActive(aColor)[0], - TextureFactory.of(NAQUADAH_REACTOR_SOLID_BOTTOM_ACTIVE), - TextureFactory.builder().addIcon(NAQUADAH_REACTOR_SOLID_BOTTOM_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomActive(aColor)[0], TextureFactory.of(NAQUADAH_REACTOR_SOLID_BOTTOM_ACTIVE), + TextureFactory.builder() + .addIcon(NAQUADAH_REACTOR_SOLID_BOTTOM_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopActive(byte aColor) { return new ITexture[] { super.getTopActive(aColor)[0], TextureFactory.of(NAQUADAH_REACTOR_SOLID_TOP_ACTIVE), - TextureFactory.builder().addIcon(NAQUADAH_REACTOR_SOLID_TOP_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(NAQUADAH_REACTOR_SOLID_TOP_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSidesActive(byte aColor) { return new ITexture[] { super.getSidesActive(aColor)[0], TextureFactory.of(NAQUADAH_REACTOR_SOLID_SIDE_ACTIVE), - TextureFactory.builder().addIcon(NAQUADAH_REACTOR_SOLID_SIDE_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(NAQUADAH_REACTOR_SOLID_SIDE_ACTIVE_GLOW) + .glow() + .build() }; } @Override diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_PlasmaGenerator.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_PlasmaGenerator.java index 6fbdf73189..6e4bbe2dc7 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_PlasmaGenerator.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_PlasmaGenerator.java @@ -62,32 +62,47 @@ public class GT_MetaTileEntity_PlasmaGenerator extends GT_MetaTileEntity_BasicGe @Override public ITexture[] getFrontActive(byte aColor) { return new ITexture[] { super.getFrontActive(aColor)[0], TextureFactory.of(MACHINE_CASING_FUSION_GLASS_YELLOW), - TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW).glow().build(), + TextureFactory.builder() + .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW) + .glow() + .build(), OVERLAYS_ENERGY_OUT[mTier] }; } @Override public ITexture[] getBackActive(byte aColor) { return new ITexture[] { super.getBackActive(aColor)[0], TextureFactory.of(MACHINE_CASING_FUSION_GLASS_YELLOW), - TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomActive(byte aColor) { return new ITexture[] { super.getBottomActive(aColor)[0], TextureFactory.of(MACHINE_CASING_FUSION_GLASS_YELLOW), - TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopActive(byte aColor) { return new ITexture[] { super.getTopActive(aColor)[0], TextureFactory.of(MACHINE_CASING_FUSION_GLASS_YELLOW), - TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSidesActive(byte aColor) { return new ITexture[] { super.getSidesActive(aColor)[0], TextureFactory.of(MACHINE_CASING_FUSION_GLASS_YELLOW), - TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW) + .glow() + .build() }; } @Override diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java index fc0746f634..6d59c050d0 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java @@ -71,8 +71,10 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener } public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "SteamTurbine.efficiency.tier." + this.mTier, 6 + this.mTier); + this.mEfficiency = GregTech_API.sMachineFile.get( + ConfigCategories.machineconfig, + "SteamTurbine.efficiency.tier." + this.mTier, + 6 + this.mTier); } @Override @@ -96,7 +98,10 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener return new ITexture[] { super.getFront(aColor)[0], TextureFactory.of( TextureFactory.of(STEAM_TURBINE_FRONT), - TextureFactory.builder().addIcon(STEAM_TURBINE_FRONT_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(STEAM_TURBINE_FRONT_GLOW) + .glow() + .build()), OVERLAYS_ENERGY_OUT[this.mTier] }; } @@ -105,7 +110,10 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener return new ITexture[] { super.getBack(aColor)[0], TextureFactory.of( TextureFactory.of(STEAM_TURBINE_BACK), - TextureFactory.builder().addIcon(STEAM_TURBINE_BACK_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(STEAM_TURBINE_BACK_GLOW) + .glow() + .build()) }; } @Override @@ -113,7 +121,10 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener return new ITexture[] { super.getBottom(aColor)[0], TextureFactory.of( TextureFactory.of(STEAM_TURBINE_BOTTOM), - TextureFactory.builder().addIcon(STEAM_TURBINE_BOTTOM_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(STEAM_TURBINE_BOTTOM_GLOW) + .glow() + .build()) }; } @Override @@ -121,7 +132,10 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener return new ITexture[] { super.getTop(aColor)[0], TextureFactory.of( TextureFactory.of(STEAM_TURBINE_TOP), - TextureFactory.builder().addIcon(STEAM_TURBINE_TOP_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(STEAM_TURBINE_TOP_GLOW) + .glow() + .build()) }; } @Override @@ -129,7 +143,10 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener return new ITexture[] { super.getSides(aColor)[0], TextureFactory.of( TextureFactory.of(STEAM_TURBINE_SIDE), - TextureFactory.builder().addIcon(STEAM_TURBINE_SIDE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(STEAM_TURBINE_SIDE_GLOW) + .glow() + .build()) }; } @Override @@ -137,7 +154,10 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener return new ITexture[] { super.getFrontActive(aColor)[0], TextureFactory.of( TextureFactory.of(STEAM_TURBINE_FRONT_ACTIVE), - TextureFactory.builder().addIcon(STEAM_TURBINE_FRONT_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(STEAM_TURBINE_FRONT_ACTIVE_GLOW) + .glow() + .build()), OVERLAYS_ENERGY_OUT[this.mTier] }; } @@ -146,7 +166,10 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener return new ITexture[] { super.getBackActive(aColor)[0], TextureFactory.of( TextureFactory.of(STEAM_TURBINE_BACK_ACTIVE), - TextureFactory.builder().addIcon(STEAM_TURBINE_BACK_ACTIVE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(STEAM_TURBINE_BACK_ACTIVE_GLOW) + .glow() + .build()) }; } @Override @@ -154,7 +177,10 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener return new ITexture[] { super.getBottomActive(aColor)[0], TextureFactory.of( TextureFactory.of(STEAM_TURBINE_BOTTOM_ACTIVE), - TextureFactory.builder().addIcon(STEAM_TURBINE_BOTTOM_ACTIVE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(STEAM_TURBINE_BOTTOM_ACTIVE_GLOW) + .glow() + .build()) }; } @Override @@ -162,7 +188,10 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener return new ITexture[] { super.getTopActive(aColor)[0], TextureFactory.of( TextureFactory.of(STEAM_TURBINE_TOP_ACTIVE), - TextureFactory.builder().addIcon(STEAM_TURBINE_TOP_ACTIVE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(STEAM_TURBINE_TOP_ACTIVE_GLOW) + .glow() + .build()) }; } @Override @@ -170,7 +199,10 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener return new ITexture[] { super.getSidesActive(aColor)[0], TextureFactory.of( TextureFactory.of(STEAM_TURBINE_SIDE_ACTIVE), - TextureFactory.builder().addIcon(STEAM_TURBINE_SIDE_ACTIVE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(STEAM_TURBINE_SIDE_ACTIVE_GLOW) + .glow() + .build()) }; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java index 4a5cb72be9..bf027be770 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java @@ -33,12 +33,15 @@ public class GT_MetaTileEntity_BasicHull_Bronze extends GT_MetaTileEntity_BasicH public ITexture[][][] getTextureSet(ITexture[] aTextures) { ITexture[][][] rTextures = new ITexture[3][17][]; for (byte i = -1; i < 16; i = (byte) (i + 1)) { - rTextures[0][(i + 1)] = new ITexture[] { TextureFactory - .of(Textures.BlockIcons.MACHINE_BRONZE_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[1][(i + 1)] = new ITexture[] { TextureFactory - .of(Textures.BlockIcons.MACHINE_BRONZE_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; - rTextures[2][(i + 1)] = new ITexture[] { TextureFactory - .of(Textures.BlockIcons.MACHINE_BRONZE_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; + rTextures[0][(i + 1)] = new ITexture[] { TextureFactory.of( + Textures.BlockIcons.MACHINE_BRONZE_BOTTOM, + Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; + rTextures[1][(i + 1)] = new ITexture[] { TextureFactory.of( + Textures.BlockIcons.MACHINE_BRONZE_TOP, + Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; + rTextures[2][(i + 1)] = new ITexture[] { TextureFactory.of( + Textures.BlockIcons.MACHINE_BRONZE_SIDE, + Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; } return rTextures; } diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java index 85e3218f9e..6be36f5798 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java @@ -38,14 +38,17 @@ public class GT_MetaTileEntity_BasicHull_BronzeBricks extends GT_MetaTileEntity_ public ITexture[][][] getTextureSet(ITexture[] aTextures) { ITexture[][][] rTextures = new ITexture[3][17][]; for (byte i = -1; i < 16; i = (byte) (i + 1)) { - ITexture[] tmp0 = { TextureFactory - .of(Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; + ITexture[] tmp0 = { TextureFactory.of( + Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, + Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; rTextures[0][(i + 1)] = tmp0; - ITexture[] tmp1 = { TextureFactory - .of(Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; + ITexture[] tmp1 = { TextureFactory.of( + Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, + Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; rTextures[1][(i + 1)] = tmp1; - ITexture[] tmp2 = { TextureFactory - .of(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; + ITexture[] tmp2 = { TextureFactory.of( + Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, + Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; rTextures[2][(i + 1)] = tmp2; } return rTextures; diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java index 2ec1d32e36..72785918b6 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java @@ -32,14 +32,16 @@ public class GT_MetaTileEntity_BasicHull_Steel extends GT_MetaTileEntity_BasicHu public ITexture[][][] getTextureSet(ITexture[] aTextures) { ITexture[][][] rTextures = new ITexture[3][17][]; for (byte i = -1; i < 16; i = (byte) (i + 1)) { - ITexture[] tmp0 = { TextureFactory - .of(Textures.BlockIcons.MACHINE_STEEL_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; + ITexture[] tmp0 = { TextureFactory.of( + Textures.BlockIcons.MACHINE_STEEL_BOTTOM, + Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; rTextures[0][(i + 1)] = tmp0; ITexture[] tmp1 = { TextureFactory.of(Textures.BlockIcons.MACHINE_STEEL_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; rTextures[1][(i + 1)] = tmp1; - ITexture[] tmp2 = { TextureFactory - .of(Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; + ITexture[] tmp2 = { TextureFactory.of( + Textures.BlockIcons.MACHINE_STEEL_SIDE, + Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; rTextures[2][(i + 1)] = tmp2; } return rTextures; diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java index e31e793f03..39cd8fec3c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java @@ -38,14 +38,17 @@ public class GT_MetaTileEntity_BasicHull_SteelBricks extends GT_MetaTileEntity_B public ITexture[][][] getTextureSet(ITexture[] aTextures) { ITexture[][][] rTextures = new ITexture[3][17][]; for (byte i = -1; i < 16; i = (byte) (i + 1)) { - ITexture[] tmp0 = { TextureFactory - .of(Textures.BlockIcons.MACHINE_STEELBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; + ITexture[] tmp0 = { TextureFactory.of( + Textures.BlockIcons.MACHINE_STEELBRICKS_BOTTOM, + Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; rTextures[0][(i + 1)] = tmp0; - ITexture[] tmp1 = { TextureFactory - .of(Textures.BlockIcons.MACHINE_STEELBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; + ITexture[] tmp1 = { TextureFactory.of( + Textures.BlockIcons.MACHINE_STEELBRICKS_TOP, + Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; rTextures[1][(i + 1)] = tmp1; - ITexture[] tmp2 = { TextureFactory - .of(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; + ITexture[] tmp2 = { TextureFactory.of( + Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, + Dyes.getModulation(i, Dyes._NULL.mRGBa)) }; rTextures[2][(i + 1)] = tmp2; } return rTextures; diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java index d2f116bd1b..6910fd9de5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_InputBus_ME.java @@ -142,7 +142,7 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch gridProxy.setFlags(GridFlags.REQUIRE_CHANNEL); if (getBaseMetaTileEntity().getWorld() != null) gridProxy.setOwner( getBaseMetaTileEntity().getWorld() - .getPlayerEntityByName(getBaseMetaTileEntity().getOwnerName())); + .getPlayerEntityByName(getBaseMetaTileEntity().getOwnerName())); } } return this.gridProxy; @@ -331,7 +331,8 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch return null; } try { - IMEMonitor<IAEItemStack> sg = proxy.getStorage().getItemInventory(); + IMEMonitor<IAEItemStack> sg = proxy.getStorage() + .getItemInventory(); IAEItemStack request = AEItemStack.create(mInventory[aIndex]); request.setStackSize(Integer.MAX_VALUE); IAEItemStack result = sg.extractItems(request, Actionable.SIMULATE, getRequestSource()); @@ -375,8 +376,10 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch if (GregTech_API.mAE2) { AENetworkProxy proxy = getProxy(); try { - IMEMonitor<IAEItemStack> sg = proxy.getStorage().getItemInventory(); - Iterator<IAEItemStack> iterator = sg.getStorageList().iterator(); + IMEMonitor<IAEItemStack> sg = proxy.getStorage() + .getItemInventory(); + Iterator<IAEItemStack> iterator = sg.getStorageList() + .iterator(); int index = 0; while (iterator.hasNext() && index < SLOT_COUNT) { IAEItemStack currItem = iterator.next(); @@ -409,14 +412,13 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch if (oldStack == null || oldStack.stackSize < savedStackSizes[i]) { AENetworkProxy proxy = getProxy(); try { - IMEMonitor<IAEItemStack> sg = proxy.getStorage().getItemInventory(); + IMEMonitor<IAEItemStack> sg = proxy.getStorage() + .getItemInventory(); IAEItemStack request = AEItemStack.create(mInventory[i]); request.setStackSize(savedStackSizes[i] - (oldStack == null ? 0 : oldStack.stackSize)); sg.extractItems(request, Actionable.MODULATE, getRequestSource()); - proxy.getEnergy().extractAEPower( - request.getStackSize(), - Actionable.MODULATE, - PowerMultiplier.CONFIG); + proxy.getEnergy() + .extractAEPower(request.getStackSize(), Actionable.MODULATE, PowerMultiplier.CONFIG); setInventorySlotContents(i + SLOT_COUNT, oldStack); } catch (final GridAccessException ignored) {} } @@ -439,7 +441,8 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch return null; } try { - IMEMonitor<IAEItemStack> sg = proxy.getStorage().getItemInventory(); + IMEMonitor<IAEItemStack> sg = proxy.getStorage() + .getItemInventory(); IAEItemStack request = AEItemStack.create(mInventory[aIndex]); request.setStackSize(Integer.MAX_VALUE); IAEItemStack result = sg.extractItems(request, Actionable.SIMULATE, getRequestSource()); @@ -462,61 +465,77 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch final SlotWidget[] aeSlotWidgets = new SlotWidget[16]; buildContext.addSyncedWindow(CONFIG_WINDOW_ID, this::createStackSizeConfigurationWindow); builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 4).startFromSlot(0).endAtSlot(15).phantom(true) - .background(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_ARROW_ME) - .widgetCreator(slot -> new SlotWidget(slot) { - - @Override - protected void phantomClick(ClickData clickData, ItemStack cursorStack) { - if (clickData.mouseButton != 0 || autoPullItemList) return; - final int aSlotIndex = getMcSlot().getSlotIndex(); - if (cursorStack == null) { - getMcSlot().putStack(null); - } else { - if (containsSuchStack(cursorStack)) return; - getMcSlot().putStack(GT_Utility.copyAmount(1L, cursorStack)); - } - if (getBaseMetaTileEntity().isServerSide()) { - final ItemStack newInfo = updateInformationSlot(aSlotIndex, cursorStack); - aeSlotWidgets[getMcSlot().getSlotIndex()].getMcSlot().putStack(newInfo); - } - } - - private boolean containsSuchStack(ItemStack tStack) { - for (int i = 0; i < 16; ++i) { - if (GT_Utility.areStacksEqual(mInventory[i], tStack, false)) return true; - } - return false; - } - }).build().setPos(7, 9)) - .widget( - SlotGroup.ofItemHandler(inventoryHandler, 4).startFromSlot(16).endAtSlot(31).phantom(true) + SlotGroup.ofItemHandler(inventoryHandler, 4) + .startFromSlot(0) + .endAtSlot(15) + .phantom(true) + .background(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_ARROW_ME) + .widgetCreator(slot -> new SlotWidget(slot) { + + @Override + protected void phantomClick(ClickData clickData, ItemStack cursorStack) { + if (clickData.mouseButton != 0 || autoPullItemList) return; + final int aSlotIndex = getMcSlot().getSlotIndex(); + if (cursorStack == null) { + getMcSlot().putStack(null); + } else { + if (containsSuchStack(cursorStack)) return; + getMcSlot().putStack(GT_Utility.copyAmount(1L, cursorStack)); + } + if (getBaseMetaTileEntity().isServerSide()) { + final ItemStack newInfo = updateInformationSlot(aSlotIndex, cursorStack); + aeSlotWidgets[getMcSlot().getSlotIndex()].getMcSlot() + .putStack(newInfo); + } + } + + private boolean containsSuchStack(ItemStack tStack) { + for (int i = 0; i < 16; ++i) { + if (GT_Utility.areStacksEqual(mInventory[i], tStack, false)) return true; + } + return false; + } + }) + .build() + .setPos(7, 9)) + .widget( + SlotGroup.ofItemHandler(inventoryHandler, 4) + .startFromSlot(16) + .endAtSlot(31) + .phantom(true) .background(GT_UITextures.SLOT_DARK_GRAY) .widgetCreator( - slot -> aeSlotWidgets[slot.getSlotIndex() - 16] = new AESlotWidget(slot) - .disableInteraction()) - .build().setPos(97, 9)) - .widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_DOUBLE).setPos(82, 40) - .setSize(12, 12)) - .widget(new ButtonWidget().setOnClick((clickData, widget) -> { - if (clickData.mouseButton == 0) { - setAutoPullItemList(!autoPullItemList); - } else if (clickData.mouseButton == 1 && !widget.isClient()) { - widget.getContext().openSyncedWindow(CONFIG_WINDOW_ID); - } - }).setPlayClickSound(true).setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(GT_UITextures.BUTTON_STANDARD); - if (autoPullItemList) ret.add(GT_UITextures.OVERLAY_BUTTON_AUTOPULL_ME); - else ret.add(GT_UITextures.OVERLAY_BUTTON_AUTOPULL_ME_DISABLED); - return ret.toArray(new IDrawable[0]); - }).addTooltips( - ImmutableList.of( - "Click to toggle automatic item pulling from ME.", - "Right-Click to edit minimum stack size for item pulling.")) - .setSize(16, 16).setPos(80, 10)) - .widget(new FakeSyncWidget.BooleanSyncer(() -> autoPullItemList, this::setAutoPullItemList)); + slot -> aeSlotWidgets[slot.getSlotIndex() + - 16] = new AESlotWidget(slot).disableInteraction()) + .build() + .setPos(97, 9)) + .widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_ARROW_DOUBLE) + .setPos(82, 40) + .setSize(12, 12)) + .widget(new ButtonWidget().setOnClick((clickData, widget) -> { + if (clickData.mouseButton == 0) { + setAutoPullItemList(!autoPullItemList); + } else if (clickData.mouseButton == 1 && !widget.isClient()) { + widget.getContext() + .openSyncedWindow(CONFIG_WINDOW_ID); + } + }) + .setPlayClickSound(true) + .setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(GT_UITextures.BUTTON_STANDARD); + if (autoPullItemList) ret.add(GT_UITextures.OVERLAY_BUTTON_AUTOPULL_ME); + else ret.add(GT_UITextures.OVERLAY_BUTTON_AUTOPULL_ME_DISABLED); + return ret.toArray(new IDrawable[0]); + }) + .addTooltips( + ImmutableList.of( + "Click to toggle automatic item pulling from ME.", + "Right-Click to edit minimum stack size for item pulling.")) + .setSize(16, 16) + .setPos(80, 10)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> autoPullItemList, this::setAutoPullItemList)); } protected ModularWindow createStackSizeConfigurationWindow(final EntityPlayer player) { @@ -529,22 +548,34 @@ public class GT_MetaTileEntity_Hatch_InputBus_ME extends GT_MetaTileEntity_Hatch builder.setGuiTint(getGUIColorization()); builder.setDraggable(true); builder.setPos( - (size, window) -> Alignment.Center.getAlignedPos(size, new Size(PARENT_WIDTH, PARENT_HEIGHT)).add( - Alignment.TopRight.getAlignedPos(new Size(PARENT_WIDTH, PARENT_HEIGHT), new Size(WIDTH, HEIGHT)) - .add(WIDTH - 3, 0))); - builder.widget(new TextWidget("Min Stack Size").setPos(3, 2).setSize(74, 14)).widget( - new TextFieldWidget().setSetterInt(val -> minAutoPullStackSize = val) - .setGetterInt(() -> minAutoPullStackSize).setNumbers(1, Integer.MAX_VALUE) - .setOnScrollNumbers(1, 4, 64).setTextAlignment(Alignment.Center) - .setTextColor(Color.WHITE.normal).setSize(36, 18).setPos(19, 18) - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)); + (size, window) -> Alignment.Center.getAlignedPos(size, new Size(PARENT_WIDTH, PARENT_HEIGHT)) + .add( + Alignment.TopRight.getAlignedPos( + new Size(PARENT_WIDTH, PARENT_HEIGHT), + new Size(WIDTH, HEIGHT)) + .add(WIDTH - 3, 0))); + builder.widget( + new TextWidget("Min Stack Size").setPos(3, 2) + .setSize(74, 14)) + .widget( + new TextFieldWidget().setSetterInt(val -> minAutoPullStackSize = val) + .setGetterInt(() -> minAutoPullStackSize) + .setNumbers(1, Integer.MAX_VALUE) + .setOnScrollNumbers(1, 4, 64) + .setTextAlignment(Alignment.Center) + .setTextColor(Color.WHITE.normal) + .setSize(36, 18) + .setPos(19, 18) + .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)); return builder.build(); } @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17).setPos(80, 63)); + new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()) + .setSize(17, 17) + .setPos(80, 63)); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java index 3e802b6304..70a03a9f03 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java @@ -47,7 +47,10 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc private BaseActionSource requestSource = null; private AENetworkProxy gridProxy = null; - IItemList<IAEItemStack> itemCache = GregTech_API.mAE2 ? AEApi.instance().storage().createItemList() : null; + IItemList<IAEItemStack> itemCache = GregTech_API.mAE2 ? AEApi.instance() + .storage() + .createItemList() + : null; long lastOutputTick = 0; long tickCounter = 0; boolean lastOutputFailed = false; @@ -104,7 +107,10 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc */ public int store(final ItemStack stack) { if (!infiniteCache && lastOutputFailed) return stack.stackSize; - itemCache.add(AEApi.instance().storage().createItemStack(stack)); + itemCache.add( + AEApi.instance() + .storage() + .createItemStack(stack)); return 0; } @@ -125,10 +131,13 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc @Override public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (!getBaseMetaTileEntity().getCoverInfoAtSide(aSide).isGUIClickable()) return; + if (!getBaseMetaTileEntity().getCoverInfoAtSide(aSide) + .isGUIClickable()) + return; infiniteCache = !infiniteCache; - GT_Utility - .sendChatToPlayer(aPlayer, StatCollector.translateToLocal("GT5U.hatch.infiniteCache." + infiniteCache)); + GT_Utility.sendChatToPlayer( + aPlayer, + StatCollector.translateToLocal("GT5U.hatch.infiniteCache." + infiniteCache)); } @Override @@ -143,7 +152,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc gridProxy.setFlags(GridFlags.REQUIRE_CHANNEL); if (getBaseMetaTileEntity().getWorld() != null) gridProxy.setOwner( getBaseMetaTileEntity().getWorld() - .getPlayerEntityByName(getBaseMetaTileEntity().getOwnerName())); + .getPlayerEntityByName(getBaseMetaTileEntity().getOwnerName())); } } return this.gridProxy; @@ -160,7 +169,8 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc return; } try { - IMEMonitor<IAEItemStack> sg = proxy.getStorage().getItemInventory(); + IMEMonitor<IAEItemStack> sg = proxy.getStorage() + .getItemInventory(); for (IAEItemStack s : itemCache) { if (s.getStackSize() == 0) continue; IAEItemStack rest = Platform.poweredInsert(proxy.getEnergy(), sg, s, getRequest()); @@ -206,7 +216,8 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc if (s.getStackSize() == 0) continue; NBTTagCompound tag = new NBTTagCompound(); NBTTagCompound tagItemStack = new NBTTagCompound(); - s.getItemStack().writeToNBT(tagItemStack); + s.getItemStack() + .writeToNBT(tagItemStack); tag.setTag("itemStack", tagItemStack); tag.setLong("size", s.getStackSize()); items.appendTag(tag); @@ -222,8 +233,10 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc if (GregTech_API.mAE2) { NBTBase t = aNBT.getTag("cachedStack"); // legacy - if (t instanceof NBTTagCompound) - itemCache.add(AEApi.instance().storage().createItemStack(GT_Utility.loadItem((NBTTagCompound) t))); + if (t instanceof NBTTagCompound) itemCache.add( + AEApi.instance() + .storage() + .createItemStack(GT_Utility.loadItem((NBTTagCompound) t))); t = aNBT.getTag("cachedItems"); if (t instanceof NBTTagList) { NBTTagList l = (NBTTagList) t; @@ -231,12 +244,15 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc NBTTagCompound tag = l.getCompoundTagAt(i); if (!tag.hasKey("itemStack")) { // legacy #868 itemCache.add( - AEApi.instance().storage().createItemStack(GT_Utility.loadItem(l.getCompoundTagAt(i)))); + AEApi.instance() + .storage() + .createItemStack(GT_Utility.loadItem(l.getCompoundTagAt(i)))); continue; } NBTTagCompound tagItemStack = tag.getCompoundTag("itemStack"); - final IAEItemStack s = AEApi.instance().storage() - .createItemStack(GT_Utility.loadItem(tagItemStack)); + final IAEItemStack s = AEApi.instance() + .storage() + .createItemStack(GT_Utility.loadItem(tagItemStack)); if (s != null) { s.setStackSize(tag.getLong("size")); itemCache.add(s); @@ -274,7 +290,8 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc int counter = 0; for (IAEItemStack s : itemCache) { ss.add( - s.getItem().getItemStackDisplayName(s.getItemStack()) + ": " + s.getItem() + .getItemStackDisplayName(s.getItemStack()) + ": " + EnumChatFormatting.GOLD + nc.toWideReadableForm(s.getStackSize()) + EnumChatFormatting.RESET); diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java index 8ae9b395c1..edcbd21b16 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java @@ -51,7 +51,10 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O private BaseActionSource requestSource = null; private AENetworkProxy gridProxy = null; - IItemList<IAEFluidStack> fluidCache = GregTech_API.mAE2 ? AEApi.instance().storage().createFluidList() : null; + IItemList<IAEFluidStack> fluidCache = GregTech_API.mAE2 ? AEApi.instance() + .storage() + .createFluidList() + : null; long lastOutputTick = 0; long tickCounter = 0; boolean lastOutputFailed = false; @@ -111,7 +114,10 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O */ public int tryFillAE(final FluidStack aFluid) { if ((!infiniteCache && lastOutputFailed) || aFluid == null) return 0; - fluidCache.add(AEApi.instance().storage().createFluidStack(aFluid)); + fluidCache.add( + AEApi.instance() + .storage() + .createFluidStack(aFluid)); return aFluid.amount; } @@ -146,7 +152,9 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O @Override public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { // Don't allow to lock fluid in me fluid hatch - if (!getBaseMetaTileEntity().getCoverInfoAtSide(aSide).isGUIClickable()) return; + if (!getBaseMetaTileEntity().getCoverInfoAtSide(aSide) + .isGUIClickable()) + return; infiniteCache = !infiniteCache; GT_Utility.sendChatToPlayer( aPlayer, @@ -165,7 +173,7 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O gridProxy.setFlags(GridFlags.REQUIRE_CHANNEL); if (getBaseMetaTileEntity().getWorld() != null) gridProxy.setOwner( getBaseMetaTileEntity().getWorld() - .getPlayerEntityByName(getBaseMetaTileEntity().getOwnerName())); + .getPlayerEntityByName(getBaseMetaTileEntity().getOwnerName())); } } return this.gridProxy; @@ -182,7 +190,8 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O return; } try { - IMEMonitor<IAEFluidStack> sg = proxy.getStorage().getFluidInventory(); + IMEMonitor<IAEFluidStack> sg = proxy.getStorage() + .getFluidInventory(); for (IAEFluidStack s : fluidCache) { if (s.getStackSize() == 0) continue; IAEFluidStack rest = fluidAEInsert(proxy.getEnergy(), sg, s, getRequest()); @@ -227,7 +236,8 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O if (s.getStackSize() == 0) continue; NBTTagCompound tag = new NBTTagCompound(); NBTTagCompound tagFluidStack = new NBTTagCompound(); - s.getFluidStack().writeToNBT(tagFluidStack); + s.getFluidStack() + .writeToNBT(tagFluidStack); tag.setTag("fluidStack", tagFluidStack); tag.setLong("size", s.getStackSize()); fluids.appendTag(tag); @@ -247,8 +257,9 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O for (int i = 0; i < l.tagCount(); ++i) { NBTTagCompound tag = l.getCompoundTagAt(i); NBTTagCompound tagFluidStack = tag.getCompoundTag("fluidStack"); - final IAEFluidStack s = AEApi.instance().storage() - .createFluidStack(GT_Utility.loadFluid(tagFluidStack)); + final IAEFluidStack s = AEApi.instance() + .storage() + .createFluidStack(GT_Utility.loadFluid(tagFluidStack)); if (s != null) { s.setStackSize(tag.getLong("size")); fluidCache.add(s); @@ -286,7 +297,8 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O int counter = 0; for (IAEFluidStack s : fluidCache) { ss.add( - s.getFluidStack().getLocalizedName() + ": " + s.getFluidStack() + .getLocalizedName() + ": " + EnumChatFormatting.GOLD + nc.toWideReadableForm(s.getStackSize()) + " mB" diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java index 34589d2c1c..ad55276576 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java @@ -56,28 +56,52 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba "", // NEI name TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER), - TextureFactory.builder().addIcon(OVERLAY_SIDE_ROCK_BREAKER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_ROCK_BREAKER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_ROCK_BREAKER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_ROCK_BREAKER), - TextureFactory.builder().addIcon(OVERLAY_TOP_ROCK_BREAKER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_ROCK_BREAKER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ROCK_BREAKER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ROCK_BREAKER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_ROCK_BREAKER), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_GLOW).glow().build())); + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_GLOW) + .glow() + .build())); radius = aRadius; step = aStep; } @@ -142,10 +166,14 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba GT_Utility.ItemNBT.setAdvancedProspectionData( mTier, aStack, - this.getBaseMetaTileEntity().getXCoord(), - this.getBaseMetaTileEntity().getYCoord(), - this.getBaseMetaTileEntity().getZCoord(), - this.getBaseMetaTileEntity().getWorld().provider.dimensionId, + this.getBaseMetaTileEntity() + .getXCoord(), + this.getBaseMetaTileEntity() + .getYCoord(), + this.getBaseMetaTileEntity() + .getZCoord(), + this.getBaseMetaTileEntity() + .getWorld().provider.dimensionId, tOils, GT_Utility.sortByValueToList(tOres), radius); @@ -173,9 +201,10 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba for (int i = 0; i < oilfieldSize; i++) { for (int j = 0; j < oilfieldSize; j++) { - Chunk tChunk = getBaseMetaTileEntity().getWorld().getChunkFromChunkCoords( - xChunk + i + x * oilfieldSize, - zChunk + j + z * oilfieldSize); + Chunk tChunk = getBaseMetaTileEntity().getWorld() + .getChunkFromChunkCoords( + xChunk + i + x * oilfieldSize, + zChunk + j + z * oilfieldSize); FluidStack tFluid = undergroundOilReadInformation(tChunk); if (tFluid != null) { if (tFluid.amount > max) max = tFluid.amount; @@ -187,17 +216,28 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba } } - aOils.add(++oilFieldCount + "," + min + "-" + max + "," + tFluids.get(cInts).getLocalizedName()); + aOils.add( + ++oilFieldCount + "," + + min + + "-" + + max + + "," + + tFluids.get(cInts) + .getLocalizedName()); } } } catch (Exception ignored) {} } private void prospectOres(Map<String, Integer> aOres) { - int tLeftXBound = this.getBaseMetaTileEntity().getXCoord() - radius; + int tLeftXBound = this.getBaseMetaTileEntity() + .getXCoord() + - radius; int tRightXBound = tLeftXBound + 2 * radius; - int tLeftZBound = this.getBaseMetaTileEntity().getZCoord() - radius; + int tLeftZBound = this.getBaseMetaTileEntity() + .getZCoord() + - radius; int tRightZBound = tLeftZBound + 2 * radius; for (int i = tLeftXBound; i <= tRightXBound; i += step) { @@ -217,17 +257,20 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba private void prospectHole(int i, int k, Map<String, Integer> aOres) { String tFoundOre; - for (int j = this.getBaseMetaTileEntity().getYCoord(); j > 0; j--) { + for (int j = this.getBaseMetaTileEntity() + .getYCoord(); j > 0; j--) { tFoundOre = checkForOre(i, j, k); if (tFoundOre != null) countOre(aOres, tFoundOre, cX, cZ); } } private String checkForOre(int x, int y, int z) { - Block tBlock = this.getBaseMetaTileEntity().getBlock(x, y, z); + Block tBlock = this.getBaseMetaTileEntity() + .getBlock(x, y, z); if (tBlock instanceof GT_Block_Ores_Abstract) { - TileEntity tTileEntity = getBaseMetaTileEntity().getWorld().getTileEntity(x, y, z); + TileEntity tTileEntity = getBaseMetaTileEntity().getWorld() + .getTileEntity(x, y, z); if ((tTileEntity instanceof GT_TileEntity_Ores) && (((GT_TileEntity_Ores) tTileEntity).mMetaData < 16000)) { // Filtering // small @@ -238,10 +281,12 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba if ((tMaterial != null) && (tMaterial != Materials._NULL)) return tMaterial.mDefaultLocalName; } } else { - int tMetaID = getBaseMetaTileEntity().getWorld().getBlockMetadata(x, y, z); + int tMetaID = getBaseMetaTileEntity().getWorld() + .getBlockMetadata(x, y, z); ItemStack is = new ItemStack(tBlock, 1, tMetaID); ItemData association = GT_OreDictUnificator.getAssociation(is); - if ((association != null) && (association.mPrefix.toString().startsWith("ore"))) + if ((association != null) && (association.mPrefix.toString() + .startsWith("ore"))) return association.mMaterial.mMaterial.mDefaultLocalName; else if (GT_Utility.isOre(tBlock, tMetaID)) return tBlock.getLocalizedName(); } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java index f94b8404fa..1b30282781 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java @@ -34,28 +34,52 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_BOXINATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_BOXINATOR_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_BOXINATOR_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_BOXINATOR), - TextureFactory.builder().addIcon(OVERLAY_SIDE_BOXINATOR_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_BOXINATOR_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_BOXINATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_BOXINATOR_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_BOXINATOR_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_BOXINATOR), - TextureFactory.builder().addIcon(OVERLAY_FRONT_BOXINATOR_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_BOXINATOR_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_BOXINATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_BOXINATOR_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_BOXINATOR_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_BOXINATOR), - TextureFactory.builder().addIcon(OVERLAY_TOP_BOXINATOR_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_BOXINATOR_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_BOXINATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_BOXINATOR_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_BOXINATOR_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_BOXINATOR), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_BOXINATOR_GLOW).glow().build())); + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_BOXINATOR_GLOW) + .glow() + .build())); } public GT_MetaTileEntity_Boxinator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, @@ -203,8 +227,16 @@ public class GT_MetaTileEntity_Boxinator extends GT_MetaTileEntity_BasicMachine && GT_ModHandler.getRecipeOutput(aStack, aStack, null, aStack, aStack) != null) { return true; } - return ItemList.Schematic_3by3.isStackEqual(getInputAt(1)) && (GT_ModHandler - .getRecipeOutput(aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack, aStack) != null); + return ItemList.Schematic_3by3.isStackEqual(getInputAt(1)) && (GT_ModHandler.getRecipeOutput( + aStack, + aStack, + aStack, + aStack, + aStack, + aStack, + aStack, + aStack, + aStack) != null); } else { return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.containsInput(aStack); } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CuringOven.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CuringOven.java index 2cab223249..fb0bbfb4c2 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CuringOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CuringOven.java @@ -31,16 +31,16 @@ public class GT_MetaTileEntity_CuringOven extends GT_MetaTileEntity_BasicMachine 1, "E_Oven.png", "", - TextureFactory - .of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_SIDE_ACTIVE")), + TextureFactory.of( + new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_SIDE_ACTIVE")), TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_SIDE")), - TextureFactory - .of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_FRONT_ACTIVE")), + TextureFactory.of( + new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_FRONT_ACTIVE")), TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_FRONT")), TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_TOP_ACTIVE")), TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_TOP")), - TextureFactory - .of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_BOTTOM_ACTIVE")), + TextureFactory.of( + new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_BOTTOM_ACTIVE")), TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/ELECTRIC_OVEN/OVERLAY_BOTTOM"))); } @@ -86,7 +86,8 @@ public class GT_MetaTileEntity_CuringOven extends GT_MetaTileEntity_BasicMachine NBTTagCompound aNBT = tStack.getTagCompound(); if (aNBT != null) { int tHeat = 300; - long tWorldTime = getBaseMetaTileEntity().getWorld().getTotalWorldTime(); + long tWorldTime = getBaseMetaTileEntity().getWorld() + .getTotalWorldTime(); aNBT = aNBT.getCompoundTag("GT.ToolStats"); if (aNBT != null && aNBT.hasKey("Heat")) { tHeat = aNBT.getInteger("Heat"); diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java index 595953c06f..a0d22efd5d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java @@ -58,28 +58,52 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi // Textures TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_DISASSEMBLER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_DISASSEMBLER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_DISASSEMBLER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_DISASSEMBLER), - TextureFactory.builder().addIcon(OVERLAY_SIDE_DISASSEMBLER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_DISASSEMBLER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_DISASSEMBLER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_DISASSEMBLER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_DISASSEMBLER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_DISASSEMBLER), - TextureFactory.builder().addIcon(OVERLAY_FRONT_DISASSEMBLER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_DISASSEMBLER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_DISASSEMBLER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_DISASSEMBLER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_DISASSEMBLER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_DISASSEMBLER), - TextureFactory.builder().addIcon(OVERLAY_TOP_DISASSEMBLER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_DISASSEMBLER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_DISASSEMBLER), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_DISASSEMBLER_GLOW).glow().build())); + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_DISASSEMBLER_GLOW) + .glow() + .build())); } public GT_MetaTileEntity_Disassembler(String aName, int aTier, String aDescription, ITexture[][][] aTextures, @@ -184,7 +208,8 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi if (GT_Utility.isStackInvalid(is)) return DID_NOT_FIND_RECIPE; if (is.getItem() instanceof GT_MetaGenerated_Tool || isCircuit(is) - || blackList.stream().anyMatch(t -> GT_Utility.areStacksEqual(t.toStack(), is, true)) + || blackList.stream() + .anyMatch(t -> GT_Utility.areStacksEqual(t.toStack(), is, true)) || compareToUnpacker(is)) return DID_NOT_FIND_RECIPE; @@ -200,9 +225,10 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi ItemStack in = is.copy(); in.stackSize = 1; if (stack.isStackEqual(in) && stack.mStackSize <= is.stackSize) { - return setOutputsAndTime(outputHardOverrides.get(stack).toArray(new ItemStack[0]), stack.mStackSize) - ? FOUND_AND_SUCCESSFULLY_USED_RECIPE - : DID_NOT_FIND_RECIPE; + return setOutputsAndTime( + outputHardOverrides.get(stack) + .toArray(new ItemStack[0]), + stack.mStackSize) ? FOUND_AND_SUCCESSFULLY_USED_RECIPE : DID_NOT_FIND_RECIPE; } } return null; @@ -250,8 +276,12 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi } private int checkRecipeMap() { - GT_Recipe gt_recipe = GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes - .findRecipe(this.getBaseMetaTileEntity(), true, this.maxEUInput(), null, this.getAllInputs()); + GT_Recipe gt_recipe = GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.findRecipe( + this.getBaseMetaTileEntity(), + true, + this.maxEUInput(), + null, + this.getAllInputs()); if (gt_recipe == null) return DID_NOT_FIND_RECIPE; if (gt_recipe.isRecipeInputEqual(false, null, this.getAllInputs())) { if (gt_recipe.mSpecialValue == -100) { @@ -285,17 +315,27 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi } private static DissassembleReference ensureDowncasting(Collection<? extends DissassembleReference> recipes) { - ItemStack[] inputs = recipes.stream().findFirst().orElseThrow(NullPointerException::new).inputs; - int EUt = recipes.stream().findFirst().orElseThrow(NullPointerException::new).EUt; + ItemStack[] inputs = recipes.stream() + .findFirst() + .orElseThrow(NullPointerException::new).inputs; + int EUt = recipes.stream() + .findFirst() + .orElseThrow(NullPointerException::new).EUt; ItemStack[] output = new ItemStack[inputs.length]; List<GT_Recipe> recipesColl = null; - if (recipes.size() > 1) recipesColl = recipes.stream().skip(1).map(x -> x.recipe).collect(Collectors.toList()); + if (recipes.size() > 1) recipesColl = recipes.stream() + .skip(1) + .map(x -> x.recipe) + .collect(Collectors.toList()); handleRecipeTransformation(inputs, output, recipesColl); return new DissassembleReference( - recipes.stream().mapToInt(x -> x.stackSize).min().orElseThrow(NumberFormatException::new), + recipes.stream() + .mapToInt(x -> x.stackSize) + .min() + .orElseThrow(NumberFormatException::new), output, null, EUt); @@ -305,8 +345,9 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi List<? extends GT_Recipe> recipesColl) { for (int i = 0, inputsLength = inputs.length; i < inputsLength; i++) { Set<ItemStack[]> inputsStacks = null; - if (recipesColl != null) - inputsStacks = recipesColl.stream().map(x -> x.mInputs).collect(Collectors.toSet()); + if (recipesColl != null) inputsStacks = recipesColl.stream() + .map(x -> x.mInputs) + .collect(Collectors.toSet()); handleRecipeTransformationInternal(inputs, output, inputsStacks, i); } addOthersAndHandleAlwaysReplace(inputs, output); @@ -360,25 +401,29 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi private static ItemStack handleUnification(ItemStack stack) { for (int oreID : OreDictionary.getOreIDs(stack)) { - for (int i = 0; i < OreDictionaryOverride[0].length; i++) - if (OreDictionary.getOreName(oreID).equals(OreDictionaryOverride[0][i])) { - ItemStack ret = ((ItemStack) OreDictionaryOverride[1][i]).copy(); - ret.stackSize = stack.stackSize; - return ret; - } + for (int i = 0; i < OreDictionaryOverride[0].length; i++) if (OreDictionary.getOreName(oreID) + .equals( + OreDictionaryOverride[0][i])) { + ItemStack ret = ((ItemStack) OreDictionaryOverride[1][i]).copy(); + ret.stackSize = stack.stackSize; + return ret; + } } return GT_OreDictUnificator.get(stack); } private static ItemStack handleWildcard(ItemStack stack) { - if (stack != null && stack.getItemDamage() == OreDictionary.WILDCARD_VALUE && !stack.getItem().isDamageable()) { + if (stack != null && stack.getItemDamage() == OreDictionary.WILDCARD_VALUE + && !stack.getItem() + .isDamageable()) { stack.setItemDamage(0); } return stack; } private static ItemStack handleContainerItem(ItemStack stack) { - if (stack != null && stack.getItem().hasContainerItem(stack)) { + if (stack != null && stack.getItem() + .hasContainerItem(stack)) { return null; } return stack; @@ -421,14 +466,20 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi } private static void handleAnyMaterials(Materials first, AtomicReference<? super Materials> toRpl) { - if (first.mOreReRegistrations.stream().anyMatch(y -> y.equals(Materials.AnyIron))) toRpl.set(Materials.Iron); - else if (first.mOreReRegistrations.stream().anyMatch(y -> y.equals(Materials.AnyCopper))) + if (first.mOreReRegistrations.stream() + .anyMatch(y -> y.equals(Materials.AnyIron))) + toRpl.set(Materials.Iron); + else if (first.mOreReRegistrations.stream() + .anyMatch(y -> y.equals(Materials.AnyCopper))) toRpl.set(Materials.Copper); - else if (first.mOreReRegistrations.stream().anyMatch(y -> y.equals(Materials.AnyRubber))) + else if (first.mOreReRegistrations.stream() + .anyMatch(y -> y.equals(Materials.AnyRubber))) toRpl.set(Materials.Rubber); - else if (first.mOreReRegistrations.stream().anyMatch(y -> y.equals(Materials.AnyBronze))) + else if (first.mOreReRegistrations.stream() + .anyMatch(y -> y.equals(Materials.AnyBronze))) toRpl.set(Materials.Bronze); - else if (first.mOreReRegistrations.stream().anyMatch(y -> y.equals(Materials.AnySyntheticRubber))) + else if (first.mOreReRegistrations.stream() + .anyMatch(y -> y.equals(Materials.AnySyntheticRubber))) toRpl.set(Materials.Rubber); } @@ -515,13 +566,31 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi AtomicInteger stacksize = new AtomicInteger(); // Check Recipe Maps for creation of Item List<DissassembleReference> possibleRecipes = GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList.stream() - .filter(x -> Arrays.stream(x.mOutputs).anyMatch(y -> { - ItemStack out = is.copy(); - out.stackSize = y.stackSize; - boolean isDone = GT_Utility.areStacksEqual(y, out, true) && y.stackSize <= is.stackSize; - if (isDone) stacksize.set(y.stackSize); - return isDone; - })).map(x -> new DissassembleReference(stacksize.get(), x.mInputs, x)).collect(Collectors.toList()); + .filter( + x -> Arrays.stream( + x.mOutputs) + .anyMatch( + y -> { + ItemStack out = is.copy(); + out.stackSize = y.stackSize; + boolean isDone = GT_Utility.areStacksEqual( + y, + out, + true) + && y.stackSize + <= is.stackSize; + if (isDone) + stacksize.set( + y.stackSize); + return isDone; + })) + .map( + x -> new DissassembleReference( + stacksize.get(), + x.mInputs, + x)) + .collect( + Collectors.toList()); // Is there only one way to create it? if (possibleRecipes.size() == 1) return possibleRecipes; @@ -529,20 +598,26 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi // There are Multiple Ways -> Get recipe with cheapest inputs // More Inputs should mean cheaper Materials return possibleRecipes.stream() - .sorted(Comparator.comparingDouble(GT_MetaTileEntity_Disassembler::getCheaperInputs)) - .collect(Collectors.toList()); + .sorted(Comparator.comparingDouble(GT_MetaTileEntity_Disassembler::getCheaperInputs)) + .collect(Collectors.toList()); } private static double getCheaperInputs(GT_MetaTileEntity_Disassembler.DissassembleReference x) { - double fluidInputValueRaw = Arrays.stream(x.recipe.mFluidInputs).flatMapToInt(f -> IntStream.of(f.amount)) - .sum(); + double fluidInputValueRaw = Arrays.stream(x.recipe.mFluidInputs) + .flatMapToInt(f -> IntStream.of(f.amount)) + .sum(); fluidInputValueRaw = fluidInputValueRaw > 0 ? fluidInputValueRaw : 144D; - double inputValue = Arrays.stream(x.inputs).flatMapToInt(f -> IntStream.of(f.stackSize)).sum() + double inputValue = Arrays.stream(x.inputs) + .flatMapToInt(f -> IntStream.of(f.stackSize)) + .sum() + (fluidInputValueRaw / 144D); - double fluidOutputValueRaw = Arrays.stream(x.recipe.mFluidOutputs).flatMapToInt(f -> IntStream.of(f.amount)) - .sum(); + double fluidOutputValueRaw = Arrays.stream(x.recipe.mFluidOutputs) + .flatMapToInt(f -> IntStream.of(f.amount)) + .sum(); fluidOutputValueRaw = fluidOutputValueRaw > 0 ? fluidOutputValueRaw : 144D; - double outputValue = Arrays.stream(x.recipe.mOutputs).flatMapToInt(f -> IntStream.of(f.stackSize)).sum() + double outputValue = Arrays.stream(x.recipe.mOutputs) + .flatMapToInt(f -> IntStream.of(f.stackSize)) + .sum() + (fluidOutputValueRaw / 144D); return outputValue / inputValue; } @@ -556,7 +631,9 @@ public class GT_MetaTileEntity_Disassembler extends GT_MetaTileEntity_BasicMachi ItemStack aStack) { return super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, aSide, aStack) && aStack.getTagCompound() != null - && aStack.getTagCompound().getCompoundTag("GT.CraftingComponents") != null; + && aStack.getTagCompound() + .getCompoundTag("GT.CraftingComponents") + != null; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java index d9dc75822d..70b9ecbc22 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java @@ -107,28 +107,52 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_INDUSTRIAL_APIARY), - TextureFactory.builder().addIcon(OVERLAY_SIDE_INDUSTRIAL_APIARY_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_INDUSTRIAL_APIARY_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_INDUSTRIAL_APIARY), - TextureFactory.builder().addIcon(OVERLAY_FRONT_INDUSTRIAL_APIARY_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_INDUSTRIAL_APIARY_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_INDUSTRIAL_APIARY), - TextureFactory.builder().addIcon(OVERLAY_TOP_INDUSTRIAL_APIARY_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_INDUSTRIAL_APIARY_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_INDUSTRIAL_APIARY), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_INDUSTRIAL_APIARY_GLOW).glow().build())); + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_INDUSTRIAL_APIARY_GLOW) + .glow() + .build())); } public GT_MetaTileEntity_IndustrialApiary(String aName, int aTier, String aDescription, ITexture[][][] aTextures, @@ -236,8 +260,9 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM for (int z = 0; z < icycles; z++) { final IIndividual p = bee.retrievePollen(this); if (p != null) { - final ItemStack s = p.getGenome().getSpeciesRoot() - .getMemberStack(p, EnumGermlingType.POLLEN.ordinal()); + final ItemStack s = p.getGenome() + .getSpeciesRoot() + .getMemberStack(p, EnumGermlingType.POLLEN.ordinal()); if (s != null) { final GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(s); pollen.computeIfAbsent(id, k -> { @@ -264,7 +289,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM final HashMap<GT_Utility.ItemId, Float> drops = new HashMap<>(); final HashMap<GT_Utility.ItemId, ItemStack> dropstacks = new HashMap<>(); - for (Map.Entry<ItemStack, Float> entry : primary.getProductChances().entrySet()) { + for (Map.Entry<ItemStack, Float> entry : primary.getProductChances() + .entrySet()) { final GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(entry.getKey()); drops.merge( id, @@ -273,7 +299,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM Float::sum); dropstacks.computeIfAbsent(id, k -> entry.getKey()); } - for (Map.Entry<ItemStack, Float> entry : secondary.getProductChances().entrySet()) { + for (Map.Entry<ItemStack, Float> entry : secondary.getProductChances() + .entrySet()) { final GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(entry.getKey()); drops.merge( id, @@ -284,16 +311,24 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM dropstacks.computeIfAbsent(id, k -> entry.getKey()); } if (primary.isJubilant(genome, this) && secondary.isJubilant(genome, this)) - for (Map.Entry<ItemStack, Float> entry : primary.getSpecialtyChances().entrySet()) { - final GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy(entry.getKey()); - drops.merge( - id, - Bee.getFinalChance(entry.getValue(), speed, prodMod, 8f) - * (float) entry.getKey().stackSize - * cycles, - Float::sum); - dropstacks.computeIfAbsent(id, k -> entry.getKey()); - } + for (Map.Entry<ItemStack, Float> entry : primary.getSpecialtyChances() + .entrySet()) { + final GT_Utility.ItemId id = GT_Utility.ItemId.createNoCopy( + entry.getKey()); + drops.merge( + id, + Bee.getFinalChance( + entry.getValue(), + speed, + prodMod, + 8f) + * (float) entry.getKey().stackSize + * cycles, + Float::sum); + dropstacks.computeIfAbsent( + id, + k -> entry.getKey()); + } int i = 0; final int imax = mOutputItems.length; @@ -334,11 +369,12 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM setQueen(null); for (Map.Entry<GT_Utility.ItemId, Float> entry : drops.entrySet()) { - final ItemStack s = dropstacks.get(entry.getKey()).copy(); - s.stackSize = entry.getValue().intValue() - + (getWorld().rand.nextFloat() < (entry.getValue() - (float) entry.getValue().intValue()) - ? 1 - : 0); + final ItemStack s = dropstacks.get(entry.getKey()) + .copy(); + s.stackSize = entry.getValue() + .intValue() + + (getWorld().rand.nextFloat() < (entry.getValue() - (float) entry.getValue() + .intValue()) ? 1 : 0); if (s.stackSize > 0 && i < imax) while (true) { if (s.stackSize <= s.getMaxStackSize()) { this.mOutputItems[i++] = s; @@ -389,7 +425,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM princess.writeToNBT(nbttagcompound); this.mOutputItems[0] = new ItemStack(PluginApiculture.items.beeQueenGE); this.mOutputItems[0].setTagCompound(nbttagcompound); - beeRoot.getBreedingTracker(getWorld(), getOwner()).registerQueen(princess); + beeRoot.getBreedingTracker(getWorld(), getOwner()) + .registerQueen(princess); setQueen(null); getDrone().stackSize -= 1; @@ -569,8 +606,9 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM } else if (i == 0 && j == 0 && beeRoot.isMember(mOutputItems[0], EnumBeeType.QUEEN.ordinal())) if (aBaseMetaTileEntity.addStackToSlot(queen, mOutputItems[0])) break; - if (aBaseMetaTileEntity - .addStackToSlot(getOutputSlot() + ((j + i) % mOutputItems.length), mOutputItems[i])) + if (aBaseMetaTileEntity.addStackToSlot( + getOutputSlot() + ((j + i) % mOutputItems.length), + mOutputItems[i])) break; } Arrays.fill(mOutputItems, null); @@ -581,8 +619,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM aBaseMetaTileEntity.setActive(false); if (doesAutoOutput() && !isOutputEmpty() && aBaseMetaTileEntity.getFrontFacing() != mMainFacing) { - final TileEntity tTileEntity2 = aBaseMetaTileEntity - .getTileEntityAtSide(aBaseMetaTileEntity.getFrontFacing()); + final TileEntity tTileEntity2 = aBaseMetaTileEntity.getTileEntityAtSide( + aBaseMetaTileEntity.getFrontFacing()); final long tStoredEnergy = aBaseMetaTileEntity.getUniversalEnergyStored(); int tMaxStacks = (int) (tStoredEnergy / 64L); if (tMaxStacks > mOutputItems.length) tMaxStacks = mOutputItems.length; @@ -609,7 +647,10 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM } public void cancelProcess() { - if (this.getBaseMetaTileEntity().isActive() && this.getBaseMetaTileEntity().isServerSide() + if (this.getBaseMetaTileEntity() + .isActive() + && this.getBaseMetaTileEntity() + .isServerSide() && usedQueen != null && beeRoot.isMember(usedQueen, EnumBeeType.QUEEN.ordinal())) { Arrays.fill(mOutputItems, null); @@ -617,9 +658,11 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM mProgresstime = 0; mMaxProgresstime = 0; mStuttering = false; - this.getBaseMetaTileEntity().setActive(false); + this.getBaseMetaTileEntity() + .setActive(false); setQueen(usedQueen); - this.getBaseMetaTileEntity().disableWorking(); + this.getBaseMetaTileEntity() + .disableWorking(); } } @@ -638,9 +681,13 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM if (s == null) continue; if (GT_Utility.areStacksEqual(getStackInSlot(i), aStack)) return false; if (GT_ApiaryUpgrade.isUpgrade(aStack)) { - if (!GT_ApiaryUpgrade.getUpgrade(aStack).isAllowedToWorkWith(getStackInSlot(i))) return false; + if (!GT_ApiaryUpgrade.getUpgrade(aStack) + .isAllowedToWorkWith(getStackInSlot(i))) + return false; } else if (GT_ApiaryUpgrade.isUpgrade(s)) { - if (!GT_ApiaryUpgrade.getUpgrade(s).isAllowedToWorkWith(aStack)) return false; + if (!GT_ApiaryUpgrade.getUpgrade(s) + .isAllowedToWorkWith(aStack)) + return false; } } return true; @@ -687,17 +734,20 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM @Override public int getBlockLightValue() { - return this.getBaseMetaTileEntity().getLightLevelAtSide((byte) 1); + return this.getBaseMetaTileEntity() + .getLightLevelAtSide((byte) 1); } @Override public boolean canBlockSeeTheSky() { - return this.getBaseMetaTileEntity().getSkyAtSide((byte) 1); + return this.getBaseMetaTileEntity() + .getSkyAtSide((byte) 1); } @Override public World getWorld() { - return this.getBaseMetaTileEntity().getWorld(); + return this.getBaseMetaTileEntity() + .getWorld(); } GameProfile owner = null; @@ -705,8 +755,10 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM @Override public GameProfile getOwner() { if (owner == null) owner = new GameProfile( - this.getBaseMetaTileEntity().getOwnerUuid(), - this.getBaseMetaTileEntity().getOwnerName()); + this.getBaseMetaTileEntity() + .getOwnerUuid(), + this.getBaseMetaTileEntity() + .getOwnerName()); return owner; } @@ -720,7 +772,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM @Override public BiomeGenBase getBiome() { - if (biomeOverride == null) return this.getBaseMetaTileEntity().getBiome(); + if (biomeOverride == null) return this.getBaseMetaTileEntity() + .getBiome(); return biomeOverride; } @@ -742,7 +795,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM @Override public ChunkCoordinates getCoordinates() { - return this.getBaseMetaTileEntity().getCoords(); + return this.getBaseMetaTileEntity() + .getCoords(); } // endregion @@ -823,7 +877,9 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM private int flowerBlockMeta; private boolean checkFlower(IBee bee) { - final String flowerType = bee.getGenome().getFlowerProvider().getFlowerType(); + final String flowerType = bee.getGenome() + .getFlowerProvider() + .getFlowerType(); if (!this.flowerType.equals(flowerType)) flowercoords = null; if (flowercoords != null) { if (getWorld().getBlock(flowercoords.posX, flowercoords.posY, flowercoords.posZ) != flowerBlock @@ -838,8 +894,10 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM flowercoords = null; else { flowerBlock = getWorld().getBlock(flowercoords.posX, flowercoords.posY, flowercoords.posZ); - flowerBlockMeta = getWorld() - .getBlockMetadata(flowercoords.posX, flowercoords.posY, flowercoords.posZ); + flowerBlockMeta = getWorld().getBlockMetadata( + flowercoords.posX, + flowercoords.posY, + flowercoords.posZ); } } if (flowercoords == null) { @@ -1069,101 +1127,148 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( new SlotWidget(new ApiarySlot(inventoryHandler, queen)) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_BEE_QUEEN) - .setPos(36, 21)) - .widget( - new SlotWidget(new ApiarySlot(inventoryHandler, drone)) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_BEE_DRONE) - .setPos(36, 41)) - .widget( - SlotGroup.ofItemHandler(inventoryHandler, 2).startFromSlot(7).endAtSlot(10) + .setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_BEE_QUEEN) + .setPos(36, 21)) + .widget( + new SlotWidget(new ApiarySlot(inventoryHandler, drone)).setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_BEE_DRONE) + .setPos(36, 41)) + .widget( + SlotGroup.ofItemHandler(inventoryHandler, 2) + .startFromSlot(7) + .endAtSlot(10) .slotCreator(i -> new ApiarySlot(inventoryHandler, i)) .applyForWidget( widget -> widget.setGTTooltip(() -> mTooltipCache.getData(UPGRADE_TOOLTIP)) - .setTooltipShowUpDelay(TOOLTIP_DELAY)) - .build().setPos(61, 23)); + .setTooltipShowUpDelay(TOOLTIP_DELAY)) + .build() + .setPos(61, 23)); super.addUIWidgets(builder, buildContext); builder.widget( new ProgressBar().setProgress(() -> (float) getProgresstime() / Math.max(maxProgresstime(), 1)) - .setTexture(GT_UITextures.PROGRESSBAR_ARROW, 20).setPos(70, 3).setSize(20, 18)) - .widget( - new ButtonWidget().setOnClick((clickData, widget) -> cancelProcess()) - .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_CROSS) - .setGTTooltip(() -> mTooltipCache.getData(CANCEL_PROCESS_TOOLTIP)) - .setTooltipShowUpDelay(TOOLTIP_DELAY).setPos(7, 26).setSize(18, 18)) - .widget(new DrawableWidget().setDrawable(GT_UITextures.PICTURE_INFORMATION).setGTTooltip(() -> { - final String energyreq = GT_Utility.formatNumbers( - (int) ((float) GT_MetaTileEntity_IndustrialApiary.baseEUtUsage * getEnergyModifier() - * getAcceleration()) + getAdditionalEnergyUsage()); - final String Temp = StatCollector.translateToLocal(getTemperature().getName()); - final String Hum = StatCollector.translateToLocal(getHumidity().getName()); - if (getUsedQueen() != null - && BeeManager.beeRoot.isMember(getUsedQueen(), EnumBeeType.QUEEN.ordinal())) { - final IBee bee = BeeManager.beeRoot.getMember(getUsedQueen()); - if (bee.isAnalyzed()) { - final IBeeGenome genome = bee.getGenome(); - final IBeeModifier mod = BeeManager.beeRoot.getBeekeepingMode(getWorld()).getBeeModifier(); - final float tmod = getTerritoryModifier(null, 1f) * mod.getTerritoryModifier(null, 1f); - final int[] t = Arrays.stream(genome.getTerritory()).map(i -> (int) ((float) i * tmod)) - .toArray(); - return mTooltipCache.getUncachedTooltipData( - INFO_WITH_BEE_TOOLTIP, - energyreq, - Temp, - Hum, - genome.getSpeed(), - getProductionModifier(null, 1f) * mod.getProductionModifier(null, 1f), - Math.round( - getFloweringModifier(null, 1f) * genome.getFlowering() - * mod.getFloweringModifier(null, 1f)), - Math.round( - getLifespanModifier(null, null, 1f) * genome.getLifespan() - * mod.getLifespanModifier(null, null, 1f)), - t[0], - t[1], - t[2]); - } - } - return mTooltipCache.getUncachedTooltipData(INFO_TOOLTIP, energyreq, Temp, Hum); - }).attachSyncer( - new FakeSyncWidget.ItemStackSyncer(() -> usedQueen, val -> usedQueen = val), - builder, - (widget, val) -> widget.notifyTooltipChange()).setPos(163, 5).setSize(7, 18)) - .widget(new ButtonWidget().setOnClick((clickData, widget) -> { - if (clickData.mouseButton == 0) { - if (mLockedSpeed) return; - if (!clickData.shift) { - mSpeed++; - if (mSpeed > getMaxSpeed()) mSpeed = 0; - } else { - mSpeed--; - if (mSpeed < 0) mSpeed = getMaxSpeed(); - } - } else if (clickData.mouseButton == 1) { - mLockedSpeed = !mLockedSpeed; - if (mLockedSpeed) mSpeed = getMaxSpeed(); - } - }).setGTTooltip( - () -> mTooltipCache.getUncachedTooltipData( - mLockedSpeed ? SPEED_LOCKED_TOOLTIP : SPEED_TOOLTIP, - getAcceleration(), - GT_Utility.formatNumbers(getAdditionalEnergyUsage()))) - .attachSyncer( - new FakeSyncWidget.IntegerSyncer(() -> mSpeed, val -> mSpeed = val), - builder, - (widget, val) -> widget.notifyTooltipChange()) - .attachSyncer( - new FakeSyncWidget.BooleanSyncer(() -> mLockedSpeed, val -> mLockedSpeed = val), - builder, - (widget, val) -> widget.notifyTooltipChange()) - .setTooltipShowUpDelay(TOOLTIP_DELAY).setBackground(GT_UITextures.PICTURE_SQUARE_LIGHT_GRAY) - .setPos(25, 62).setSize(18, 18)) - .widget(new TextWidget("x").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(30, 63)).widget( - TextWidget.dynamicString(() -> String.valueOf(1 << mSpeed)) - // mSpeed is already synced - .setSynced(false).setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(26, 72)); + .setTexture(GT_UITextures.PROGRESSBAR_ARROW, 20) + .setPos(70, 3) + .setSize(20, 18)) + .widget( + new ButtonWidget().setOnClick((clickData, widget) -> cancelProcess()) + .setBackground( + GT_UITextures.BUTTON_STANDARD, + GT_UITextures.OVERLAY_BUTTON_CROSS) + .setGTTooltip(() -> mTooltipCache.getData(CANCEL_PROCESS_TOOLTIP)) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setPos(7, 26) + .setSize(18, 18)) + .widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_INFORMATION) + .setGTTooltip(() -> { + final String energyreq = GT_Utility.formatNumbers( + (int) ((float) GT_MetaTileEntity_IndustrialApiary.baseEUtUsage + * getEnergyModifier() + * getAcceleration()) + getAdditionalEnergyUsage()); + final String Temp = StatCollector.translateToLocal( + getTemperature().getName()); + final String Hum = StatCollector.translateToLocal( + getHumidity().getName()); + if (getUsedQueen() != null && BeeManager.beeRoot.isMember( + getUsedQueen(), + EnumBeeType.QUEEN.ordinal())) { + final IBee bee = BeeManager.beeRoot.getMember(getUsedQueen()); + if (bee.isAnalyzed()) { + final IBeeGenome genome = bee.getGenome(); + final IBeeModifier mod = BeeManager.beeRoot.getBeekeepingMode( + getWorld()) + .getBeeModifier(); + final float tmod = getTerritoryModifier(null, 1f) + * mod.getTerritoryModifier(null, 1f); + final int[] t = Arrays.stream(genome.getTerritory()) + .map(i -> (int) ((float) i * tmod)) + .toArray(); + return mTooltipCache.getUncachedTooltipData( + INFO_WITH_BEE_TOOLTIP, + energyreq, + Temp, + Hum, + genome.getSpeed(), + getProductionModifier(null, 1f) + * mod.getProductionModifier(null, 1f), + Math.round( + getFloweringModifier(null, 1f) + * genome.getFlowering() + * mod.getFloweringModifier(null, 1f)), + Math.round( + getLifespanModifier(null, null, 1f) + * genome.getLifespan() + * mod.getLifespanModifier( + null, + null, + 1f)), + t[0], + t[1], + t[2]); + } + } + return mTooltipCache.getUncachedTooltipData( + INFO_TOOLTIP, + energyreq, + Temp, + Hum); + }) + .attachSyncer( + new FakeSyncWidget.ItemStackSyncer( + () -> usedQueen, + val -> usedQueen = val), + builder, + (widget, val) -> widget.notifyTooltipChange()) + .setPos(163, 5) + .setSize(7, 18)) + .widget(new ButtonWidget().setOnClick((clickData, widget) -> { + if (clickData.mouseButton == 0) { + if (mLockedSpeed) return; + if (!clickData.shift) { + mSpeed++; + if (mSpeed > getMaxSpeed()) mSpeed = 0; + } else { + mSpeed--; + if (mSpeed < 0) mSpeed = getMaxSpeed(); + } + } else if (clickData.mouseButton == 1) { + mLockedSpeed = !mLockedSpeed; + if (mLockedSpeed) mSpeed = getMaxSpeed(); + } + }) + .setGTTooltip( + () -> mTooltipCache.getUncachedTooltipData( + mLockedSpeed ? SPEED_LOCKED_TOOLTIP : SPEED_TOOLTIP, + getAcceleration(), + GT_Utility.formatNumbers(getAdditionalEnergyUsage()))) + .attachSyncer( + new FakeSyncWidget.IntegerSyncer(() -> mSpeed, val -> mSpeed = val), + builder, + (widget, val) -> widget.notifyTooltipChange()) + .attachSyncer( + new FakeSyncWidget.BooleanSyncer( + () -> mLockedSpeed, + val -> mLockedSpeed = val), + builder, + (widget, val) -> widget.notifyTooltipChange()) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setBackground(GT_UITextures.PICTURE_SQUARE_LIGHT_GRAY) + .setPos(25, 62) + .setSize(18, 18)) + .widget( + new TextWidget("x").setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(30, 63)) + .widget( + TextWidget.dynamicString(() -> String.valueOf(1 << mSpeed)) + // mSpeed is already synced + .setSynced(false) + .setDefaultColor(COLOR_TEXT_GRAY.get()) + .setPos(26, 72)); } @Override @@ -1189,26 +1294,38 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM @Override protected DrawableWidget createErrorStatusArea(ModularWindow.Builder builder, IDrawable picture) { - return (DrawableWidget) super.createErrorStatusArea(builder, picture).setPos(100, 62).attachSyncer( - new FakeSyncWidget.ListSyncer<>(() -> Arrays.asList(mErrorStates.toArray(new IErrorState[0])), val -> { - mErrorStates.clear(); - mErrorStates.addAll(new HashSet<>(val)); - }, - (buffer, val) -> buffer.writeShort(val.getID()), - buffer -> ForestryAPI.errorStateRegistry.getErrorState(buffer.readShort())), - builder, - (widget, val) -> widget.notifyTooltipChange()); + return (DrawableWidget) super.createErrorStatusArea(builder, picture).setPos(100, 62) + .attachSyncer( + new FakeSyncWidget.ListSyncer<>( + () -> Arrays.asList( + mErrorStates.toArray( + new IErrorState[0])), + val -> { + mErrorStates.clear(); + mErrorStates.addAll( + new HashSet<>( + val)); + }, + (buffer, val) -> buffer.writeShort( + val.getID()), + buffer -> ForestryAPI.errorStateRegistry.getErrorState( + buffer.readShort())), + builder, + (widget, val) -> widget.notifyTooltipChange()); } @Override protected List<String> getErrorDescriptions() { if (!mErrorStates.isEmpty()) { - return mErrorStates.stream().map( - state -> EnumChatFormatting.RED + StatCollector.translateToLocal("for." + state.getDescription())) - .collect(Collectors.toList()); + return mErrorStates.stream() + .map( + state -> EnumChatFormatting.RED + + StatCollector.translateToLocal("for." + state.getDescription())) + .collect(Collectors.toList()); } else if (mStuttering) { - return mTooltipCache - .getData(STALLED_STUTTERING_TOOLTIP, StatCollector.translateToLocal(POWER_SOURCE_POWER)).text; + return mTooltipCache.getData( + STALLED_STUTTERING_TOOLTIP, + StatCollector.translateToLocal(POWER_SOURCE_POWER)).text; } else { return Collections.emptyList(); } @@ -1251,8 +1368,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM } } - private static final UIInfo<?, ?> IndustrialApiaryUI = GT_UIInfos.GTTileEntityUIFactory - .apply(GT_ModularUIContainer_IndustrialApiary::new); + private static final UIInfo<?, ?> IndustrialApiaryUI = GT_UIInfos.GTTileEntityUIFactory.apply( + GT_ModularUIContainer_IndustrialApiary::new); private static class GT_ModularUIContainer_IndustrialApiary extends ModularUIContainer { @@ -1277,7 +1394,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM if (slotStack == null && !slot.isItemValid(s)) return super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer); if (!GT_ApiaryUpgrade.isUpgrade(s)) return super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer); - int max = GT_ApiaryUpgrade.getUpgrade(s).getMaxNumber(); + int max = GT_ApiaryUpgrade.getUpgrade(s) + .getMaxNumber(); if (slotStack != null) max = Math.max(0, max - slotStack.stackSize); max = Math.min(max, s.stackSize); if (max == 0) return null; @@ -1305,7 +1423,8 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM } else { if (!GT_Utility.areStacksEqual(aStack, iStack)) continue; } - int max = GT_ApiaryUpgrade.getUpgrade(aStack).getMaxNumber(); + int max = GT_ApiaryUpgrade.getUpgrade(aStack) + .getMaxNumber(); if (iStack == null) { max = Math.min(max, aStack.stackSize); final ItemStack newstack = aStack.splitStack(max); diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java index d1c03e1527..2c1e46ea9e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java @@ -44,28 +44,52 @@ public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMac "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_MASSFAB_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_MASSFAB_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_MASSFAB_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_MASSFAB), - TextureFactory.builder().addIcon(OVERLAY_SIDE_MASSFAB_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_MASSFAB_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_MASSFAB_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_MASSFAB_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_MASSFAB_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_MASSFAB), - TextureFactory.builder().addIcon(OVERLAY_FRONT_MASSFAB_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_MASSFAB_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_MASSFAB_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_MASSFAB_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_MASSFAB_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_MASSFAB), - TextureFactory.builder().addIcon(OVERLAY_TOP_MASSFAB_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_MASSFAB_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_MASSFAB_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_MASSFAB_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_MASSFAB_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_MASSFAB), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_MASSFAB_GLOW).glow().build())); + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_MASSFAB_GLOW) + .glow() + .build())); EUt = V[1] * (long) Math.pow(2, mTier + 2); } @@ -105,8 +129,10 @@ public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMac @Override public void onConfigLoad(GT_Config aConfig) { super.onConfigLoad(aConfig); - sDurationMultiplier = aConfig - .get(ConfigCategories.machineconfig, "Massfabricator.UUM_Duration_Multiplier", sDurationMultiplier); + sDurationMultiplier = aConfig.get( + ConfigCategories.machineconfig, + "Massfabricator.UUM_Duration_Multiplier", + sDurationMultiplier); sUUAperUUM = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_per_UUM", sUUAperUUM); sUUASpeedBonus = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Speed_Bonus", sUUASpeedBonus); sRequiresUUA = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Requirement", sRequiresUUA); @@ -139,9 +165,9 @@ public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMac return FOUND_AND_SUCCESSFULLY_USED_RECIPE; } return sRequiresUUA || Arrays.stream(getAllInputs()) - .anyMatch(s -> ItemList.Circuit_Integrated.isStackEqual(s, true, true)) - ? FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS - : FOUND_AND_SUCCESSFULLY_USED_RECIPE; + .anyMatch(s -> ItemList.Circuit_Integrated.isStackEqual(s, true, true)) + ? FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS + : FOUND_AND_SUCCESSFULLY_USED_RECIPE; } return DID_NOT_FIND_RECIPE; } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java index 32a0ad8537..b72c456683 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java @@ -120,10 +120,15 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt boolean aActive, boolean aRedstone) { if (aSide == 0) return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1] }; if (aActive) return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], - TextureFactory.of(OVERLAY_TELEPORTER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_ACTIVE_GLOW).glow().build() }; + TextureFactory.of(OVERLAY_TELEPORTER_ACTIVE), TextureFactory.builder() + .addIcon(OVERLAY_TELEPORTER_ACTIVE_GLOW) + .glow() + .build() }; return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], TextureFactory.of(OVERLAY_TELEPORTER), - TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TELEPORTER_GLOW) + .glow() + .build() }; } @Override @@ -148,8 +153,10 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt @Override public void onConfigLoad(GT_Config aConfig) { - sInterDimensionalTeleportAllowed = aConfig - .get(ConfigCategories.machineconfig, "Teleporter.Interdimensional", true); + sInterDimensionalTeleportAllowed = aConfig.get( + ConfigCategories.machineconfig, + "Teleporter.Interdimensional", + true); mMaxLoss = Math.max(aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.MaxLoss", 50), 11); mMaxLossDistance = aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.MaxLossDistance", 10000); mPassiveEnergyUse = aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.PassiveEnergy", true); @@ -241,8 +248,8 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt } long energyUse = 10; if (mMaxLossDistance != 0) { - energyUse = GT_Utility - .safeInt(10L + (tDistance * Math.max(mMaxLoss - 10L, 0) / mMaxLossDistance)); + energyUse = GT_Utility.safeInt( + 10L + (tDistance * Math.max(mMaxLoss - 10L, 0) / mMaxLossDistance)); } energyUse = packetSize + ((V[mTier] * energyUse) / 100); if (getBaseMetaTileEntity().isUniversalEnergyStored(energyUse)) { @@ -408,26 +415,32 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setSize(90, 72).setPos(43, 4)) - .widget( - TextWidget.dynamicString(() -> "X: " + GT_Utility.parseNumberToString(mTargetX)) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 8)) - .widget( - TextWidget.dynamicString(() -> "Y: " + GT_Utility.parseNumberToString(mTargetY)) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 16)) - .widget( - TextWidget.dynamicString(() -> "Z: " + GT_Utility.parseNumberToString(mTargetZ)) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 24)) - .widget( - TextWidget.dynamicString(() -> "Dim: " + GT_Utility.parseNumberToString(mTargetD)) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 32)) - .widget( - TextWidget - .dynamicString( - () -> "Dim Valid: " + (GT_Utility.isRealDimension(mTargetD) ? "Yes" : "No")) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> hasDimensionalTeleportCapability()).setPos(46, 40)) - .widget(new FakeSyncWidget.FluidStackSyncer(() -> mFluid, val -> mFluid = val)); + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + .setSize(90, 72) + .setPos(43, 4)) + .widget( + TextWidget.dynamicString(() -> "X: " + GT_Utility.parseNumberToString(mTargetX)) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(46, 8)) + .widget( + TextWidget.dynamicString(() -> "Y: " + GT_Utility.parseNumberToString(mTargetY)) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(46, 16)) + .widget( + TextWidget.dynamicString(() -> "Z: " + GT_Utility.parseNumberToString(mTargetZ)) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(46, 24)) + .widget( + TextWidget.dynamicString(() -> "Dim: " + GT_Utility.parseNumberToString(mTargetD)) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(46, 32)) + .widget( + TextWidget.dynamicString( + () -> "Dim Valid: " + (GT_Utility.isRealDimension(mTargetD) ? "Yes" : "No")) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> hasDimensionalTeleportCapability()) + .setPos(46, 40)) + .widget(new FakeSyncWidget.FluidStackSyncer(() -> mFluid, val -> mFluid = val)); addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, -512, -64, 7); addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, -16, -1, 25); @@ -464,9 +477,11 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt private void addChangeNumberButton(ModularWindow.Builder builder, IDrawable overlay, Consumer<Integer> setter, int addNumberShift, int addNumber, int xPos, int yPos) { builder.widget( - new ButtonWidget() - .setOnClick((clickData, widget) -> setter.accept(clickData.shift ? addNumberShift : addNumber)) - .setBackground(GT_UITextures.BUTTON_STANDARD, overlay).setSize(18, 18).setPos(xPos, yPos)); + new ButtonWidget().setOnClick( + (clickData, widget) -> setter.accept(clickData.shift ? addNumberShift : addNumber)) + .setBackground(GT_UITextures.BUTTON_STANDARD, overlay) + .setSize(18, 18) + .setPos(xPos, yPos)); } @Override @@ -477,6 +492,8 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17).setPos(113, 56)); + new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()) + .setSize(17, 17) + .setPos(113, 56)); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java index 7e4d5f8165..27dea9bd00 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java @@ -74,48 +74,72 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine "Miner.png", "", TextureFactory.of( - TextureFactory - .of(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_SIDE_ACTIVE")), - TextureFactory.builder().addIcon( - new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_SIDE_ACTIVE_GLOW")) - .glow().build()), + TextureFactory.of( + new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_SIDE_ACTIVE")), + TextureFactory.builder() + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/miner/OVERLAY_SIDE_ACTIVE_GLOW")) + .glow() + .build()), TextureFactory.of( TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_SIDE")), TextureFactory.builder() - .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_SIDE_GLOW")) - .glow().build()), + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/miner/OVERLAY_SIDE_GLOW")) + .glow() + .build()), TextureFactory.of( - TextureFactory - .of(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_FRONT_ACTIVE")), - TextureFactory.builder().addIcon( - new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_FRONT_ACTIVE_GLOW")) - .glow().build()), + TextureFactory.of( + new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_FRONT_ACTIVE")), + TextureFactory.builder() + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/miner/OVERLAY_FRONT_ACTIVE_GLOW")) + .glow() + .build()), TextureFactory.of( TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_FRONT")), TextureFactory.builder() - .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_FRONT_GLOW")) - .glow().build()), + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/miner/OVERLAY_FRONT_GLOW")) + .glow() + .build()), TextureFactory.of( TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_TOP_ACTIVE")), - TextureFactory.builder().addIcon( - new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_TOP_ACTIVE_GLOW")) - .glow().build()), + TextureFactory.builder() + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/miner/OVERLAY_TOP_ACTIVE_GLOW")) + .glow() + .build()), TextureFactory.of( TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_TOP")), TextureFactory.builder() - .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_TOP_GLOW")) - .glow().build()), + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/miner/OVERLAY_TOP_GLOW")) + .glow() + .build()), TextureFactory.of( - TextureFactory - .of(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_BOTTOM_ACTIVE")), - TextureFactory.builder().addIcon( - new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_BOTTOM_ACTIVE_GLOW")) - .glow().build()), + TextureFactory.of( + new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_BOTTOM_ACTIVE")), + TextureFactory.builder() + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/miner/OVERLAY_BOTTOM_ACTIVE_GLOW")) + .glow() + .build()), TextureFactory.of( TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_BOTTOM")), TextureFactory.builder() - .addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_BOTTOM_GLOW")) - .glow().build())); + .addIcon( + new Textures.BlockIcons.CustomIcon( + "basicmachines/miner/OVERLAY_BOTTOM_GLOW")) + .glow() + .build())); mSpeed = SPEED[aTier]; radiusConfig = RADIUS[mTier]; } @@ -258,12 +282,17 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine boolean isOre; do { ChunkPosition oreBlockPos = oreBlockPositions.remove(0); - oreBlock = aBaseMetaTileEntity - .getBlockOffset(oreBlockPos.chunkPosX, oreBlockPos.chunkPosY, oreBlockPos.chunkPosZ); + oreBlock = aBaseMetaTileEntity.getBlockOffset( + oreBlockPos.chunkPosX, + oreBlockPos.chunkPosY, + oreBlockPos.chunkPosZ); x = aBaseMetaTileEntity.getXCoord() + oreBlockPos.chunkPosX; y = aBaseMetaTileEntity.getYCoord() + oreBlockPos.chunkPosY; z = aBaseMetaTileEntity.getZCoord() + oreBlockPos.chunkPosZ; - isOre = GT_Utility.isOre(oreBlock, aBaseMetaTileEntity.getWorld().getBlockMetadata(x, y, z)); + isOre = GT_Utility.isOre( + oreBlock, + aBaseMetaTileEntity.getWorld() + .getBlockMetadata(x, y, z)); } // someone else might have removed the block while (!isOre && !oreBlockPositions.isEmpty()); diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java index 054ca1694a..7a786228e4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java @@ -64,10 +64,15 @@ public class GT_MetaTileEntity_MonsterRepellent extends GT_MetaTileEntity_Tiered boolean aActive, boolean aRedstone) { if (aSide != ForgeDirection.UP.ordinal()) return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1] }; if (aActive) return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], - TextureFactory.of(OVERLAY_TELEPORTER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_ACTIVE_GLOW).glow().build() }; + TextureFactory.of(OVERLAY_TELEPORTER_ACTIVE), TextureFactory.builder() + .addIcon(OVERLAY_TELEPORTER_ACTIVE_GLOW) + .glow() + .build() }; return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], TextureFactory.of(OVERLAY_TELEPORTER), - TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TELEPORTER_GLOW) + .glow() + .build() }; } @Override @@ -96,9 +101,14 @@ public class GT_MetaTileEntity_MonsterRepellent extends GT_MetaTileEntity_Tiered @Override public void onRemoval() { - int[] tCoords = { this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), - this.getBaseMetaTileEntity().getZCoord(), - this.getBaseMetaTileEntity().getWorld().provider.dimensionId }; + int[] tCoords = { this.getBaseMetaTileEntity() + .getXCoord(), + this.getBaseMetaTileEntity() + .getYCoord(), + this.getBaseMetaTileEntity() + .getZCoord(), + this.getBaseMetaTileEntity() + .getWorld().provider.dimensionId }; GT_SpawnEventHandler.mobReps.removeIf(coords -> Arrays.equals(coords, tCoords)); } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java index f905717c5a..bae01940f9 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java @@ -34,28 +34,52 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_POTIONBREWER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_POTIONBREWER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_POTIONBREWER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_POTIONBREWER), - TextureFactory.builder().addIcon(OVERLAY_SIDE_POTIONBREWER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_POTIONBREWER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_POTIONBREWER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_POTIONBREWER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_POTIONBREWER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_POTIONBREWER), - TextureFactory.builder().addIcon(OVERLAY_FRONT_POTIONBREWER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_POTIONBREWER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_POTIONBREWER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_POTIONBREWER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_POTIONBREWER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_POTIONBREWER), - TextureFactory.builder().addIcon(OVERLAY_TOP_POTIONBREWER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_POTIONBREWER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_POTIONBREWER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_POTIONBREWER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_POTIONBREWER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_POTIONBREWER), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_POTIONBREWER_GLOW).glow().build())); + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_POTIONBREWER_GLOW) + .glow() + .build())); } public GT_MetaTileEntity_PotionBrewer(String aName, int aTier, String aDescription, ITexture[][][] aTextures, @@ -98,7 +122,8 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi FluidStack aFluid = getFillableStack(); if ((getDrainableStack() == null) && (aFluid != null) && (getInputAt(0) != null)) { - String tInputName = aFluid.getFluid().getName(); + String tInputName = aFluid.getFluid() + .getName(); if (tInputName.startsWith("potion.")) { tInputName = tInputName.replaceFirst("potion.", ""); int tFirstDot = tInputName.indexOf('.') + 1; @@ -194,7 +219,10 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi @Override public boolean isFluidInputAllowed(FluidStack aFluid) { - return (aFluid.getFluid().getName().startsWith("potion.")) || (super.isFluidInputAllowed(aFluid)); + return (aFluid.getFluid() + .getName() + .startsWith("potion.")) + || (super.isFluidInputAllowed(aFluid)); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java index 7da1ec5e43..71b01f4cc2 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java @@ -41,8 +41,8 @@ public class GT_MetaTileEntity_Printer extends GT_MetaTileEntity_BasicMachine { } else if ((GT_Utility.isStackValid(getInputAt(0))) && (getInputAt(0).stackSize > 0) && (GT_Utility.isStackInvalid(getSpecialSlot())) && (OrePrefixes.block.contains(getInputAt(0)))) { - ArrayList<ItemStack> tList = GT_OreDictUnificator - .getOres(GT_OreDictUnificator.getAssociation(getInputAt(0))); + ArrayList<ItemStack> tList = GT_OreDictUnificator.getOres( + GT_OreDictUnificator.getAssociation(getInputAt(0))); if (tList.size() > 1) { tList.add(tList.get(0)); int i = 0; diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java index 012f6e547f..db9aedb9eb 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java @@ -39,8 +39,8 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { private static final ItemStack MINING_PIPE = GT_ModHandler.getIC2Item("miningPipe", 0); private static final Block MINING_PIPE_BLOCK = GT_Utility.getBlockFromStack(MINING_PIPE); - private static final Block MINING_PIPE_TIP_BLOCK = GT_Utility - .getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 0)); + private static final Block MINING_PIPE_TIP_BLOCK = GT_Utility.getBlockFromStack( + GT_ModHandler.getIC2Item("miningPipeTip", 0)); public static int getMaxDistanceForTier(int aTier) { return (10 * ((int) Math.pow(1.6D, aTier))); @@ -366,13 +366,20 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { // 2. once per 5 tick // 3. can hold retracted pipe in inventory int tHeadY = getYOfPumpHead(); - if (tHeadY < this.getBaseMetaTileEntity().getYCoord()) { - final int tXCoord = this.getBaseMetaTileEntity().getXCoord(); - final int tZCoord = this.getBaseMetaTileEntity().getZCoord(); - this.getBaseMetaTileEntity().getWorld().setBlockToAir(tXCoord, tHeadY, tZCoord); - if (tHeadY < this.getBaseMetaTileEntity().getYCoord() - 1) { + if (tHeadY < this.getBaseMetaTileEntity() + .getYCoord()) { + final int tXCoord = this.getBaseMetaTileEntity() + .getXCoord(); + final int tZCoord = this.getBaseMetaTileEntity() + .getZCoord(); + this.getBaseMetaTileEntity() + .getWorld() + .setBlockToAir(tXCoord, tHeadY, tZCoord); + if (tHeadY < this.getBaseMetaTileEntity() + .getYCoord() + - 1) { getBaseMetaTileEntity().getWorld() - .setBlock(tXCoord, tHeadY + 1, tZCoord, MINING_PIPE_TIP_BLOCK); + .setBlock(tXCoord, tHeadY + 1, tZCoord, MINING_PIPE_TIP_BLOCK); } if (this.mInventory[0] == null) { final ItemStack copy = MINING_PIPE.copy(); @@ -443,7 +450,11 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { int x = getBaseMetaTileEntity().getXCoord(), z = getBaseMetaTileEntity().getZCoord(); if ((!consumeFluid(x, yHead - 1, z)) && (!getBaseMetaTileEntity().getBlock(x, yHead - 1, z) - .isAir(getBaseMetaTileEntity().getWorld(), x, yHead - 1, z))) { + .isAir( + getBaseMetaTileEntity().getWorld(), + x, + yHead - 1, + z))) { // Either we didn't consume a fluid, or it's a non Air block if (debugBlockPump) { GT_Log.out.println("PUMP: Did not consume fluid, or non-airblock found"); @@ -466,7 +477,8 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { } // And change the previous block to a pipe -- as long as it isn't the pump itself! if (yHead != getBaseMetaTileEntity().getYCoord()) { - getBaseMetaTileEntity().getWorld().setBlock(x, yHead, z, MINING_PIPE_BLOCK); + getBaseMetaTileEntity().getWorld() + .setBlock(x, yHead, z, MINING_PIPE_BLOCK); } getBaseMetaTileEntity().decrStackSize(0, 1); if (debugBlockPump) { @@ -491,7 +503,8 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { if (nextBlock == MINING_PIPE_BLOCK || nextBlock == MINING_PIPE_TIP_BLOCK) { // We're running into an existing set of pipes -- Turn this block into a pipe and keep going this.clearQueue(true); - getBaseMetaTileEntity().getWorld().setBlock(x, y, z, MINING_PIPE_BLOCK); + getBaseMetaTileEntity().getWorld() + .setBlock(x, y, z, MINING_PIPE_BLOCK); if (debugBlockPump) { GT_Log.out.println("PUMP: Hit pipes already in place, trying to merge"); } @@ -509,7 +522,8 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { // We're below the pump at the bottom of the pipes, we haven't found a tip; make the previous pipe a // tip! this.clearQueue(true); - getBaseMetaTileEntity().getWorld().setBlock(x, y + 1, z, MINING_PIPE_TIP_BLOCK); + getBaseMetaTileEntity().getWorld() + .setBlock(x, y + 1, z, MINING_PIPE_TIP_BLOCK); if (debugBlockPump) { GT_Log.out.println("PUMP: Did not find a tip at bottom, setting last pipe as tip"); } @@ -652,7 +666,9 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { ((IFluidBlock) aBlock).drain(getBaseMetaTileEntity().getWorld(), aX, aY, aZ, false))) { if (!isWaterOrLava) { // Only set Block to Air for non lava/water fluids - this.getBaseMetaTileEntity().getWorld().setBlockToAir(aX, aY, aZ); + this.getBaseMetaTileEntity() + .getWorld() + .setBlockToAir(aX, aY, aZ); } this.mFluid.amount += 1000; @@ -665,7 +681,8 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { } getBaseMetaTileEntity().decreaseStoredEnergyUnits(this.getEuUsagePerAction(), true); - getBaseMetaTileEntity().getWorld().setBlock(aX, aY, aZ, Blocks.air, 0, 2); + getBaseMetaTileEntity().getWorld() + .setBlock(aX, aY, aZ, Blocks.air, 0, 2); return true; } return false; diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java index 6add532358..739db376c1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java @@ -52,28 +52,52 @@ public class GT_MetaTileEntity_Replicator extends GT_MetaTileEntity_BasicMachine "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_REPLICATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_REPLICATOR_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_REPLICATOR_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_REPLICATOR), - TextureFactory.builder().addIcon(OVERLAY_SIDE_REPLICATOR_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_REPLICATOR_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_REPLICATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_REPLICATOR_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_REPLICATOR_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_REPLICATOR), - TextureFactory.builder().addIcon(OVERLAY_FRONT_REPLICATOR_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_REPLICATOR_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_REPLICATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_REPLICATOR_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_REPLICATOR_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_REPLICATOR), - TextureFactory.builder().addIcon(OVERLAY_TOP_REPLICATOR_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_REPLICATOR_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_REPLICATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_REPLICATOR_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_REPLICATOR_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_REPLICATOR), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_REPLICATOR_GLOW).glow().build())); + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_REPLICATOR_GLOW) + .glow() + .build())); } public GT_MetaTileEntity_Replicator(String aName, int aTier, String aDescription, ITexture[][][] aTextures, @@ -106,8 +130,9 @@ public class GT_MetaTileEntity_Replicator extends GT_MetaTileEntity_BasicMachine FluidStack tFluid = getFillableStack(); if ((tFluid != null) && (tFluid.isFluidEqual(Materials.UUMatter.getFluid(1L)))) { ItemStack tDataOrb = getSpecialSlot(); - if ((ItemList.Tool_DataOrb.isStackEqual(tDataOrb, false, true)) - && (Behaviour_DataOrb.getDataTitle(tDataOrb).equals("Elemental-Scan"))) { + if ((ItemList.Tool_DataOrb.isStackEqual(tDataOrb, false, true)) && (Behaviour_DataOrb.getDataTitle(tDataOrb) + .equals( + "Elemental-Scan"))) { Materials tMaterial = Element.get(Behaviour_DataOrb.getDataName(tDataOrb)).mLinkedMaterials.get(0); long tMass = cubicFluidMultiplier(MASS_OVERRIDES.getOrDefault(tMaterial, tMaterial.getMass())); if ((tFluid.amount >= tMass) && (tMass > 0L)) { @@ -169,9 +194,12 @@ public class GT_MetaTileEntity_Replicator extends GT_MetaTileEntity_BasicMachine @Override public int getCapacity() { if ((sHeaviestElementMass == 0) && (GregTech_API.sPostloadFinished)) { - sHeaviestElementMass = Materials.getMaterialsMap().values().stream() - .mapToInt(material -> (int) cubicFluidMultiplier((int) material.getMass())).max() - .orElseThrow(NoSuchElementException::new); + sHeaviestElementMass = Materials.getMaterialsMap() + .values() + .stream() + .mapToInt(material -> (int) cubicFluidMultiplier((int) material.getMass())) + .max() + .orElseThrow(NoSuchElementException::new); // Make the Number nicer =) sHeaviestElementMass = 1000 * (sHeaviestElementMass / 1000 + 1); } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java index 584164fa94..ace1e90f71 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java @@ -32,28 +32,52 @@ public class GT_MetaTileEntity_RockBreaker extends GT_MetaTileEntity_BasicMachin "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER), - TextureFactory.builder().addIcon(OVERLAY_SIDE_ROCK_BREAKER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_ROCK_BREAKER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ROCK_BREAKER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ROCK_BREAKER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_ROCK_BREAKER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_ROCK_BREAKER), - TextureFactory.builder().addIcon(OVERLAY_TOP_ROCK_BREAKER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_ROCK_BREAKER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_ROCK_BREAKER), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_GLOW).glow().build())); + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_GLOW) + .glow() + .build())); } public GT_MetaTileEntity_RockBreaker(String aName, int aTier, String aDescription, ITexture[][][] aTextures, diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java index 3f37effffa..dc3c4f7dc3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java @@ -50,28 +50,52 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_SCANNER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_SCANNER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_SCANNER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_SCANNER), - TextureFactory.builder().addIcon(OVERLAY_SIDE_SCANNER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_SCANNER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_SCANNER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_SCANNER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_SCANNER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_SCANNER), - TextureFactory.builder().addIcon(OVERLAY_FRONT_SCANNER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_SCANNER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_SCANNER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_SCANNER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_SCANNER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_SCANNER), - TextureFactory.builder().addIcon(OVERLAY_TOP_SCANNER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_SCANNER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_SCANNER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_SCANNER), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_SCANNER_GLOW).glow().build())); + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_SCANNER_GLOW) + .glow() + .build())); } public GT_MetaTileEntity_Scanner(String aName, int aTier, String aDescription, ITexture[][][] aTextures, @@ -221,9 +245,15 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { return 2; } - if ((aStack.getItem().getUnlocalizedName().contains("Schematic") - || aStack.getItem().getUnlocalizedName().contains("schematic")) - && !aStack.getItem().getUnlocalizedName().contains("Schematics")) { + if ((aStack.getItem() + .getUnlocalizedName() + .contains("Schematic") + || aStack.getItem() + .getUnlocalizedName() + .contains("schematic")) + && !aStack.getItem() + .getUnlocalizedName() + .contains("Schematics")) { if (mTier < 3) return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; String sTier = ""; @@ -232,39 +262,71 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { if (stackItemID == Item.getIdFromItem( Objects.requireNonNull( GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1L, 0)) - .getItem())) { - if (stackItemDamage == 0 && aStack.toString().equals( - Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1L, 0)) - .copy().toString())) + .getItem())) { + if (stackItemDamage == 0 && aStack.toString() + .equals( + Objects.requireNonNull( + GT_ModHandler.getModItem( + GalacticraftCore.modID, + "item.schematic", + 1L, + 0)) + .copy() + .toString())) sTier = "100"; - else if (stackItemDamage == 1 && aStack.toString().equals( - Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1L, 1)) - .copy().toString())) + else if (stackItemDamage == 1 && aStack.toString() + .equals( + Objects.requireNonNull( + GT_ModHandler.getModItem( + GalacticraftCore.modID, + "item.schematic", + 1L, + 1)) + .copy() + .toString())) sTier = "2"; } else { if (stackItemID == Item.getIdFromItem( Objects.requireNonNull( GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 0)) - .getItem())) { - if (stackItemDamage == 0 && aStack.toString().equals( - Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 0)) - .copy().toString())) + .getItem())) { + if (stackItemDamage == 0 && aStack.toString() + .equals( + Objects.requireNonNull( + GT_ModHandler.getModItem( + GalacticraftMars.modID, + "item.schematic", + 1L, + 0)) + .copy() + .toString())) sTier = "3"; - else if (stackItemDamage == 1 && aStack.toString().equals( - Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 1)) - .copy().toString())) + else if (stackItemDamage == 1 && aStack.toString() + .equals( + Objects.requireNonNull( + GT_ModHandler.getModItem( + GalacticraftMars.modID, + "item.schematic", + 1L, + 1)) + .copy() + .toString())) sTier = "101"; - else if (stackItemDamage == 2 && aStack.toString().equals( - Objects.requireNonNull( - GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1L, 2)) - .copy().toString())) + else if (stackItemDamage == 2 && aStack.toString() + .equals( + Objects.requireNonNull( + GT_ModHandler.getModItem( + GalacticraftMars.modID, + "item.schematic", + 1L, + 2)) + .copy() + .toString())) sTier = "102"; - } else if (aStack.getUnlocalizedName().matches(".*\\d+.*")) - sTier = aStack.getUnlocalizedName().split("(?<=\\D)(?=\\d)")[1].substring(0, 1); + } else if (aStack.getUnlocalizedName() + .matches(".*\\d+.*")) + sTier = aStack.getUnlocalizedName() + .split("(?<=\\D)(?=\\d)")[1].substring(0, 1); else sTier = "1"; } @@ -287,7 +349,8 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { } } if (getSpecialSlot() == null && ItemList.Tool_DataStick.isStackEqual(aStack, false, true)) { - if (GT_Utility.ItemNBT.getBookTitle(aStack).equals("Raw Prospection Data")) { + if (GT_Utility.ItemNBT.getBookTitle(aStack) + .equals("Raw Prospection Data")) { GT_Utility.ItemNBT.setBookTitle(aStack, "Analyzed Prospection Data"); GT_Utility.ItemNBT.convertProspectionData(aStack); aStack.stackSize -= 1; @@ -336,10 +399,11 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (mProgresstime >= (mMaxProgresstime - 1)) { - if ((this.mOutputItems[0] != null) - && (this.mOutputItems[0].getUnlocalizedName().equals("gt.metaitem.01.32707"))) { + if ((this.mOutputItems[0] != null) && (this.mOutputItems[0].getUnlocalizedName() + .equals("gt.metaitem.01.32707"))) { GT_Mod.achievements.issueAchievement( - aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), + aBaseMetaTileEntity.getWorld() + .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "scanning"); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java index 4e8af7d283..18929fcb55 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java @@ -47,28 +47,52 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic "", TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER), - TextureFactory.builder().addIcon(OVERLAY_SIDE_ROCK_BREAKER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_ROCK_BREAKER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_ROCK_BREAKER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_TOP_ROCK_BREAKER), - TextureFactory.builder().addIcon(OVERLAY_TOP_ROCK_BREAKER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_ROCK_BREAKER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ROCK_BREAKER_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ROCK_BREAKER_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW).glow().build()), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW) + .glow() + .build()), TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_ROCK_BREAKER), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_GLOW).glow().build())); + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_GLOW) + .glow() + .build())); } public GT_MetaTileEntity_SeismicProspector(String aName, int aTier, String aDescription, ITexture[][][] aTextures, @@ -104,7 +128,8 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic || (stackData != null && stackData.mMaterial.mMaterial == Materials.Glyceryl && aStack.stackSize >= 1) || (aStack.getItem() == ItemList.Block_Powderbarrel.getItem() - && aStack.getItemDamage() == ItemList.Block_Powderbarrel.get(1).getItemDamage() + && aStack.getItemDamage() == ItemList.Block_Powderbarrel.get(1) + .getItemDamage() && aStack.stackSize >= 8))) { if ((!aPlayer.capabilities.isCreativeMode) && (aStack.stackSize != 111)) { if (aStack.getItem() == Item.getItemFromBlock(Blocks.tnt)) { @@ -114,11 +139,12 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic } else if (aStack.getItem() == Ic2Items.dynamite.getItem()) { aStack.stackSize -= 4; } else if (aStack.getItem() == ItemList.Block_Powderbarrel.getItem() - && aStack.getItemDamage() == ItemList.Block_Powderbarrel.get(1).getItemDamage()) { - aStack.stackSize -= 8; - } else { - aStack.stackSize -= 1; - } + && aStack.getItemDamage() == ItemList.Block_Powderbarrel.get(1) + .getItemDamage()) { + aStack.stackSize -= 8; + } else { + aStack.stackSize -= 1; + } } this.ready = true; this.mMaxProgresstime = 200; @@ -135,15 +161,21 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic int max = range(); int step = step(); - for (int i = this.getBaseMetaTileEntity().getYCoord(); i > 0; i--) { + for (int i = this.getBaseMetaTileEntity() + .getYCoord(); i > 0; i--) { for (int f = min; f <= max; f += step) { for (int g = min; g <= max; g += step) { - Block tBlock = this.getBaseMetaTileEntity().getBlockOffset(f, -i, g); + Block tBlock = this.getBaseMetaTileEntity() + .getBlockOffset(f, -i, g); if ((tBlock instanceof GT_Block_Ores_Abstract)) { - TileEntity tTileEntity = getBaseMetaTileEntity().getWorld().getTileEntity( - getBaseMetaTileEntity().getXCoord() + f, - getBaseMetaTileEntity().getYCoord() + (-i), - getBaseMetaTileEntity().getZCoord() + g); + TileEntity tTileEntity = getBaseMetaTileEntity().getWorld() + .getTileEntity( + getBaseMetaTileEntity().getXCoord() + + f, + getBaseMetaTileEntity().getYCoord() + + (-i), + getBaseMetaTileEntity().getZCoord() + + g); if ((tTileEntity instanceof GT_TileEntity_Ores)) { if (((GT_TileEntity_Ores) tTileEntity).mMetaData < 16000) { Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData @@ -156,16 +188,20 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic } } } else { - int tMetaID = getBaseMetaTileEntity().getWorld().getBlockMetadata( - getBaseMetaTileEntity().getXCoord() + f, - getBaseMetaTileEntity().getYCoord() + (-i), - getBaseMetaTileEntity().getZCoord() + g); - ItemData tAssotiation = GT_OreDictUnificator - .getAssociation(new ItemStack(tBlock, 1, tMetaID)); - if ((tAssotiation != null) - && (tAssotiation.mPrefix.toString().startsWith("ore"))) { - if (!tStringList - .contains(tAssotiation.mMaterial.mMaterial.mDefaultLocalName)) { + int tMetaID = getBaseMetaTileEntity().getWorld() + .getBlockMetadata( + getBaseMetaTileEntity().getXCoord() + + f, + getBaseMetaTileEntity().getYCoord() + + (-i), + getBaseMetaTileEntity().getZCoord() + + g); + ItemData tAssotiation = GT_OreDictUnificator.getAssociation( + new ItemStack(tBlock, 1, tMetaID)); + if ((tAssotiation != null) && (tAssotiation.mPrefix.toString() + .startsWith("ore"))) { + if (!tStringList.contains( + tAssotiation.mMaterial.mMaterial.mDefaultLocalName)) { tStringList.add(tAssotiation.mMaterial.mMaterial.mDefaultLocalName); } } @@ -185,10 +221,14 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic } GT_Utility.ItemNBT.setProspectionData( aPlayer.getCurrentEquippedItem(), - this.getBaseMetaTileEntity().getXCoord(), - this.getBaseMetaTileEntity().getYCoord(), - this.getBaseMetaTileEntity().getZCoord(), - this.getBaseMetaTileEntity().getWorld().provider.dimensionId, + this.getBaseMetaTileEntity() + .getXCoord(), + this.getBaseMetaTileEntity() + .getYCoord(), + this.getBaseMetaTileEntity() + .getZCoord(), + this.getBaseMetaTileEntity() + .getWorld().provider.dimensionId, tFluid, tStringArray); } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java index 2b1f0fa349..210c55578f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java @@ -116,9 +116,9 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank int tCount = 64; for (int i = 0; i < 36; i++) { if (tPlayer.inventory.getStackInSlot(i) != null) { - tCount += (tPlayer.inventory.getStackInSlot(i).getMaxStackSize() > 1 - ? tPlayer.inventory.getStackInSlot(i).stackSize - : 64); + tCount += (tPlayer.inventory.getStackInSlot(i) + .getMaxStackSize() + > 1 ? tPlayer.inventory.getStackInSlot(i).stackSize : 64); } } for (int i = 0; i < 4; i++) { @@ -128,10 +128,12 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank } return Math.min(5.0F, tCount / 666.6F); } - if (GT_Utility.getClassName(aEntity).equals("EntityItnt")) { + if (GT_Utility.getClassName(aEntity) + .equals("EntityItnt")) { return 5.0F; } - if (GT_Utility.getClassName(aEntity).equals("EntityNuke")) { + if (GT_Utility.getClassName(aEntity) + .equals("EntityNuke")) { return 50.0F; } if ((aEntity instanceof EntityArrow)) { @@ -212,14 +214,23 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - if (aSide != this.getBaseMetaTileEntity().getFrontFacing()) return new ITexture[] { - MACHINE_CASINGS[mTier][aColorIndex + 1], TextureFactory.of(OVERLAY_TELEPORTER_SIDES), - TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_SIDES_GLOW).glow().build() }; + if (aSide != this.getBaseMetaTileEntity() + .getFrontFacing()) + return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], + TextureFactory.of(OVERLAY_TELEPORTER_SIDES), TextureFactory.builder() + .addIcon(OVERLAY_TELEPORTER_SIDES_GLOW) + .glow() + .build() }; if (aActive) return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], - TextureFactory.of(OVERLAY_TELEPORTER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_ACTIVE_GLOW).glow().build() }; + TextureFactory.of(OVERLAY_TELEPORTER_ACTIVE), TextureFactory.builder() + .addIcon(OVERLAY_TELEPORTER_ACTIVE_GLOW) + .glow() + .build() }; return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], TextureFactory.of(OVERLAY_TELEPORTER), - TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TELEPORTER_GLOW) + .glow() + .build() }; } @Override @@ -244,10 +255,14 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank @Override public void onConfigLoad(GT_Config aConfig) { - sInterDimensionalTeleportAllowed = aConfig - .get(ConfigCategories.machineconfig, "Teleporter.Interdimensional", true); - sPassiveEnergyDrain = aConfig - .get(ConfigCategories.machineconfig, "Teleporter.PassiveDrain", sPassiveEnergyDrain); + sInterDimensionalTeleportAllowed = aConfig.get( + ConfigCategories.machineconfig, + "Teleporter.Interdimensional", + true); + sPassiveEnergyDrain = aConfig.get( + ConfigCategories.machineconfig, + "Teleporter.PassiveDrain", + sPassiveEnergyDrain); sPowerMultiplyer = aConfig.get(ConfigCategories.machineconfig, "Teleporter.PowerMultipler", sPowerMultiplyer); sFPowerMultiplyer = sPowerMultiplyer / 100.0; } @@ -343,26 +358,36 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank (byte) 64, (byte) 1); if (mInventory[0] == null || mInventory[0].stackSize < tStacksize) { - getBaseMetaTileEntity() - .decreaseStoredEnergyUnits( - (long) (Math.pow(tDistance, 1.5) * tDistance - * (tStacksize - - (mInventory[0] == null ? 0 : mInventory[0].stackSize)) - * sFPowerMultiplyer), - false); + getBaseMetaTileEntity().decreaseStoredEnergyUnits( + (long) (Math.pow(tDistance, 1.5) * tDistance + * (tStacksize - (mInventory[0] == null ? 0 : mInventory[0].stackSize)) + * sFPowerMultiplyer), + false); } } } - List entities_in_box = getBaseMetaTileEntity().getWorld().getEntitiesWithinAABB( - Entity.class, - AxisAlignedBB.getBoundingBox( - getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, - getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, - getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) - 1, - getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getFrontFacing(), 2) + 2, - getBaseMetaTileEntity().getOffsetY(getBaseMetaTileEntity().getFrontFacing(), 2) + 2, - getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getFrontFacing(), 2) - + 2)); + List entities_in_box = getBaseMetaTileEntity().getWorld() + .getEntitiesWithinAABB( + Entity.class, + AxisAlignedBB.getBoundingBox( + getBaseMetaTileEntity().getOffsetX( + getBaseMetaTileEntity().getFrontFacing(), + 2) - 1, + getBaseMetaTileEntity().getOffsetY( + getBaseMetaTileEntity().getFrontFacing(), + 2) - 1, + getBaseMetaTileEntity().getOffsetZ( + getBaseMetaTileEntity().getFrontFacing(), + 2) - 1, + getBaseMetaTileEntity().getOffsetX( + getBaseMetaTileEntity().getFrontFacing(), + 2) + 2, + getBaseMetaTileEntity().getOffsetY( + getBaseMetaTileEntity().getFrontFacing(), + 2) + 2, + getBaseMetaTileEntity().getOffsetZ( + getBaseMetaTileEntity().getFrontFacing(), + 2) + 2)); for (Object tObject : entities_in_box) { if (((tObject instanceof Entity)) && (!((Entity) tObject).isDead)) { @@ -568,26 +593,32 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setSize(90, 72).setPos(43, 4)) - .widget( - TextWidget.dynamicString(() -> "X: " + GT_Utility.parseNumberToString(mTargetX)) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 8)) - .widget( - TextWidget.dynamicString(() -> "Y: " + GT_Utility.parseNumberToString(mTargetY)) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 16)) - .widget( - TextWidget.dynamicString(() -> "Z: " + GT_Utility.parseNumberToString(mTargetZ)) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 24)) - .widget( - TextWidget.dynamicString(() -> "Dim: " + GT_Utility.parseNumberToString(mTargetD)) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(46, 32)) - .widget( - TextWidget - .dynamicString( - () -> "Dim Valid: " + (GT_Utility.isRealDimension(mTargetD) ? "Yes" : "No")) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> hasDimensionalTeleportCapability()).setPos(46, 40)) - .widget(new FakeSyncWidget.FluidStackSyncer(() -> mFluid, val -> mFluid = val)); + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + .setSize(90, 72) + .setPos(43, 4)) + .widget( + TextWidget.dynamicString(() -> "X: " + GT_Utility.parseNumberToString(mTargetX)) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(46, 8)) + .widget( + TextWidget.dynamicString(() -> "Y: " + GT_Utility.parseNumberToString(mTargetY)) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(46, 16)) + .widget( + TextWidget.dynamicString(() -> "Z: " + GT_Utility.parseNumberToString(mTargetZ)) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(46, 24)) + .widget( + TextWidget.dynamicString(() -> "Dim: " + GT_Utility.parseNumberToString(mTargetD)) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(46, 32)) + .widget( + TextWidget.dynamicString( + () -> "Dim Valid: " + (GT_Utility.isRealDimension(mTargetD) ? "Yes" : "No")) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> hasDimensionalTeleportCapability()) + .setPos(46, 40)) + .widget(new FakeSyncWidget.FluidStackSyncer(() -> mFluid, val -> mFluid = val)); addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_LARGE, -512, -64, 7); addChangeNumberButtons(builder, GT_UITextures.OVERLAY_BUTTON_MINUS_SMALL, -16, -1, 25); @@ -624,9 +655,11 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank private void addChangeNumberButton(ModularWindow.Builder builder, IDrawable overlay, Consumer<Integer> setter, int addNumberShift, int addNumber, int xPos, int yPos) { builder.widget( - new ButtonWidget() - .setOnClick((clickData, widget) -> setter.accept(clickData.shift ? addNumberShift : addNumber)) - .setBackground(GT_UITextures.BUTTON_STANDARD, overlay).setSize(18, 18).setPos(xPos, yPos)); + new ButtonWidget().setOnClick( + (clickData, widget) -> setter.accept(clickData.shift ? addNumberShift : addNumber)) + .setBackground(GT_UITextures.BUTTON_STANDARD, overlay) + .setSize(18, 18) + .setPos(xPos, yPos)); } @Override @@ -637,6 +670,8 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17).setPos(113, 56)); + new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()) + .setSize(17, 17) + .setPos(113, 56)); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java index cae467c4a0..7d8ae980cd 100644 --- a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java @@ -136,8 +136,7 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta TileEntity te = world.getTileEntity(mTargetPos.posX, mTargetPos.posY, mTargetPos.posZ); final IMetaTileEntity tMeta; if (te instanceof BaseMetaTileEntity - && ((tMeta = ((BaseMetaTileEntity) te) - .getMetaTileEntity()) instanceof GT_MetaTileEntity_LongDistancePipelineBase) + && ((tMeta = ((BaseMetaTileEntity) te).getMetaTileEntity()) instanceof GT_MetaTileEntity_LongDistancePipelineBase) && isSameClass((GT_MetaTileEntity_LongDistancePipelineBase) tMeta)) { // It's the right type! mTarget = (GT_MetaTileEntity_LongDistancePipelineBase) tMeta; @@ -241,10 +240,8 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta // It's not a block - let's see if it's a tile entity TileEntity tTileEntity = world.getTileEntity(aCoords.posX, aCoords.posY, aCoords.posZ); if (tTileEntity != gtTile && tTileEntity instanceof BaseMetaTileEntity - && ((BaseMetaTileEntity) tTileEntity) - .getMetaTileEntity() instanceof GT_MetaTileEntity_LongDistancePipelineBase) { - final GT_MetaTileEntity_LongDistancePipelineBase tGtTile = (GT_MetaTileEntity_LongDistancePipelineBase) ((BaseMetaTileEntity) tTileEntity) - .getMetaTileEntity(); + && ((BaseMetaTileEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaTileEntity_LongDistancePipelineBase) { + final GT_MetaTileEntity_LongDistancePipelineBase tGtTile = (GT_MetaTileEntity_LongDistancePipelineBase) ((BaseMetaTileEntity) tTileEntity).getMetaTileEntity(); if (isSameClass(tGtTile) && tWires.contains( tGtTile.getFacingOffset( (BaseMetaTileEntity) tTileEntity, @@ -315,7 +312,8 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta IWailaConfigHandler config) { final NBTTagCompound tag = accessor.getNBTData(); final int facing = getBaseMetaTileEntity().getFrontFacing(); - final int side = (byte) accessor.getSide().ordinal(); + final int side = (byte) accessor.getSide() + .ordinal(); if (side == facing) currentTip.add(GOLD + "Pipeline Input" + RESET); else if (side == ForgeDirection.OPPOSITES[facing]) currentTip.add(BLUE + "Pipeline Output" + RESET); diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineFluid.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineFluid.java index ce020560cb..2b4f4fe377 100644 --- a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineFluid.java +++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineFluid.java @@ -116,7 +116,9 @@ public class GT_MetaTileEntity_LongDistancePipelineFluid extends GT_MetaTileEnti else if (aSide == GT_Utility.getOppositeSide(aFacing)) return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], TextureFactory.of(OVERLAY_PIPELINE_FLUID_BACK) }; else return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], - TextureFactory.of(OVERLAY_PIPELINE_FLUID_SIDE), - TextureFactory.builder().addIcon(OVERLAY_PIPELINE_FLUID_SIDE_GLOW).glow().build() }; + TextureFactory.of(OVERLAY_PIPELINE_FLUID_SIDE), TextureFactory.builder() + .addIcon(OVERLAY_PIPELINE_FLUID_SIDE_GLOW) + .glow() + .build() }; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineItem.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineItem.java index d62e87c707..85c009b350 100644 --- a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineItem.java +++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineItem.java @@ -195,7 +195,9 @@ public class GT_MetaTileEntity_LongDistancePipelineItem extends GT_MetaTileEntit else if (aSide == GT_Utility.getOppositeSide(aFacing)) return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], TextureFactory.of(OVERLAY_PIPELINE_ITEM_BACK) }; else return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], - TextureFactory.of(OVERLAY_PIPELINE_ITEM_SIDE), - TextureFactory.builder().addIcon(OVERLAY_PIPELINE_ITEM_SIDE_GLOW).glow().build() }; + TextureFactory.of(OVERLAY_PIPELINE_ITEM_SIDE), TextureFactory.builder() + .addIcon(OVERLAY_PIPELINE_ITEM_SIDE_GLOW) + .glow() + .build() }; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index 0b47b93334..54551473f3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -51,59 +51,176 @@ public class GT_MetaTileEntity_AssemblyLine extends private static final String STRUCTURE_PIECE_FIRST = "first"; private static final String STRUCTURE_PIECE_LATER = "later"; private static final String STRUCTURE_PIECE_LAST = "last"; - private static final IStructureDefinition<GT_MetaTileEntity_AssemblyLine> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_AssemblyLine>builder() - .addShape( - STRUCTURE_PIECE_FIRST, - transpose( - new String[][] { { " ", "e", " " }, { "~", "l", "G" }, { "g", "m", "g" }, - { "b", "i", "b" }, })) - .addShape( - STRUCTURE_PIECE_LATER, - transpose( - new String[][] { { " ", "e", " " }, { "d", "l", "d" }, { "g", "m", "g" }, - { "b", "I", "b" }, })) - .addShape( - STRUCTURE_PIECE_LAST, - transpose( - new String[][] { { " ", "e", " " }, { "d", "l", "d" }, { "g", "m", "g" }, - { "o", "i", "b" }, })) - .addElement('G', ofBlock(GregTech_API.sBlockCasings3, 10)) // grate machine casing - .addElement('l', ofBlock(GregTech_API.sBlockCasings2, 9)) // assembler machine casing - .addElement('m', ofBlock(GregTech_API.sBlockCasings2, 5)) // assembling line casing - .addElement( - 'g', - ofChain( - ofBlockUnlocalizedName("IC2", "blockAlloyGlass", 0, true), - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 0, true), - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks2", 0, true), - // warded glass - ofBlockUnlocalizedName("Thaumcraft", "blockCosmeticOpaque", 2, false))) - .addElement( - 'e', - ofChain( - Energy.newAny(16, 1, ForgeDirection.UP, ForgeDirection.NORTH, ForgeDirection.SOUTH), - ofBlock(GregTech_API.sBlockCasings2, 0))) - .addElement( - 'd', - buildHatchAdder(GT_MetaTileEntity_AssemblyLine.class).atLeast(DataHatchElement.DataAccess).dot(2) - .casingIndex(42).allowOnly(ForgeDirection.NORTH) - .buildAndChain(GregTech_API.sBlockCasings3, 10)) - .addElement( - 'b', - buildHatchAdder(GT_MetaTileEntity_AssemblyLine.class) - .atLeast(InputHatch, InputHatch, InputHatch, InputHatch, Maintenance).casingIndex(16).dot(3) - .allowOnly(ForgeDirection.DOWN).buildAndChain( - ofBlock(GregTech_API.sBlockCasings2, 0), - ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addOutputToMachineList, 16, 4))) - .addElement( - 'I', - ofChain( - // all blocks nearby use solid steel casing, so let's use the texture of that - InputBus.newAny(16, 5, ForgeDirection.DOWN), - ofHatchAdder(GT_MetaTileEntity_AssemblyLine::addOutputToMachineList, 16, 4))) - .addElement('i', InputBus.newAny(16, 5, ForgeDirection.DOWN)) - .addElement('o', OutputBus.newAny(16, 4, ForgeDirection.DOWN)).build(); + private static final IStructureDefinition<GT_MetaTileEntity_AssemblyLine> STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_AssemblyLine>builder() + .addShape( + STRUCTURE_PIECE_FIRST, + transpose( + new String[][] { + { " ", "e", + " " }, + { "~", "l", + "G" }, + { "g", "m", + "g" }, + { "b", "i", + "b" }, })) + .addShape( + STRUCTURE_PIECE_LATER, + transpose( + new String[][] { + { " ", "e", + " " }, + { "d", "l", + "d" }, + { "g", "m", + "g" }, + { "b", "I", + "b" }, })) + .addShape( + STRUCTURE_PIECE_LAST, + transpose( + new String[][] { + { " ", "e", + " " }, + { "d", "l", + "d" }, + { "g", "m", + "g" }, + { "o", "i", + "b" }, })) + .addElement( + 'G', + ofBlock( + GregTech_API.sBlockCasings3, + 10)) // grate + // machine + // casing + .addElement( + 'l', + ofBlock( + GregTech_API.sBlockCasings2, + 9)) // assembler + // machine + // casing + .addElement( + 'm', + ofBlock( + GregTech_API.sBlockCasings2, + 5)) // assembling + // line + // casing + .addElement( + 'g', + ofChain( + ofBlockUnlocalizedName( + "IC2", + "blockAlloyGlass", + 0, + true), + ofBlockUnlocalizedName( + "bartworks", + "BW_GlasBlocks", + 0, + true), + ofBlockUnlocalizedName( + "bartworks", + "BW_GlasBlocks2", + 0, + true), + // warded + // glass + ofBlockUnlocalizedName( + "Thaumcraft", + "blockCosmeticOpaque", + 2, + false))) + .addElement( + 'e', + ofChain( + Energy.newAny( + 16, + 1, + ForgeDirection.UP, + ForgeDirection.NORTH, + ForgeDirection.SOUTH), + ofBlock( + GregTech_API.sBlockCasings2, + 0))) + .addElement( + 'd', + buildHatchAdder( + GT_MetaTileEntity_AssemblyLine.class).atLeast( + DataHatchElement.DataAccess) + .dot( + 2) + .casingIndex( + 42) + .allowOnly( + ForgeDirection.NORTH) + .buildAndChain( + GregTech_API.sBlockCasings3, + 10)) + .addElement( + 'b', + buildHatchAdder( + GT_MetaTileEntity_AssemblyLine.class).atLeast( + InputHatch, + InputHatch, + InputHatch, + InputHatch, + Maintenance) + .casingIndex( + 16) + .dot( + 3) + .allowOnly( + ForgeDirection.DOWN) + .buildAndChain( + ofBlock( + GregTech_API.sBlockCasings2, + 0), + ofHatchAdder( + GT_MetaTileEntity_AssemblyLine::addOutputToMachineList, + 16, + 4))) + .addElement( + 'I', + ofChain( + // all + // blocks + // nearby + // use + // solid + // steel + // casing, + // so + // let's + // use + // the + // texture + // of + // that + InputBus.newAny( + 16, + 5, + ForgeDirection.DOWN), + ofHatchAdder( + GT_MetaTileEntity_AssemblyLine::addOutputToMachineList, + 16, + 4))) + .addElement( + 'i', + InputBus.newAny( + 16, + 5, + ForgeDirection.DOWN)) + .addElement( + 'o', + OutputBus.newAny( + 16, + 4, + ForgeDirection.DOWN)) + .build(); public GT_MetaTileEntity_AssemblyLine(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -121,23 +238,28 @@ public class GT_MetaTileEntity_AssemblyLine extends @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Assembling Line").addInfo("Controller block for the Assembling Line") - .addInfo("Used to make complex machine parts (LuV+)").addInfo("Does not make Assembler items") - .addSeparator().beginVariableStructureBlock(5, 16, 4, 4, 3, 3, false) // ? - .addStructureInfo("From Bottom to Top, Left to Right") - .addStructureInfo( - "Layer 1 - Solid Steel Machine Casing, Input Bus (last can be Output Bus), Solid Steel Machine Casing") - .addStructureInfo( - "Layer 2 - Borosilicate Glass(any)/Warded Glass/Reinforced Glass, Assembling Line Casing, Reinforced Glass") - .addStructureInfo("Layer 3 - Grate Machine Casing, Assembler Machine Casing, Grate Machine Casing") - .addStructureInfo("Layer 4 - Empty, Solid Steel Machine Casing, Empty") - .addStructureInfo("Up to 16 repeating slices, each one allows for 1 more item in recipes") - .addController("Either Grate on layer 3 of the first slice").addEnergyHatch("Any layer 4 casing", 1) - .addMaintenanceHatch("Any layer 1 casing", 3).addInputBus("As specified on layer 1", 4, 5) - .addInputHatch("Any layer 1 casing", 3) - .addOutputBus("Replaces Input Bus on final slice or on any solid steel casing on layer 1", 4) - .addOtherStructurePart("Data Access Hatch", "Optional, next to controller", 2) - .toolTipFinisher("Gregtech"); + tt.addMachineType("Assembling Line") + .addInfo("Controller block for the Assembling Line") + .addInfo("Used to make complex machine parts (LuV+)") + .addInfo("Does not make Assembler items") + .addSeparator() + .beginVariableStructureBlock(5, 16, 4, 4, 3, 3, false) // ? + .addStructureInfo("From Bottom to Top, Left to Right") + .addStructureInfo( + "Layer 1 - Solid Steel Machine Casing, Input Bus (last can be Output Bus), Solid Steel Machine Casing") + .addStructureInfo( + "Layer 2 - Borosilicate Glass(any)/Warded Glass/Reinforced Glass, Assembling Line Casing, Reinforced Glass") + .addStructureInfo("Layer 3 - Grate Machine Casing, Assembler Machine Casing, Grate Machine Casing") + .addStructureInfo("Layer 4 - Empty, Solid Steel Machine Casing, Empty") + .addStructureInfo("Up to 16 repeating slices, each one allows for 1 more item in recipes") + .addController("Either Grate on layer 3 of the first slice") + .addEnergyHatch("Any layer 4 casing", 1) + .addMaintenanceHatch("Any layer 1 casing", 3) + .addInputBus("As specified on layer 1", 4, 5) + .addInputHatch("Any layer 1 casing", 3) + .addOutputBus("Replaces Input Bus on final slice or on any solid steel casing on layer 1", 4) + .addOtherStructurePart("Data Access Hatch", "Optional, next to controller", 2) + .toolTipFinisher("Gregtech"); return tt; } @@ -145,13 +267,26 @@ public class GT_MetaTileEntity_AssemblyLine extends public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - if (aActive) return new ITexture[] { BlockIcons.casingTexturePages[0][16], - 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[] { BlockIcons.casingTexturePages[0][16], - TextureFactory.builder().addIcon(OVERLAY_FRONT_ASSEMBLY_LINE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_GLOW).extFacing().glow().build() }; + if (aActive) return new ITexture[] { BlockIcons.casingTexturePages[0][16], 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[] { BlockIcons.casingTexturePages[0][16], 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.casingTexturePages[0][16] }; } @@ -185,8 +320,9 @@ public class GT_MetaTileEntity_AssemblyLine extends boolean foundRecipe = false; nextDataStick: for (ItemStack tDataStick : tDataStickList) { - GT_AssemblyLineUtils.LookupResult tLookupResult = GT_AssemblyLineUtils - .findAssemblyLineRecipeFromDataStick(tDataStick, false); + GT_AssemblyLineUtils.LookupResult tLookupResult = GT_AssemblyLineUtils.findAssemblyLineRecipeFromDataStick( + tDataStick, + false); if (tLookupResult.getType() == GT_AssemblyLineUtils.LookupResultType.INVALID_STICK) continue; @@ -244,8 +380,8 @@ public class GT_MetaTileEntity_AssemblyLine extends continue nextDataStick; } else { if (mInputHatches.get(i) instanceof GT_MetaTileEntity_Hatch_MultiInput) { - GT_MetaTileEntity_Hatch_MultiInput tMultiHatch = (GT_MetaTileEntity_Hatch_MultiInput) mInputHatches - .get(i); + GT_MetaTileEntity_Hatch_MultiInput tMultiHatch = (GT_MetaTileEntity_Hatch_MultiInput) mInputHatches.get( + i); if (!tMultiHatch.hasFluid(tRecipe.mFluidInputs[i]) || tMultiHatch.getFluidAmount(tRecipe.mFluidInputs[i]) < tRecipe.mFluidInputs[i].amount) { @@ -295,14 +431,15 @@ public class GT_MetaTileEntity_AssemblyLine extends GT_FML_LOGGER.info("All checked start consuming inputs"); } for (int i = 0; i < tStack.length; i++) { - ItemStack stackInSlot = mInputBusses.get(i).getStackInSlot(0); + ItemStack stackInSlot = mInputBusses.get(i) + .getStackInSlot(0); stackInSlot.stackSize -= tStack[i]; } for (int i = 0; i < tFluids.length; i++) { if (mInputHatches.get(i) instanceof GT_MetaTileEntity_Hatch_MultiInput) { - GT_MetaTileEntity_Hatch_MultiInput tMultiHatch = (GT_MetaTileEntity_Hatch_MultiInput) mInputHatches - .get(i); + GT_MetaTileEntity_Hatch_MultiInput tMultiHatch = (GT_MetaTileEntity_Hatch_MultiInput) mInputHatches.get( + i); tMultiHatch.getFluid(tFluidSlot[i]).amount -= tFluids[i]; if (tMultiHatch.getFluid(tFluidSlot[i]).amount <= 0) { tMultiHatch.setFluid(null, tFluidSlot[i]); @@ -398,10 +535,18 @@ public class GT_MetaTileEntity_AssemblyLine extends } for (GT_MetaTileEntity_Hatch_DataAccess tHatch : mDataAccessHatches) { if (isValidMetaTileEntity(tHatch)) { - for (int i = 0; i < tHatch.getBaseMetaTileEntity().getSizeInventory(); i++) { - if (tHatch.getBaseMetaTileEntity().getStackInSlot(i) != null - && isCorrectDataItem(tHatch.getBaseMetaTileEntity().getStackInSlot(i), state)) - rList.add(tHatch.getBaseMetaTileEntity().getStackInSlot(i)); + for (int i = 0; i < tHatch.getBaseMetaTileEntity() + .getSizeInventory(); i++) { + if (tHatch.getBaseMetaTileEntity() + .getStackInSlot(i) + != null + && isCorrectDataItem( + tHatch.getBaseMetaTileEntity() + .getStackInSlot(i), + state)) + rList.add( + tHatch.getBaseMetaTileEntity() + .getStackInSlot(i)); } } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java index 5babf4405d..96b4c19b93 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java @@ -23,9 +23,12 @@ public class GT_MetaTileEntity_BrickedBlastFurnace extends GT_MetaTileEntity_Pri private static final ITexture[] FACING_SIDE = { TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_DENSEBRICKS) }; private static final ITexture[] FACING_FRONT = { TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_BRICKEDBLASTFURNACE_INACTIVE) }; - private static final ITexture[] FACING_ACTIVE = { - TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_BRICKEDBLASTFURNACE_ACTIVE), TextureFactory.builder() - .addIcon(BlockIcons.MACHINE_CASING_BRICKEDBLASTFURNACE_ACTIVE_GLOW).glow().build() }; + private static final ITexture[] FACING_ACTIVE = { TextureFactory.of( + Textures.BlockIcons.MACHINE_CASING_BRICKEDBLASTFURNACE_ACTIVE), + TextureFactory.builder() + .addIcon(BlockIcons.MACHINE_CASING_BRICKEDBLASTFURNACE_ACTIVE_GLOW) + .glow() + .build() }; private GT_Multiblock_Tooltip_Builder tooltipBuilder; public GT_MetaTileEntity_BrickedBlastFurnace(int aID, String aName, String aNameRegional) { @@ -57,15 +60,19 @@ public class GT_MetaTileEntity_BrickedBlastFurnace extends GT_MetaTileEntity_Pri protected GT_Multiblock_Tooltip_Builder getTooltip() { if (tooltipBuilder == null) { tooltipBuilder = new GT_Multiblock_Tooltip_Builder(); - tooltipBuilder.addMachineType("Blast Furnace").addInfo("Controller Block for the Bricked Blast Furnace") - .addInfo("Usable for Steel and general Pyrometallurgy") - .addInfo("Has a useful interface, unlike other gregtech multis") - .addPollutionAmount(GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond).addSeparator() - .beginStructureBlock(3, 4, 3, true).addController("Front center") - .addOtherStructurePart("Firebricks", "Everything except the controller") - .addStructureInfo("The top block is also empty") - .addStructureInfo("You can share the walls of GT multis, so") - .addStructureInfo("each additional one costs less, up to 4").toolTipFinisher("Gregtech"); + tooltipBuilder.addMachineType("Blast Furnace") + .addInfo("Controller Block for the Bricked Blast Furnace") + .addInfo("Usable for Steel and general Pyrometallurgy") + .addInfo("Has a useful interface, unlike other gregtech multis") + .addPollutionAmount(GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond) + .addSeparator() + .beginStructureBlock(3, 4, 3, true) + .addController("Front center") + .addOtherStructurePart("Firebricks", "Everything except the controller") + .addStructureInfo("The top block is also empty") + .addStructureInfo("You can share the walls of GT multis, so") + .addStructureInfo("each additional one costs less, up to 4") + .toolTipFinisher("Gregtech"); } return tooltipBuilder; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java index 8c22ab780f..1710b33513 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java @@ -20,7 +20,10 @@ public class GT_MetaTileEntity_BronzeBlastFurnace extends GT_MetaTileEntity_Prim private static final ITexture[] FACING_SIDE = { TextureFactory.of(MACHINE_BRONZEPLATEDBRICKS) }; private static final ITexture[] FACING_FRONT = { TextureFactory.of(MACHINE_BRONZEBLASTFURNACE) }; private static final ITexture[] FACING_ACTIVE = { TextureFactory.of(MACHINE_BRONZEBLASTFURNACE_ACTIVE), - TextureFactory.builder().addIcon(MACHINE_BRONZEBLASTFURNACE_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(MACHINE_BRONZEBLASTFURNACE_ACTIVE_GLOW) + .glow() + .build() }; public GT_MetaTileEntity_BronzeBlastFurnace(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java index 4f1aec7f4a..8780bdb038 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java @@ -112,13 +112,14 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_TooltipMul if (isWoodLog( getBaseMetaTileEntity().getBlockOffset(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ), getBaseMetaTileEntity().getMetaIDOffset(tPos.chunkPosX, tPos.chunkPosY, tPos.chunkPosZ))) - getBaseMetaTileEntity().getWorld().setBlock( - getBaseMetaTileEntity().getXCoord() + tPos.chunkPosX, - getBaseMetaTileEntity().getYCoord() + tPos.chunkPosY, - getBaseMetaTileEntity().getZCoord() + tPos.chunkPosZ, - GregTech_API.sBlockReinforced, - 4, - 3); + getBaseMetaTileEntity().getWorld() + .setBlock( + getBaseMetaTileEntity().getXCoord() + tPos.chunkPosX, + getBaseMetaTileEntity().getYCoord() + tPos.chunkPosY, + getBaseMetaTileEntity().getZCoord() + tPos.chunkPosZ, + GregTech_API.sBlockReinforced, + 4, + 3); } running = false; return false; @@ -131,7 +132,9 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_TooltipMul private boolean isWoodLog(Block log, int meta) { for (int id : OreDictionary.getOreIDs(new ItemStack(log, 1, meta))) { - if (OreDictionary.getOreName(id).equals("logWood")) return true; + if (OreDictionary.getOreName(id) + .equals("logWood")) + return true; } String tTool = log.getHarvestTool(meta); return OrePrefixes.log.contains(new ItemStack(log, 1, meta)) && ("axe".equals(tTool)) @@ -254,15 +257,19 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_TooltipMul protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Charcoal Pile Igniter").addInfo("Controller for the Charcoal Pit") - .addInfo("Converts Logs into Brittle Charcoal blocks").addInfo("Will automatically start when valid") - .addPollutionAmount(getPollutionPerSecond(null)).addSeparator() - .beginVariableStructureBlock(3, 11, 3, 6, 3, 11, false) - .addStructureInfo("Can be up to 11x6x11 in size, shape doesn't matter") - .addOtherStructurePart("Bricks", "Bottom layer, under all wood logs") - .addOtherStructurePart("Dirt/Grass", "All logs must be covered by these, the controller, or bricks") - .addOtherStructurePart("Wood Logs", "Inside the previously mentioned blocks") - .addStructureInfo("No air between logs allowed").toolTipFinisher("Gregtech"); + tt.addMachineType("Charcoal Pile Igniter") + .addInfo("Controller for the Charcoal Pit") + .addInfo("Converts Logs into Brittle Charcoal blocks") + .addInfo("Will automatically start when valid") + .addPollutionAmount(getPollutionPerSecond(null)) + .addSeparator() + .beginVariableStructureBlock(3, 11, 3, 6, 3, 11, false) + .addStructureInfo("Can be up to 11x6x11 in size, shape doesn't matter") + .addOtherStructurePart("Bricks", "Bottom layer, under all wood logs") + .addOtherStructurePart("Dirt/Grass", "All logs must be covered by these, the controller, or bricks") + .addOtherStructurePart("Wood Logs", "Inside the previously mentioned blocks") + .addStructureInfo("No air between logs allowed") + .toolTipFinisher("Gregtech"); return tt; } @@ -272,9 +279,15 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_TooltipMul if (aSide == 1) { if (aActive) return new ITexture[] { casingTexturePages[0][10], TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW) + .glow() + .build() }; return new ITexture[] { casingTexturePages[0][10], TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ROCK_BREAKER_GLOW).glow().build(), }; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ROCK_BREAKER_GLOW) + .glow() + .build(), }; } return new ITexture[] { casingTexturePages[0][10] }; } @@ -292,12 +305,15 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_TooltipMul if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive())) { new WorldSpawnedEventBuilder.ParticleEventBuilder().setMotion(0D, 0.3D, 0D) - .setIdentifier(ParticleFX.LARGE_SMOKE) - .setPosition( - aBaseMetaTileEntity.getOffsetX((byte) 1, 1) + XSTR_INSTANCE.nextFloat(), - aBaseMetaTileEntity.getOffsetY((byte) 1, 1), - aBaseMetaTileEntity.getOffsetZ((byte) 1, 1) + XSTR_INSTANCE.nextFloat()) - .setWorld(getBaseMetaTileEntity().getWorld()).run(); + .setIdentifier(ParticleFX.LARGE_SMOKE) + .setPosition( + aBaseMetaTileEntity.getOffsetX((byte) 1, 1) + + XSTR_INSTANCE.nextFloat(), + aBaseMetaTileEntity.getOffsetY((byte) 1, 1), + aBaseMetaTileEntity.getOffsetZ((byte) 1, 1) + + XSTR_INSTANCE.nextFloat()) + .setWorld(getBaseMetaTileEntity().getWorld()) + .run(); } } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java index fd724c57ea..0d18ce040b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java @@ -53,25 +53,30 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Cleanroom").addInfo("Controller block for the Cleanroom") - .addInfo("Consumes 40 EU/t when first turned on") - .addInfo("and 4 EU/t once at 100% efficiency when not overclocked") // ? - .addInfo("An energy hatch accepts up to 2A, so you can use 2A LV or 1A MV") - .addInfo("2 LV batteries + 1 LV generator or 1 MV generator") // ? - .addInfo("Time required to reach full efficiency is proportional to") - .addInfo("the height of empty space within").addInfo("Make sure your Energy Hatch matches! ?") - .addInfo("Machines that cause pollution aren't allowed to be put in.").addSeparator() - .beginVariableStructureBlock(3, 15, 4, 15, 3, 15, true).addController("Top center") - .addCasingInfoRange("Plascrete", 20, 1007, false) - .addStructureInfo(GT_Values.cleanroomGlass + "% of the Plascrete can be replaced with Reinforced Glass") // check - .addStructureInfo("Other material can be used in place of Plascrete. See config for detail") // check - .addOtherStructurePart("Filter Machine Casing", "Top besides controller and edges") - .addEnergyHatch("Any casing. Exactly one.") // check - .addMaintenanceHatch("Any casing") - .addStructureInfo("1x Reinforced Door (keep closed or efficiency will reduce)") - .addStructureInfo("Up to 10 Machine Hulls for Item & Energy transfer through walls") - .addStructureInfo("You can also use Diodes for more power") - .addStructureInfo("Diodes also count towards 10 Machine Hulls count limit").toolTipFinisher("Gregtech"); + tt.addMachineType("Cleanroom") + .addInfo("Controller block for the Cleanroom") + .addInfo("Consumes 40 EU/t when first turned on") + .addInfo("and 4 EU/t once at 100% efficiency when not overclocked") // ? + .addInfo("An energy hatch accepts up to 2A, so you can use 2A LV or 1A MV") + .addInfo("2 LV batteries + 1 LV generator or 1 MV generator") // ? + .addInfo("Time required to reach full efficiency is proportional to") + .addInfo("the height of empty space within") + .addInfo("Make sure your Energy Hatch matches! ?") + .addInfo("Machines that cause pollution aren't allowed to be put in.") + .addSeparator() + .beginVariableStructureBlock(3, 15, 4, 15, 3, 15, true) + .addController("Top center") + .addCasingInfoRange("Plascrete", 20, 1007, false) + .addStructureInfo(GT_Values.cleanroomGlass + "% of the Plascrete can be replaced with Reinforced Glass") // check + .addStructureInfo("Other material can be used in place of Plascrete. See config for detail") // check + .addOtherStructurePart("Filter Machine Casing", "Top besides controller and edges") + .addEnergyHatch("Any casing. Exactly one.") // check + .addMaintenanceHatch("Any casing") + .addStructureInfo("1x Reinforced Door (keep closed or efficiency will reduce)") + .addStructureInfo("Up to 10 Machine Hulls for Item & Energy transfer through walls") + .addStructureInfo("You can also use Diodes for more power") + .addStructureInfo("Diodes also count towards 10 Machine Hulls count limit") + .toolTipFinisher("Gregtech"); return tt; } @@ -193,8 +198,10 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB } else if (tBlock == GregTech_API.sBlockReinforced && tMeta == 2) { mPlascreteCount++; } else { - final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity - .getIGregTechTileEntityOffset(dX, dY, dZ); + final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset( + dX, + dY, + dZ); if ((!this.addMaintenanceToMachineList(tTileEntity, 210)) && (!this.addEnergyInputToMachineList(tTileEntity, 210))) { if (tBlock instanceof ic2.core.block.BlockIC2Door) { @@ -318,13 +325,19 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == ForgeDirection.DOWN.ordinal() || aSide == ForgeDirection.UP.ordinal()) { - return new ITexture[] { TextureFactory.of(BLOCK_PLASCRETE), - aActive ? TextureFactory.of( + return new ITexture[] { TextureFactory.of(BLOCK_PLASCRETE), aActive + ? TextureFactory.of( TextureFactory.of(OVERLAY_TOP_CLEANROOM_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_CLEANROOM_ACTIVE_GLOW).glow().build()) - : TextureFactory.of( - TextureFactory.of(OVERLAY_TOP_CLEANROOM), - TextureFactory.builder().addIcon(OVERLAY_TOP_CLEANROOM_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(OVERLAY_TOP_CLEANROOM_ACTIVE_GLOW) + .glow() + .build()) + : TextureFactory.of( + TextureFactory.of(OVERLAY_TOP_CLEANROOM), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_CLEANROOM_GLOW) + .glow() + .build()) }; } return new ITexture[] { TextureFactory.of(BLOCK_PLASCRETE) }; } @@ -412,18 +425,46 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB public static void loadConfig(Configuration cfg) { if (!cfg.hasCategory(category)) setDefaultConfigValues(cfg); - for (ConfigCategory cc : cfg.getCategory(category).getChildren()) { - final String name = cc.get("Name").getString(); + for (ConfigCategory cc : cfg.getCategory(category) + .getChildren()) { + final String name = cc.get("Name") + .getString(); if (cc.containsKey("Count")) { if (cc.containsKey("Meta")) config.put( - name + ":" + cc.get("Meta").getInt(), - new ConfigEntry(0, cc.get("Count").getInt(), cc.get("Meta").getInt())); - else config.put(name, new ConfigEntry(0, cc.get("Count").getInt(), wildcard_meta)); + name + ":" + + cc.get("Meta") + .getInt(), + new ConfigEntry( + 0, + cc.get("Count") + .getInt(), + cc.get("Meta") + .getInt())); + else config.put( + name, + new ConfigEntry( + 0, + cc.get("Count") + .getInt(), + wildcard_meta)); } else if (cc.containsKey("Percentage")) { if (cc.containsKey("Meta")) config.put( - name + ":" + cc.get("Meta").getInt(), - new ConfigEntry(cc.get("Percentage").getInt(), 0, cc.get("Meta").getInt())); - else config.put(name, new ConfigEntry(cc.get("Percentage").getInt(), 0, wildcard_meta)); + name + ":" + + cc.get("Meta") + .getInt(), + new ConfigEntry( + cc.get("Percentage") + .getInt(), + 0, + cc.get("Meta") + .getInt())); + else config.put( + name, + new ConfigEntry( + cc.get("Percentage") + .getInt(), + 0, + wildcard_meta)); } } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java index dd2f54455a..2b902349bc 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ConcreteBackfillerBase.java @@ -29,21 +29,28 @@ public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTi } protected GT_Multiblock_Tooltip_Builder createTooltip(String aStructureName) { - String casings = getCasingBlockItem().get(0).getDisplayName(); + String casings = getCasingBlockItem().get(0) + .getDisplayName(); final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Concrete Backfiller").addInfo("Controller Block for the " + aStructureName) - .addInfo("Will fill in areas below it with light concrete. This goes through walls") - .addInfo("Use it to remove any spawning locations beneath your base to reduce lag") - .addInfo("Will pull back the pipes after it finishes that layer") - .addInfo("Radius is " + getRadius() + " blocks").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(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top") - .addEnergyHatch(VN[getMinTier()] + "+, Any base casing", 1).addMaintenanceHatch("Any base casing", 1) - .addInputBus("Mining Pipes, optional, any base casing", 1) - .addInputHatch("GT Concrete, any base casing", 1) - .addOutputBus("Mining Pipes, optional, any base casing", 1).toolTipFinisher("Gregtech"); + tt.addMachineType("Concrete Backfiller") + .addInfo("Controller Block for the " + aStructureName) + .addInfo("Will fill in areas below it with light concrete. This goes through walls") + .addInfo("Use it to remove any spawning locations beneath your base to reduce lag") + .addInfo("Will pull back the pipes after it finishes that layer") + .addInfo("Radius is " + getRadius() + " blocks") + .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(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top") + .addEnergyHatch(VN[getMinTier()] + "+, Any base casing", 1) + .addMaintenanceHatch("Any base casing", 1) + .addInputBus("Mining Pipes, optional, any base casing", 1) + .addInputHatch("GT Concrete, any base casing", 1) + .addOutputBus("Mining Pipes, optional, any base casing", 1) + .toolTipFinisher("Gregtech"); return tt; } @@ -103,18 +110,28 @@ public abstract class GT_MetaTileEntity_ConcreteBackfillerBase extends GT_MetaTi private boolean isRefillableBlock(int aX, int aY, int aZ) { IGregTechTileEntity aBaseTile = getBaseMetaTileEntity(); - if (!aBaseTile.getBlock(aX, aY, aZ).isAir(aBaseTile.getWorld(), aX, aY, aZ) - || aBaseTile.getBlock(aX, aY, aZ).getMaterial().isSolid()) + if (!aBaseTile.getBlock(aX, aY, aZ) + .isAir(aBaseTile.getWorld(), aX, aY, aZ) + || aBaseTile.getBlock(aX, aY, aZ) + .getMaterial() + .isSolid()) return false; - if (!GT_Utility - .setBlockByFakePlayer(getFakePlayer(aBaseTile), aX, aY, aZ, GregTech_API.sBlockConcretes, 8, true)) + if (!GT_Utility.setBlockByFakePlayer( + getFakePlayer(aBaseTile), + aX, + aY, + aZ, + GregTech_API.sBlockConcretes, + 8, + true)) return false; return true; } private boolean tryRefillBlock(int aX, int aY, int aZ) { if (!tryConsumeFluid()) return false; - getBaseMetaTileEntity().getWorld().setBlock(aX, aY, aZ, GregTech_API.sBlockConcretes, 8, 3); + getBaseMetaTileEntity().getWorld() + .setBlock(aX, aY, aZ, GregTech_API.sBlockConcretes, 8, 3); return true; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java index 381df634d2..f445d5fea1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java @@ -50,23 +50,34 @@ public class GT_MetaTileEntity_DieselEngine extends @Override protected IStructureDefinition<GT_MetaTileEntity_DieselEngine> computeValue(Class<?> type) { - return StructureDefinition.<GT_MetaTileEntity_DieselEngine>builder().addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { { "---", "iii", "chc", "chc", "ccc", }, - { "---", "i~i", "hgh", "hgh", "cdc", }, { "---", "iii", "chc", "chc", "ccc", }, })) - .addElement('i', lazy(t -> ofBlock(t.getIntakeBlock(), t.getIntakeMeta()))) - .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta()))) - .addElement('g', lazy(t -> ofBlock(t.getGearboxBlock(), t.getGearboxMeta()))) - .addElement('d', lazy(t -> Dynamo.newAny(t.getCasingTextureIndex(), 2))) - .addElement( - 'h', - lazy( - t -> buildHatchAdder(GT_MetaTileEntity_DieselEngine.class) - .atLeast(InputHatch, InputHatch, InputHatch, Muffler, Maintenance) - .casingIndex(t.getCasingTextureIndex()).dot(1) - .buildAndChain(t.getCasingBlock(), t.getCasingMeta()))) - .build(); + return StructureDefinition.<GT_MetaTileEntity_DieselEngine>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { { "---", "iii", "chc", "chc", "ccc", }, + { "---", "i~i", "hgh", "hgh", "cdc", }, + { "---", "iii", "chc", "chc", "ccc", }, })) + .addElement('i', lazy(t -> ofBlock(t.getIntakeBlock(), t.getIntakeMeta()))) + .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta()))) + .addElement('g', lazy(t -> ofBlock(t.getGearboxBlock(), t.getGearboxMeta()))) + .addElement('d', lazy(t -> Dynamo.newAny(t.getCasingTextureIndex(), 2))) + .addElement( + 'h', + lazy( + t -> buildHatchAdder( + GT_MetaTileEntity_DieselEngine.class).atLeast( + InputHatch, + InputHatch, + InputHatch, + Muffler, + Maintenance) + .casingIndex( + t.getCasingTextureIndex()) + .dot(1) + .buildAndChain( + t.getCasingBlock(), + t.getCasingMeta()))) + .build(); } }; protected int fuelConsumption = 0; @@ -85,21 +96,28 @@ public class GT_MetaTileEntity_DieselEngine extends @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Combustion Generator").addInfo("Controller block for the Large Combustion Engine") - .addInfo("Supply Diesel Fuels and 1000L of Lubricant per hour to run") - .addInfo("Supply 40L/s of Oxygen to boost output (optional)") - .addInfo("Default: Produces 2048EU/t at 100% fuel efficiency") - .addInfo("Boosted: Produces 6144EU/t at 150% fuel efficiency") - .addInfo("You need to wait for it to reach 300% to output full power") - .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 4, false) - .addController("Front center").addCasingInfoRange("Stable Titanium Machine Casing", 16, 22, false) - .addOtherStructurePart("Titanium Gear Box Machine Casing", "Inner 2 blocks") - .addOtherStructurePart("Engine Intake Machine Casing", "8x, ring around controller") - .addStructureInfo("Engine Intake Casings must not be obstructed in front (only air blocks)") - .addDynamoHatch("Back center", 2).addMaintenanceHatch("One of the casings next to a Gear Box", 1) - .addMufflerHatch("Top middle back, above the rear Gear Box", 1) - .addInputHatch("Diesel Fuel, next to a Gear Box", 1).addInputHatch("Lubricant, next to a Gear Box", 1) - .addInputHatch("Oxygen, optional, next to a Gear Box", 1).toolTipFinisher("Gregtech"); + tt.addMachineType("Combustion Generator") + .addInfo("Controller block for the Large Combustion Engine") + .addInfo("Supply Diesel Fuels and 1000L of Lubricant per hour to run") + .addInfo("Supply 40L/s of Oxygen to boost output (optional)") + .addInfo("Default: Produces 2048EU/t at 100% fuel efficiency") + .addInfo("Boosted: Produces 6144EU/t at 150% fuel efficiency") + .addInfo("You need to wait for it to reach 300% to output full power") + .addPollutionAmount(getPollutionPerSecond(null)) + .addSeparator() + .beginStructureBlock(3, 3, 4, false) + .addController("Front center") + .addCasingInfoRange("Stable Titanium Machine Casing", 16, 22, false) + .addOtherStructurePart("Titanium Gear Box Machine Casing", "Inner 2 blocks") + .addOtherStructurePart("Engine Intake Machine Casing", "8x, ring around controller") + .addStructureInfo("Engine Intake Casings must not be obstructed in front (only air blocks)") + .addDynamoHatch("Back center", 2) + .addMaintenanceHatch("One of the casings next to a Gear Box", 1) + .addMufflerHatch("Top middle back, above the rear Gear Box", 1) + .addInputHatch("Diesel Fuel, next to a Gear Box", 1) + .addInputHatch("Lubricant, next to a Gear Box", 1) + .addInputHatch("Oxygen, optional, next to a Gear Box", 1) + .toolTipFinisher("Gregtech"); return tt; } @@ -107,13 +125,25 @@ public class GT_MetaTileEntity_DieselEngine extends public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - if (aActive) return new ITexture[] { casingTexturePages[0][50], - TextureFactory.builder().addIcon(OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { casingTexturePages[0][50], - TextureFactory.builder().addIcon(OVERLAY_FRONT_DIESEL_ENGINE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_DIESEL_ENGINE_GLOW).extFacing().glow().build() }; + if (aActive) return new ITexture[] { casingTexturePages[0][50], TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { casingTexturePages[0][50], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_DIESEL_ENGINE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_DIESEL_ENGINE_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { casingTexturePages[0][50] }; } @@ -318,8 +348,10 @@ public class GT_MetaTileEntity_DieselEngine extends long maxEnergy = 0; for (GT_MetaTileEntity_Hatch_Dynamo tHatch : mDynamoHatches) { if (isValidMetaTileEntity(tHatch)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); + storedEnergy += tHatch.getBaseMetaTileEntity() + .getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity() + .getEUCapacity(); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java index 7302625406..eb5adfbd3c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java @@ -53,65 +53,104 @@ public class GT_MetaTileEntity_DistillationTower private static final IStructureDefinition<GT_MetaTileEntity_DistillationTower> STRUCTURE_DEFINITION; static { - IHatchElement<GT_MetaTileEntity_DistillationTower> layeredOutputHatch = OutputHatch - .withCount(GT_MetaTileEntity_DistillationTower::getCurrentLayerOutputHatchCount) - .withAdder(GT_MetaTileEntity_DistillationTower::addLayerOutputHatch); + IHatchElement<GT_MetaTileEntity_DistillationTower> layeredOutputHatch = OutputHatch.withCount( + GT_MetaTileEntity_DistillationTower::getCurrentLayerOutputHatchCount) + .withAdder( + GT_MetaTileEntity_DistillationTower::addLayerOutputHatch); STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_DistillationTower>builder() - .addShape(STRUCTURE_PIECE_BASE, transpose(new String[][] { { "b~b", "bbb", "bbb" }, })) - .addShape(STRUCTURE_PIECE_LAYER, transpose(new String[][] { { "lll", "lcl", "lll" }, })) - .addShape(STRUCTURE_PIECE_LAYER_HINT, transpose(new String[][] { { "lll", "l-l", "lll" }, })) - .addShape(STRUCTURE_PIECE_TOP_HINT, transpose(new String[][] { { "LLL", "LLL", "LLL" }, })) - .addElement( - 'b', - ofChain( - buildHatchAdder(GT_MetaTileEntity_DistillationTower.class) - .atLeast(Energy, OutputBus, InputHatch, InputBus, Maintenance) - .casingIndex(CASING_INDEX).dot(1).build(), - onElementPass( - GT_MetaTileEntity_DistillationTower::onCasingFound, - ofBlock(GregTech_API.sBlockCasings4, 1)))) - .addElement( - 'l', - ofChain( - buildHatchAdder(GT_MetaTileEntity_DistillationTower.class).atLeast(layeredOutputHatch) - .casingIndex(CASING_INDEX).dot(2) - .disallowOnly(ForgeDirection.UP, ForgeDirection.DOWN).build(), - ofHatchAdder( - GT_MetaTileEntity_DistillationTower::addEnergyInputToMachineList, - CASING_INDEX, - 2), - ofHatchAdder(GT_MetaTileEntity_DistillationTower::addLayerOutputHatch, CASING_INDEX, 2), - ofHatchAdder( - GT_MetaTileEntity_DistillationTower::addMaintenanceToMachineList, - CASING_INDEX, - 2), - onElementPass( - GT_MetaTileEntity_DistillationTower::onCasingFound, - ofBlock(GregTech_API.sBlockCasings4, 1)))) - // hint element only used in top layer - .addElement( - 'L', - buildHatchAdder(GT_MetaTileEntity_DistillationTower.class).atLeast(layeredOutputHatch) - .casingIndex(CASING_INDEX).dot(2).disallowOnly(ForgeDirection.UP) - .buildAndChain(GregTech_API.sBlockCasings4, 1)) - .addElement( - 'c', - ofChain( - onElementPass( - t -> t.onTopLayerFound(false), - ofHatchAdder( - GT_MetaTileEntity_DistillationTower::addOutputToMachineList, - CASING_INDEX, - 3)), - onElementPass( - t -> t.onTopLayerFound(false), - ofHatchAdder( - GT_MetaTileEntity_DistillationTower::addMaintenanceToMachineList, - CASING_INDEX, - 3)), - onElementPass(t -> t.onTopLayerFound(true), ofBlock(GregTech_API.sBlockCasings4, 1)), - isAir())) - .build(); + .addShape( + STRUCTURE_PIECE_BASE, + transpose(new String[][] { { "b~b", "bbb", "bbb" }, })) + .addShape( + STRUCTURE_PIECE_LAYER, + transpose(new String[][] { { "lll", "lcl", "lll" }, })) + .addShape( + STRUCTURE_PIECE_LAYER_HINT, + transpose(new String[][] { { "lll", "l-l", "lll" }, })) + .addShape( + STRUCTURE_PIECE_TOP_HINT, + transpose(new String[][] { { "LLL", "LLL", "LLL" }, })) + .addElement( + 'b', + ofChain( + buildHatchAdder( + GT_MetaTileEntity_DistillationTower.class).atLeast( + Energy, + OutputBus, + InputHatch, + InputBus, + Maintenance) + .casingIndex( + CASING_INDEX) + .dot( + 1) + .build(), + onElementPass( + GT_MetaTileEntity_DistillationTower::onCasingFound, + ofBlock(GregTech_API.sBlockCasings4, 1)))) + .addElement( + 'l', + ofChain( + buildHatchAdder( + GT_MetaTileEntity_DistillationTower.class).atLeast( + layeredOutputHatch) + .casingIndex( + CASING_INDEX) + .dot( + 2) + .disallowOnly( + ForgeDirection.UP, + ForgeDirection.DOWN) + .build(), + ofHatchAdder( + GT_MetaTileEntity_DistillationTower::addEnergyInputToMachineList, + CASING_INDEX, + 2), + ofHatchAdder( + GT_MetaTileEntity_DistillationTower::addLayerOutputHatch, + CASING_INDEX, + 2), + ofHatchAdder( + GT_MetaTileEntity_DistillationTower::addMaintenanceToMachineList, + CASING_INDEX, + 2), + onElementPass( + GT_MetaTileEntity_DistillationTower::onCasingFound, + ofBlock(GregTech_API.sBlockCasings4, 1)))) + // hint element only used in top layer + .addElement( + 'L', + buildHatchAdder( + GT_MetaTileEntity_DistillationTower.class).atLeast( + layeredOutputHatch) + .casingIndex( + CASING_INDEX) + .dot(2) + .disallowOnly( + ForgeDirection.UP) + .buildAndChain( + GregTech_API.sBlockCasings4, + 1)) + .addElement( + 'c', + ofChain( + onElementPass( + t -> t.onTopLayerFound(false), + ofHatchAdder( + GT_MetaTileEntity_DistillationTower::addOutputToMachineList, + CASING_INDEX, + 3)), + onElementPass( + t -> t.onTopLayerFound(false), + ofHatchAdder( + GT_MetaTileEntity_DistillationTower::addMaintenanceToMachineList, + CASING_INDEX, + 3)), + onElementPass( + t -> t.onTopLayerFound(true), + ofBlock(GregTech_API.sBlockCasings4, 1)), + isAir())) + .build(); } protected final List<List<GT_MetaTileEntity_Hatch_Output>> mOutputHatchesByLayer = new ArrayList<>(); @@ -135,15 +174,20 @@ public class GT_MetaTileEntity_DistillationTower @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(3, 3, 3, 12, 3, 3, true).addController("Front bottom") - .addOtherStructurePart("Clean Stainless Steel Machine Casing", "7 x h - 5 (minimum)") - .addEnergyHatch("Any casing", 1, 2).addMaintenanceHatch("Any casing", 1, 2, 3) - .addInputHatch("Any bottom layer casing", 1).addOutputBus("Any bottom layer casing", 1) - .addOutputHatch("2-11x Output Hatches (At least one per layer except bottom layer)", 2, 3) - .toolTipFinisher("Gregtech"); + 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(3, 3, 3, 12, 3, 3, true) + .addController("Front bottom") + .addOtherStructurePart("Clean Stainless Steel Machine Casing", "7 x h - 5 (minimum)") + .addEnergyHatch("Any casing", 1, 2) + .addMaintenanceHatch("Any casing", 1, 2, 3) + .addInputHatch("Any bottom layer casing", 1) + .addOutputBus("Any bottom layer casing", 1) + .addOutputHatch("2-11x Output Hatches (At least one per layer except bottom layer)", 2, 3) + .toolTipFinisher("Gregtech"); return tt; } @@ -152,13 +196,25 @@ public class GT_MetaTileEntity_DistillationTower boolean aActive, boolean aRedstone) { if (aSide == aFacing) { if (aActive) return new ITexture[] { 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[] { 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[] { 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) }; } @@ -254,7 +310,8 @@ public class GT_MetaTileEntity_DistillationTower protected int getCurrentLayerOutputHatchCount() { return mOutputHatchesByLayer.size() < mHeight || mHeight <= 0 ? 0 - : mOutputHatchesByLayer.get(mHeight - 1).size(); + : mOutputHatchesByLayer.get(mHeight - 1) + .size(); } protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { @@ -264,7 +321,8 @@ public class GT_MetaTileEntity_DistillationTower while (mOutputHatchesByLayer.size() < mHeight) mOutputHatchesByLayer.add(new ArrayList<>()); GT_MetaTileEntity_Hatch_Output tHatch = (GT_MetaTileEntity_Hatch_Output) aTileEntity.getMetaTileEntity(); tHatch.updateTexture(aBaseCasingIndex); - return mOutputHatchesByLayer.get(mHeight - 1).add(tHatch); + return mOutputHatchesByLayer.get(mHeight - 1) + .add(tHatch); } @Override @@ -294,7 +352,8 @@ public class GT_MetaTileEntity_DistillationTower if (!checkPiece(STRUCTURE_PIECE_LAYER, 1, mHeight, 0)) { return false; } - if (mOutputHatchesByLayer.size() < mHeight || mOutputHatchesByLayer.get(mHeight - 1).isEmpty()) + if (mOutputHatchesByLayer.size() < mHeight || mOutputHatchesByLayer.get(mHeight - 1) + .isEmpty()) // layer without output hatch return false; if (mTopLayerFound) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java index 55ccfd6230..a0c62ae2a7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java @@ -63,29 +63,41 @@ public abstract class GT_MetaTileEntity_DrillerBase @Override protected IStructureDefinition<GT_MetaTileEntity_DrillerBase> computeValue(Class<?> type) { return StructureDefinition.<GT_MetaTileEntity_DrillerBase>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { { " ", " f ", " " }, { " ", " f ", " " }, - { " ", " f ", " " }, { " f ", "fcf", " f " }, { " f ", "fcf", " f " }, - { " f ", "fcf", " f " }, { "b~b", "bbb", "bbb" }, })) - .addElement('f', lazy(t -> ofFrame(t.getFrameMaterial()))) - .addElement( - 'c', - lazy( - t -> ofBlock( - t.getCasingBlockItem().getBlock(), - t.getCasingBlockItem().get(0).getItemDamage()))) - .addElement( - 'b', - lazy( - t -> buildHatchAdder(GT_MetaTileEntity_DrillerBase.class) - .atLeastList(t.getAllowedHatches()) - .adder(GT_MetaTileEntity_DrillerBase::addToMachineList) - .casingIndex(t.casingTextureIndex).dot(1).buildAndChain( - t.getCasingBlockItem().getBlock(), - t.getCasingBlockItem().get(0).getItemDamage()))) - .build(); + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { { " ", " f ", " " }, { " ", " f ", " " }, + { " ", " f ", " " }, { " f ", "fcf", " f " }, + { " f ", "fcf", " f " }, { " f ", "fcf", " f " }, + { "b~b", "bbb", "bbb" }, })) + .addElement('f', lazy(t -> ofFrame(t.getFrameMaterial()))) + .addElement( + 'c', + lazy( + t -> ofBlock( + t.getCasingBlockItem() + .getBlock(), + t.getCasingBlockItem() + .get(0) + .getItemDamage()))) + .addElement( + 'b', + lazy( + t -> buildHatchAdder( + GT_MetaTileEntity_DrillerBase.class).atLeastList( + t.getAllowedHatches()) + .adder( + GT_MetaTileEntity_DrillerBase::addToMachineList) + .casingIndex( + t.casingTextureIndex) + .dot(1) + .buildAndChain( + t.getCasingBlockItem() + .getBlock(), + t.getCasingBlockItem() + .get(0) + .getItemDamage()))) + .build(); } }; @@ -126,7 +138,8 @@ public abstract class GT_MetaTileEntity_DrillerBase private void initFields() { casingBlock = getCasingBlockItem().getBlock(); - casingMeta = getCasingBlockItem().get(0).getItemDamage(); + casingMeta = getCasingBlockItem().get(0) + .getItemDamage(); int frameId = 4096 + getFrameMaterial().mMetaItemSubID; frameMeta = GregTech_API.METATILEENTITIES[frameId] != null ? GregTech_API.METATILEENTITIES[frameId].getTileEntityBaseType() @@ -139,12 +152,26 @@ public abstract class GT_MetaTileEntity_DrillerBase public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - if (aActive) return new ITexture[] { getCasingTextureForId(casingTextureIndex), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ORE_DRILL_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ORE_DRILL_ACTIVE_GLOW).extFacing().glow().build() }; - return new ITexture[] { getCasingTextureForId(casingTextureIndex), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ORE_DRILL).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ORE_DRILL_GLOW).extFacing().glow().build() }; + if (aActive) return new ITexture[] { getCasingTextureForId(casingTextureIndex), TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_ORE_DRILL_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ORE_DRILL_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { getCasingTextureForId(casingTextureIndex), TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_ORE_DRILL) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ORE_DRILL_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { getCasingTextureForId(casingTextureIndex) }; } @@ -210,9 +237,14 @@ public abstract class GT_MetaTileEntity_DrillerBase protected boolean tryPickPipe() { if (yHead == yDrill) return isPickingPipes = false; if (tryOutputPipe()) { - if (checkBlockAndMeta(xPipe, yHead + 1, zPipe, miningPipeBlock, W)) - getBaseMetaTileEntity().getWorld().setBlock(xPipe, yHead + 1, zPipe, miningPipeTipBlock); - getBaseMetaTileEntity().getWorld().setBlockToAir(xPipe, yHead, zPipe); + if (checkBlockAndMeta(xPipe, yHead + 1, zPipe, miningPipeBlock, W)) getBaseMetaTileEntity().getWorld() + .setBlock( + xPipe, + yHead + 1, + zPipe, + miningPipeTipBlock); + getBaseMetaTileEntity().getWorld() + .setBlockToAir(xPipe, yHead, zPipe); return isPickingPipes = true; } return isPickingPipes = false; @@ -259,7 +291,8 @@ public abstract class GT_MetaTileEntity_DrillerBase isSimulating)) return 3; if (!isSimulating) { - if (yHead != yDrill) getBaseMetaTileEntity().getWorld().setBlock(xPipe, yHead, zPipe, miningPipeBlock); + if (yHead != yDrill) getBaseMetaTileEntity().getWorld() + .setBlock(xPipe, yHead, zPipe, miningPipeBlock); if (b != miningPipeBlock && b != miningPipeTipBlock) getBaseMetaTileEntity().decrStackSize(1, 1); } @@ -434,7 +467,8 @@ public abstract class GT_MetaTileEntity_DrillerBase // is pipe tip OR is controller layer if (checkBlockAndMeta(xPipe, yHead, zPipe, miningPipeTipBlock, W) || ++yHead == yDrill) return true; // pipe column is broken - try fix - getBaseMetaTileEntity().getWorld().setBlock(xPipe, yHead, zPipe, miningPipeTipBlock); + getBaseMetaTileEntity().getWorld() + .setBlock(xPipe, yHead, zPipe, miningPipeTipBlock); return true; } @@ -534,10 +568,18 @@ public abstract class GT_MetaTileEntity_DrillerBase } for (GT_MetaTileEntity_Hatch_DataAccess tHatch : mDataAccessHatches) { if (isValidMetaTileEntity(tHatch)) { - for (int i = 0; i < tHatch.getBaseMetaTileEntity().getSizeInventory(); i++) { - if (tHatch.getBaseMetaTileEntity().getStackInSlot(i) != null - && isCorrectDataItem(tHatch.getBaseMetaTileEntity().getStackInSlot(i), state)) - rList.add(tHatch.getBaseMetaTileEntity().getStackInSlot(i)); + for (int i = 0; i < tHatch.getBaseMetaTileEntity() + .getSizeInventory(); i++) { + if (tHatch.getBaseMetaTileEntity() + .getStackInSlot(i) + != null + && isCorrectDataItem( + tHatch.getBaseMetaTileEntity() + .getStackInSlot(i), + state)) + rList.add( + tHatch.getBaseMetaTileEntity() + .getStackInSlot(i)); } } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java index 79204817f5..3395ded360 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java @@ -47,31 +47,62 @@ public class GT_MetaTileEntity_ElectricBlastFurnace protected static final int CASING_INDEX = 11; protected static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition<GT_MetaTileEntity_ElectricBlastFurnace> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_ElectricBlastFurnace>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { { "ttt", "tmt", "ttt" }, { "CCC", "C-C", "CCC" }, { "CCC", "C-C", "CCC" }, - { "b~b", "bbb", "bbb" } })) - .addElement( - 't', - buildHatchAdder(GT_MetaTileEntity_ElectricBlastFurnace.class).atLeast( - OutputHatch.withAdder(GT_MetaTileEntity_ElectricBlastFurnace::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', - ofCoil( - GT_MetaTileEntity_ElectricBlastFurnace::setCoilLevel, - GT_MetaTileEntity_ElectricBlastFurnace::getCoilLevel)) - .addElement( - 'b', - buildHatchAdder(GT_MetaTileEntity_ElectricBlastFurnace.class) - .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy) - .casingIndex(CASING_INDEX).dot(1).buildAndChain(GregTech_API.sBlockCasings1, CASING_INDEX)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_ElectricBlastFurnace> STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_ElectricBlastFurnace>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { + { "ttt", "tmt", + "ttt" }, + { "CCC", "C-C", + "CCC" }, + { "CCC", "C-C", + "CCC" }, + { "b~b", "bbb", + "bbb" } })) + .addElement( + 't', + buildHatchAdder( + GT_MetaTileEntity_ElectricBlastFurnace.class).atLeast( + OutputHatch.withAdder( + GT_MetaTileEntity_ElectricBlastFurnace::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', + ofCoil( + GT_MetaTileEntity_ElectricBlastFurnace::setCoilLevel, + GT_MetaTileEntity_ElectricBlastFurnace::getCoilLevel)) + .addElement( + 'b', + buildHatchAdder( + GT_MetaTileEntity_ElectricBlastFurnace.class).atLeast( + InputHatch, + OutputHatch, + InputBus, + OutputBus, + Maintenance, + Energy) + .casingIndex( + CASING_INDEX) + .dot( + 1) + .buildAndChain( + GregTech_API.sBlockCasings1, + CASING_INDEX)) + .build(); public GT_MetaTileEntity_ElectricBlastFurnace(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -89,22 +120,30 @@ public class GT_MetaTileEntity_ElectricBlastFurnace @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 Electric 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 required grants one perfect overclock") - .addInfo( - "For each perfect overclock the EBF will reduce recipe time 4 times (instead of 2) (100% efficiency)") - .addInfo("Additionally gives +100K for every tier past MV") - .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 4, 3, true) - .addController("Front bottom").addCasingInfoRange("Heat Proof Machine Casing", 0, 15, false) - .addOtherStructurePart("Heating Coils", "Two middle Layers") - .addEnergyHatch("Any bottom layer casing", 3).addMaintenanceHatch("Any bottom layer casing", 3) - .addMufflerHatch("Top middle", 2).addInputBus("Any bottom layer casing", 3) - .addInputHatch("Any bottom layer casing", 3).addOutputBus("Any bottom layer casing", 3) - .addOutputHatch("Liquid form of fluids, Any bottom layer casing") - .addOutputHatch("Gas form of fluids, Any top layer casing", 1) - .addStructureInfo("Recovery amount scales with Muffler Hatch tier").toolTipFinisher("Gregtech"); + tt.addMachineType("Blast Furnace") + .addInfo("Controller block for the Electric 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 required grants one perfect overclock") + .addInfo( + "For each perfect overclock the EBF will reduce recipe time 4 times (instead of 2) (100% efficiency)") + .addInfo("Additionally gives +100K for every tier past MV") + .addPollutionAmount(getPollutionPerSecond(null)) + .addSeparator() + .beginStructureBlock(3, 4, 3, true) + .addController("Front bottom") + .addCasingInfoRange("Heat Proof Machine Casing", 0, 15, false) + .addOtherStructurePart("Heating Coils", "Two middle Layers") + .addEnergyHatch("Any bottom layer casing", 3) + .addMaintenanceHatch("Any bottom layer casing", 3) + .addMufflerHatch("Top middle", 2) + .addInputBus("Any bottom layer casing", 3) + .addInputHatch("Any bottom layer casing", 3) + .addOutputBus("Any bottom layer casing", 3) + .addOutputHatch("Liquid form of fluids, Any bottom layer casing") + .addOutputHatch("Gas form of fluids, Any top layer casing", 1) + .addStructureInfo("Recovery amount scales with Muffler Hatch tier") + .toolTipFinisher("Gregtech"); return tt; } @@ -112,14 +151,26 @@ public class GT_MetaTileEntity_ElectricBlastFurnace public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - 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] }; } @@ -153,9 +204,14 @@ public class GT_MetaTileEntity_ElectricBlastFurnace tBus.mRecipeMap = getRecipeMap(); if (isValidMetaTileEntity(tBus)) { - for (int i = tBus.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) { - if (tBus.getBaseMetaTileEntity().getStackInSlot(i) != null) { - tInputs.add(tBus.getBaseMetaTileEntity().getStackInSlot(i)); + for (int i = tBus.getBaseMetaTileEntity() + .getSizeInventory() + - 1; i >= 0; i--) { + if (tBus.getBaseMetaTileEntity() + .getStackInSlot(i) != null) { + tInputs.add( + tBus.getBaseMetaTileEntity() + .getStackInSlot(i)); } } } @@ -176,8 +232,12 @@ public class GT_MetaTileEntity_ElectricBlastFurnace long tVoltage = getMaxInputVoltage(); byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sBlastRecipes - .findRecipe(getBaseMetaTileEntity(), false, V[tTier], tFluids, tItems); + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sBlastRecipes.findRecipe( + getBaseMetaTileEntity(), + false, + V[tTier], + tFluids, + tItems); if (tRecipe == null) return false; if (this.mHeatingCapacity < tRecipe.mSpecialValue) return false; @@ -322,8 +382,10 @@ public class GT_MetaTileEntity_ElectricBlastFurnace long maxEnergy = 0; for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) { if (!isValidMetaTileEntity(tHatch)) continue; - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); + storedEnergy += tHatch.getBaseMetaTileEntity() + .getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity() + .getEUCapacity(); } return new String[] { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java index 78e059db2a..e9ed294fc2 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ExtremeDieselEngine.java @@ -37,21 +37,28 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Die @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Combustion Generator").addInfo("Controller block for the Extreme Combustion Engine") - .addInfo("Supply high rating fuel and 8000L of Lubricant per hour to run") - .addInfo("Supply 40L/s of Liquid Oxygen to boost output (optional)") - .addInfo("Default: Produces 10900EU/t at 100% fuel efficiency") - .addInfo("Boosted: Produces 32700EU/t at 150% fuel efficiency") - .addInfo("You need to wait for it to reach 300% to output full power") - .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 4, false) - .addController("Front center").addCasingInfoRange("Robust Tungstensteel Machine Casing", 16, 22, false) - .addOtherStructurePart("Titanium Gear Box Machine Casing", "Inner 2 blocks") - .addOtherStructurePart("Extreme Engine Intake Machine Casing", "8x, ring around controller") - .addStructureInfo("Extreme Engine Intake Casings must not be obstructed in front (only air blocks)") - .addDynamoHatch("Back center", 2).addMaintenanceHatch("One of the casings next to a Gear Box", 1) - .addMufflerHatch("Top middle back, above the rear Gear Box", 1) - .addInputHatch("HOG, next to a Gear Box", 1).addInputHatch("Lubricant, next to a Gear Box", 1) - .addInputHatch("Liquid Oxygen, optional, next to a Gear Box", 1).toolTipFinisher("Gregtech"); + tt.addMachineType("Combustion Generator") + .addInfo("Controller block for the Extreme Combustion Engine") + .addInfo("Supply high rating fuel and 8000L of Lubricant per hour to run") + .addInfo("Supply 40L/s of Liquid Oxygen to boost output (optional)") + .addInfo("Default: Produces 10900EU/t at 100% fuel efficiency") + .addInfo("Boosted: Produces 32700EU/t at 150% fuel efficiency") + .addInfo("You need to wait for it to reach 300% to output full power") + .addPollutionAmount(getPollutionPerSecond(null)) + .addSeparator() + .beginStructureBlock(3, 3, 4, false) + .addController("Front center") + .addCasingInfoRange("Robust Tungstensteel Machine Casing", 16, 22, false) + .addOtherStructurePart("Titanium Gear Box Machine Casing", "Inner 2 blocks") + .addOtherStructurePart("Extreme Engine Intake Machine Casing", "8x, ring around controller") + .addStructureInfo("Extreme Engine Intake Casings must not be obstructed in front (only air blocks)") + .addDynamoHatch("Back center", 2) + .addMaintenanceHatch("One of the casings next to a Gear Box", 1) + .addMufflerHatch("Top middle back, above the rear Gear Box", 1) + .addInputHatch("HOG, next to a Gear Box", 1) + .addInputHatch("Lubricant, next to a Gear Box", 1) + .addInputHatch("Liquid Oxygen, optional, next to a Gear Box", 1) + .toolTipFinisher("Gregtech"); return tt; } @@ -64,14 +71,26 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Die public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - if (aActive) return new ITexture[] { casingTexturePages[0][60], - TextureFactory.builder().addIcon(OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { casingTexturePages[0][60], - TextureFactory.builder().addIcon(OVERLAY_FRONT_EXTREME_DIESEL_ENGINE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_GLOW).extFacing().glow() - .build() }; + if (aActive) return new ITexture[] { casingTexturePages[0][60], TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { casingTexturePages[0][60], TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_EXTREME_DIESEL_ENGINE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { casingTexturePages[0][60] }; } @@ -164,8 +183,10 @@ public class GT_MetaTileEntity_ExtremeDieselEngine extends GT_MetaTileEntity_Die long maxEnergy = 0; for (GT_MetaTileEntity_Hatch_Dynamo tHatch : mDynamoHatches) { if (isValidMetaTileEntity(tHatch)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); + storedEnergy += tHatch.getBaseMetaTileEntity() + .getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity() + .getEUCapacity(); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index 34da12c590..869e1b53f8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -66,53 +66,85 @@ public abstract class GT_MetaTileEntity_FusionComputer @Override protected IStructureDefinition<GT_MetaTileEntity_FusionComputer> computeValue(Class<?> type) { - return StructureDefinition.<GT_MetaTileEntity_FusionComputer>builder().addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { - { " ", " ihi ", " hh hh ", " h h ", - " h h ", " h h ", " i i ", " h h ", - " i i ", " h h ", " h h ", " h h ", - " hh hh ", " ihi ", " ", }, - { " xhx ", " hhccchh ", " eccxhxcce ", " eceh hece ", - " hce ech ", " hch hch ", "xcx xcx", "hch hch", - "xcx xcx", " hch hch ", " hce ech ", " eceh hece ", - " eccx~xcce ", " hhccchh ", " xhx ", }, - { " ", " ihi ", " hh hh ", " h h ", - " h h ", " h h ", " i i ", " h h ", - " i i ", " h h ", " h h ", " h h ", - " hh hh ", " ihi ", " ", } })) - .addElement('c', lazy(t -> ofBlock(t.getFusionCoil(), t.getFusionCoilMeta()))) - .addElement('h', lazy(t -> ofBlock(t.getCasing(), t.getCasingMeta()))) - .addElement( - 'i', - lazy( - t -> buildHatchAdder(GT_MetaTileEntity_FusionComputer.class) - .atLeast( - ImmutableMap.of( - InputHatch.withAdder( - GT_MetaTileEntity_FusionComputer::addInjector), - 2)) - .hatchItemFilterAnd(t2 -> filterByMTETier(t2.tier(), Integer.MAX_VALUE)) - .casingIndex(53).dot(1).buildAndChain(t.getCasing(), t.getCasingMeta()))) - .addElement( - 'e', - lazy( - t -> buildHatchAdder(GT_MetaTileEntity_FusionComputer.class).atLeast( - ImmutableMap.of( - Energy.withAdder( - GT_MetaTileEntity_FusionComputer::addEnergyInjector), - 16)) - .hatchItemFilterAnd(t2 -> filterByMTETier(t2.tier(), Integer.MAX_VALUE)) - .casingIndex(53).dot(2).buildAndChain(t.getCasing(), t.getCasingMeta()))) - .addElement( - 'x', - lazy( - t -> buildHatchAdder(GT_MetaTileEntity_FusionComputer.class).atLeast( - OutputHatch.withAdder(GT_MetaTileEntity_FusionComputer::addExtractor)) - .hatchItemFilterAnd(t2 -> filterByMTETier(t2.tier(), Integer.MAX_VALUE)) - .casingIndex(53).dot(3).buildAndChain(t.getCasing(), t.getCasingMeta()))) - .build(); + return StructureDefinition.<GT_MetaTileEntity_FusionComputer>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { { " ", " ihi ", + " hh hh ", " h h ", " h h ", + " h h ", " i i ", " h h ", + " i i ", " h h ", " h h ", + " h h ", " hh hh ", " ihi ", + " ", }, + { " xhx ", " hhccchh ", " eccxhxcce ", + " eceh hece ", " hce ech ", + " hch hch ", "xcx xcx", + "hch hch", "xcx xcx", + " hch hch ", " hce ech ", + " eceh hece ", " eccx~xcce ", + " hhccchh ", " xhx ", }, + { " ", " ihi ", " hh hh ", + " h h ", " h h ", + " h h ", " i i ", + " h h ", " i i ", + " h h ", " h h ", + " h h ", " hh hh ", + " ihi ", " ", } })) + .addElement('c', lazy(t -> ofBlock(t.getFusionCoil(), t.getFusionCoilMeta()))) + .addElement('h', lazy(t -> ofBlock(t.getCasing(), t.getCasingMeta()))) + .addElement( + 'i', + lazy( + t -> buildHatchAdder( + GT_MetaTileEntity_FusionComputer.class).atLeast( + ImmutableMap.of( + InputHatch.withAdder( + GT_MetaTileEntity_FusionComputer::addInjector), + 2)) + .hatchItemFilterAnd( + t2 -> filterByMTETier( + t2.tier(), + Integer.MAX_VALUE)) + .casingIndex(53) + .dot(1) + .buildAndChain( + t.getCasing(), + t.getCasingMeta()))) + .addElement( + 'e', + lazy( + t -> buildHatchAdder( + GT_MetaTileEntity_FusionComputer.class).atLeast( + ImmutableMap.of( + Energy.withAdder( + GT_MetaTileEntity_FusionComputer::addEnergyInjector), + 16)) + .hatchItemFilterAnd( + t2 -> filterByMTETier( + t2.tier(), + Integer.MAX_VALUE)) + .casingIndex(53) + .dot(2) + .buildAndChain( + t.getCasing(), + t.getCasingMeta()))) + .addElement( + 'x', + lazy( + t -> buildHatchAdder( + GT_MetaTileEntity_FusionComputer.class).atLeast( + OutputHatch.withAdder( + GT_MetaTileEntity_FusionComputer::addExtractor)) + .hatchItemFilterAnd( + t2 -> filterByMTETier( + t2.tier(), + Integer.MAX_VALUE)) + .casingIndex(53) + .dot(3) + .buildAndChain( + t.getCasing(), + t.getCasingMeta()))) + .build(); } }; public GT_Recipe mLastRecipe; @@ -122,9 +154,15 @@ public abstract class GT_MetaTileEntity_FusionComputer Textures.BlockIcons.setCasingTextureForId( 52, TextureFactory.of( - TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW).extFacing().build(), - TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW).extFacing().glow() - .build())); + TextureFactory.builder() + .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW) + .extFacing() + .glow() + .build())); } public GT_MetaTileEntity_FusionComputer(int aID, String aName, String aNameRegional, int tier) { @@ -172,10 +210,13 @@ public abstract class GT_MetaTileEntity_FusionComputer @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addController("Fusion Reactor").addInfo("Some kind of fusion reactor, maybe").addSeparator() - .addInfo("Some kind of fusion reactor, maybe") - .addStructureInfo("Should probably be built similar to other fusions") - .addStructureInfo("See controller tooltip for details").toolTipFinisher("Gregtech"); + tt.addController("Fusion Reactor") + .addInfo("Some kind of fusion reactor, maybe") + .addSeparator() + .addInfo("Some kind of fusion reactor, maybe") + .addStructureInfo("Should probably be built similar to other fusions") + .addStructureInfo("See controller tooltip for details") + .toolTipFinisher("Gregtech"); return tt; } @@ -238,11 +279,16 @@ public abstract class GT_MetaTileEntity_FusionComputer @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - if (aSide == aFacing) - return new ITexture[] { TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS).extFacing().build(), - getTextureOverlay() }; + if (aSide == aFacing) return new ITexture[] { TextureFactory.builder() + .addIcon(MACHINE_CASING_FUSION_GLASS) + .extFacing() + .build(), + getTextureOverlay() }; if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(52) }; - return new ITexture[] { TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS).extFacing().build() }; + return new ITexture[] { TextureFactory.builder() + .addIcon(MACHINE_CASING_FUSION_GLASS) + .extFacing() + .build() }; } /** @@ -290,8 +336,12 @@ public abstract class GT_MetaTileEntity_FusionComputer FluidStack[] tFluids = tFluidList.toArray(new FluidStack[0]); GT_Recipe tRecipe; - tRecipe = GT_Recipe.GT_Recipe_Map.sFusionRecipes - .findRecipe(this.getBaseMetaTileEntity(), this.mLastRecipe, false, GT_Values.V[tier()], tFluids); + tRecipe = GT_Recipe.GT_Recipe_Map.sFusionRecipes.findRecipe( + this.getBaseMetaTileEntity(), + this.mLastRecipe, + false, + GT_Values.V[tier()], + tFluids); if (tRecipe == null) { tRecipe = GT_Recipe.GT_Recipe_Map.sComplexFusionRecipes.findRecipe( this.getBaseMetaTileEntity(), @@ -363,8 +413,9 @@ public abstract class GT_MetaTileEntity_FusionComputer for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) if (isValidMetaTileEntity(tHatch)) { long energyToMove = GT_Values.V[tier()] / 16; - if (aBaseMetaTileEntity.getStoredEU() + energyToMove < maxEUStore() && tHatch - .getBaseMetaTileEntity().decreaseStoredEnergyUnits(energyToMove, false)) { + if (aBaseMetaTileEntity.getStoredEU() + energyToMove < maxEUStore() + && tHatch.getBaseMetaTileEntity() + .decreaseStoredEnergyUnits(energyToMove, false)) { aBaseMetaTileEntity.increaseStoredEnergyUnits(energyToMove, true); } } @@ -373,7 +424,8 @@ public abstract class GT_MetaTileEntity_FusionComputer criticalStopMachine(); } if (mMaxProgresstime > 0) { - this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(mEUt, true); + this.getBaseMetaTileEntity() + .decreaseStoredEnergyUnits(mEUt, true); if (mMaxProgresstime > 0 && ++mProgresstime >= mMaxProgresstime) { if (mOutputItems != null) for (ItemStack tStack : mOutputItems) if (tStack != null) addOutput(tStack); @@ -390,7 +442,8 @@ public abstract class GT_MetaTileEntity_FusionComputer try { GT_Mod.achievements.issueAchivementHatchFluid( aBaseMetaTileEntity.getWorld() - .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), + .getPlayerEntityByName( + aBaseMetaTileEntity.getOwnerName()), mOutputFluids[0]); } catch (Exception ignored) {} } @@ -420,8 +473,8 @@ public abstract class GT_MetaTileEntity_FusionComputer stopMachine(); } } - aBaseMetaTileEntity - .setErrorDisplayID((aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (mMachine ? 0 : 64)); + aBaseMetaTileEntity.setErrorDisplayID( + (aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (mMachine ? 0 : 64)); aBaseMetaTileEntity.setActive(mMaxProgresstime > 0); } } @@ -534,8 +587,9 @@ public abstract class GT_MetaTileEntity_FusionComputer @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17) - .setPos(155, 145)); + new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()) + .setSize(17, 17) + .setPos(155, 145)); } @Override @@ -557,59 +611,77 @@ public abstract class GT_MetaTileEntity_FusionComputer public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( new TextWidget(GT_Utility.trans("138", "Incomplete Structure.")).setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> !mMachine).setPos(10, 8)) - .widget(new FakeSyncWidget.BooleanSyncer(() -> mMachine, val -> mMachine = val)) - .widget( - new TextWidget("Hit with Soft Mallet to (re-)start the Machine if it doesn't start.") - .setDefaultColor(COLOR_TEXT_WHITE.get()).setTextAlignment(Alignment.Center) - .setEnabled( - widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 - && !getBaseMetaTileEntity().isActive()) - .setPos(-getGUIWidth() / 2, 170).setSize(getGUIWidth() * 2, 9)) - .widget( - new FakeSyncWidget.IntegerSyncer( - () -> getBaseMetaTileEntity().getErrorDisplayID(), - val -> getBaseMetaTileEntity().setErrorDisplayID(val))) - .widget( - new FakeSyncWidget.BooleanSyncer( - () -> getBaseMetaTileEntity().isActive(), - val -> getBaseMetaTileEntity().setActive(val))) - .widget( - new TextWidget("Running perfectly.").setDefaultColor(COLOR_TEXT_WHITE.get()) - .setTextAlignment(Alignment.Center) - .setEnabled( - widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0 - && getBaseMetaTileEntity().isActive()) - .setPos(0, 170).setSize(getGUIWidth(), 9)) - .widget( - new FakeSyncWidget.IntegerSyncer( - () -> getBaseMetaTileEntity().getErrorDisplayID(), - val -> getBaseMetaTileEntity().setErrorDisplayID(val))) - .widget( - new ProgressBar() - .setProgress( - () -> (float) getBaseMetaTileEntity().getStoredEU() - / getBaseMetaTileEntity().getEUCapacity()) - .setDirection(ProgressBar.Direction.RIGHT) - .setTexture(GT_UITextures.PROGRESSBAR_STORED_EU, 147).setPos(5, 156).setSize(147, 5)) - .widget(TextWidget.dynamicString(() -> { - long energy = getBaseMetaTileEntity().getStoredEU(); - if (energy > 160_000_000L && energy < 160_010_000L) { - energy = 160_000_000L; - } - if (energy > 320_000_000L && energy < 320_010_000L) { - energy = 320_000_000L; - } - if (energy > 640_000_000L && energy < 640_010_000L) { - energy = 640_000_000L; - } - if (energy > 5_120_000_000L && energy < 5_120_080_000L) { - energy = 5_120_000_000L; - } - return GT_Utility.formatNumbers(energy) + " EU"; - }).setDefaultColor(COLOR_TEXT_RED.get()).setPos(50, 155)).widget( - new ButtonWidget().setNEITransferRect(GT_Recipe.GT_Recipe_Map.sFusionRecipes.mNEIName) - .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_NEI) - .setPos(154, 4).setSize(18, 18)); + .setEnabled(widget -> !mMachine) + .setPos(10, 8)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> mMachine, val -> mMachine = val)) + .widget( + new TextWidget( + "Hit with Soft Mallet to (re-)start the Machine if it doesn't start.").setDefaultColor( + COLOR_TEXT_WHITE.get()) + .setTextAlignment( + Alignment.Center) + .setEnabled( + widget -> getBaseMetaTileEntity().getErrorDisplayID() + == 0 + && !getBaseMetaTileEntity().isActive()) + .setPos( + -getGUIWidth() + / 2, + 170) + .setSize( + getGUIWidth() + * 2, + 9)) + .widget( + new FakeSyncWidget.IntegerSyncer( + () -> getBaseMetaTileEntity().getErrorDisplayID(), + val -> getBaseMetaTileEntity().setErrorDisplayID(val))) + .widget( + new FakeSyncWidget.BooleanSyncer( + () -> getBaseMetaTileEntity().isActive(), + val -> getBaseMetaTileEntity().setActive(val))) + .widget( + new TextWidget("Running perfectly.").setDefaultColor(COLOR_TEXT_WHITE.get()) + .setTextAlignment(Alignment.Center) + .setEnabled( + widget -> getBaseMetaTileEntity().getErrorDisplayID() + == 0 && getBaseMetaTileEntity().isActive()) + .setPos(0, 170) + .setSize(getGUIWidth(), 9)) + .widget( + new FakeSyncWidget.IntegerSyncer( + () -> getBaseMetaTileEntity().getErrorDisplayID(), + val -> getBaseMetaTileEntity().setErrorDisplayID(val))) + .widget( + new ProgressBar().setProgress( + () -> (float) getBaseMetaTileEntity().getStoredEU() + / getBaseMetaTileEntity().getEUCapacity()) + .setDirection(ProgressBar.Direction.RIGHT) + .setTexture(GT_UITextures.PROGRESSBAR_STORED_EU, 147) + .setPos(5, 156) + .setSize(147, 5)) + .widget(TextWidget.dynamicString(() -> { + long energy = getBaseMetaTileEntity().getStoredEU(); + if (energy > 160_000_000L && energy < 160_010_000L) { + energy = 160_000_000L; + } + if (energy > 320_000_000L && energy < 320_010_000L) { + energy = 320_000_000L; + } + if (energy > 640_000_000L && energy < 640_010_000L) { + energy = 640_000_000L; + } + if (energy > 5_120_000_000L && energy < 5_120_080_000L) { + energy = 5_120_000_000L; + } + return GT_Utility.formatNumbers(energy) + " EU"; + }) + .setDefaultColor(COLOR_TEXT_RED.get()) + .setPos(50, 155)) + .widget( + new ButtonWidget().setNEITransferRect(GT_Recipe.GT_Recipe_Map.sFusionRecipes.mNEIName) + .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_NEI) + .setPos(154, 4) + .setSize(18, 18)); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java index 7742af798a..382e2c6c6e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java @@ -16,8 +16,15 @@ import gregtech.common.power.FusionPower; public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionComputer { private static final ITexture textureOverlay = TextureFactory.of( - TextureFactory.builder().addIcon(OVERLAY_FUSION1).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FUSION1_GLOW).extFacing().glow().build()); + TextureFactory.builder() + .addIcon(OVERLAY_FUSION1) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FUSION1_GLOW) + .extFacing() + .glow() + .build()); public GT_MetaTileEntity_FusionComputer1(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 6); @@ -67,18 +74,23 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Fusion Reactor").addInfo("It's over 9000!!!") - .addInfo("Controller block for the Fusion Reactor Mk I") - .addInfo("2048EU/t and 10M EU capacity per Energy Hatch") - .addInfo("If the recipe has a startup cost greater than the") - .addInfo("number of energy hatches * cap, you can't do it").addSeparator() - .beginStructureBlock(15, 3, 15, false).addController("See diagram when placed") - .addCasingInfoRange("LuV Machine Casing", 79, 123, false) - .addStructureInfo("Cover the coils with casing") - .addOtherStructurePart("Superconducting Coil Block", "Center part of the ring") - .addEnergyHatch("1-16, Specified casings", 2).addInputHatch("2-16, Specified casings", 1) - .addOutputHatch("1-16, Specified casings", 3).addStructureInfo("ALL Hatches must be LuV or better") - .toolTipFinisher("Gregtech"); + tt.addMachineType("Fusion Reactor") + .addInfo("It's over 9000!!!") + .addInfo("Controller block for the Fusion Reactor Mk I") + .addInfo("2048EU/t and 10M EU capacity per Energy Hatch") + .addInfo("If the recipe has a startup cost greater than the") + .addInfo("number of energy hatches * cap, you can't do it") + .addSeparator() + .beginStructureBlock(15, 3, 15, false) + .addController("See diagram when placed") + .addCasingInfoRange("LuV Machine Casing", 79, 123, false) + .addStructureInfo("Cover the coils with casing") + .addOtherStructurePart("Superconducting Coil Block", "Center part of the ring") + .addEnergyHatch("1-16, Specified casings", 2) + .addInputHatch("2-16, Specified casings", 1) + .addOutputHatch("1-16, Specified casings", 3) + .addStructureInfo("ALL Hatches must be LuV or better") + .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java index de7a54ae93..5a5e884cb8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java @@ -16,8 +16,15 @@ import gregtech.common.power.FusionPower; public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionComputer { private static final ITexture textureOverlay = TextureFactory.of( - TextureFactory.builder().addIcon(OVERLAY_FUSION2).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FUSION2_GLOW).extFacing().glow().build()); + TextureFactory.builder() + .addIcon(OVERLAY_FUSION2) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FUSION2_GLOW) + .extFacing() + .glow() + .build()); public GT_MetaTileEntity_FusionComputer2(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 7); @@ -67,18 +74,23 @@ public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionC @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Fusion Reactor").addInfo("It's over 9000!!!") - .addInfo("Controller block for the Fusion Reactor Mk II") - .addInfo("8192EU/t and 20M EU capacity per Energy Hatch") - .addInfo("If the recipe has a startup cost greater than the") - .addInfo("number of energy hatches * cap, you can't do it").addSeparator() - .beginStructureBlock(15, 3, 15, false).addController("See diagram when placed") - .addCasingInfoRange("Fusion Machine Casing", 79, 123, false) - .addStructureInfo("Cover the coils with casing") - .addOtherStructurePart("Fusion Coil Block", "Center part of the ring") - .addEnergyHatch("1-16, Specified casings", 2).addInputHatch("2-16, Specified casings", 1) - .addOutputHatch("1-16, Specified casings", 3).addStructureInfo("ALL Hatches must be ZPM or better") - .toolTipFinisher("Gregtech"); + tt.addMachineType("Fusion Reactor") + .addInfo("It's over 9000!!!") + .addInfo("Controller block for the Fusion Reactor Mk II") + .addInfo("8192EU/t and 20M EU capacity per Energy Hatch") + .addInfo("If the recipe has a startup cost greater than the") + .addInfo("number of energy hatches * cap, you can't do it") + .addSeparator() + .beginStructureBlock(15, 3, 15, false) + .addController("See diagram when placed") + .addCasingInfoRange("Fusion Machine Casing", 79, 123, false) + .addStructureInfo("Cover the coils with casing") + .addOtherStructurePart("Fusion Coil Block", "Center part of the ring") + .addEnergyHatch("1-16, Specified casings", 2) + .addInputHatch("2-16, Specified casings", 1) + .addOutputHatch("1-16, Specified casings", 3) + .addStructureInfo("ALL Hatches must be ZPM or better") + .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java index 09d8a46c26..2d5c6111fd 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java @@ -16,8 +16,15 @@ import gregtech.common.power.FusionPower; public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionComputer { private static final ITexture textureOverlay = TextureFactory.of( - TextureFactory.builder().addIcon(OVERLAY_FUSION3).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FUSION3_GLOW).extFacing().glow().build()); + TextureFactory.builder() + .addIcon(OVERLAY_FUSION3) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FUSION3_GLOW) + .extFacing() + .glow() + .build()); public GT_MetaTileEntity_FusionComputer3(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 8); @@ -67,18 +74,23 @@ public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionC @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Fusion Reactor").addInfo("A SUN DOWN ON EARTH") - .addInfo("Controller block for the Fusion Reactor Mk III") - .addInfo("32768EU/t and 40M EU capacity per Energy Hatch") - .addInfo("If the recipe has a startup cost greater than the") - .addInfo("number of energy hatches * cap, you can't do it").addSeparator() - .beginStructureBlock(15, 3, 15, false).addController("See diagram when placed") - .addCasingInfoRange("Fusion Machine Casing Mk II", 79, 123, false) - .addStructureInfo("Cover the coils with casing") - .addOtherStructurePart("Fusion Coil Block", "Center part of the ring") - .addEnergyHatch("1-16, Specified casings", 2).addInputHatch("2-16, Specified casings", 1) - .addOutputHatch("1-16, Specified casings", 3).addStructureInfo("ALL Hatches must be UV or better") - .toolTipFinisher("Gregtech"); + tt.addMachineType("Fusion Reactor") + .addInfo("A SUN DOWN ON EARTH") + .addInfo("Controller block for the Fusion Reactor Mk III") + .addInfo("32768EU/t and 40M EU capacity per Energy Hatch") + .addInfo("If the recipe has a startup cost greater than the") + .addInfo("number of energy hatches * cap, you can't do it") + .addSeparator() + .beginStructureBlock(15, 3, 15, false) + .addController("See diagram when placed") + .addCasingInfoRange("Fusion Machine Casing Mk II", 79, 123, false) + .addStructureInfo("Cover the coils with casing") + .addOtherStructurePart("Fusion Coil Block", "Center part of the ring") + .addEnergyHatch("1-16, Specified casings", 2) + .addInputHatch("2-16, Specified casings", 1) + .addOutputHatch("1-16, Specified casings", 3) + .addStructureInfo("ALL Hatches must be UV or better") + .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java index 4405044703..ceb901c5ad 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java @@ -42,33 +42,68 @@ public class GT_MetaTileEntity_HeatExchanger extends private static final int dryHeatMaximum = 2000; // 2000 ticks = 100 seconds private static final int CASING_INDEX = 50; private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition<GT_MetaTileEntity_HeatExchanger> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_HeatExchanger>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { { "ccc", "cCc", "ccc" }, { "ccc", "cPc", "ccc" }, { "ccc", "cPc", "ccc" }, - { "c~c", "cHc", "ccc" }, })) - .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 14)) - .addElement( - 'C', - OutputHatch.withAdder(GT_MetaTileEntity_HeatExchanger::addColdFluidOutputToMachineList) - .withCount(t -> isValidMetaTileEntity(t.mOutputColdFluidHatch) ? 1 : 0) - .newAny(CASING_INDEX, 3)) - .addElement( - 'H', - OutputHatch.withAdder(GT_MetaTileEntity_HeatExchanger::addHotFluidInputToMachineList) - .withCount(t -> isValidMetaTileEntity(t.mInputHotFluidHatch) ? 1 : 0) - .newAny(CASING_INDEX, 3)) - .addElement( - 'c', - buildHatchAdder(GT_MetaTileEntity_HeatExchanger.class) - .atLeast(InputBus, InputHatch, OutputBus, OutputHatch, Maintenance) - .casingIndex(CASING_INDEX).dot(1).buildAndChain( - onElementPass( - GT_MetaTileEntity_HeatExchanger::onCasingAdded, - ofBlock(GregTech_API.sBlockCasings4, (byte) 2)))) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_HeatExchanger> STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_HeatExchanger>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { + { "ccc", "cCc", + "ccc" }, + { "ccc", "cPc", + "ccc" }, + { "ccc", "cPc", + "ccc" }, + { "c~c", "cHc", + "ccc" }, })) + .addElement( + 'P', + ofBlock( + GregTech_API.sBlockCasings2, + 14)) + .addElement( + 'C', + OutputHatch.withAdder( + GT_MetaTileEntity_HeatExchanger::addColdFluidOutputToMachineList) + .withCount( + t -> isValidMetaTileEntity( + t.mOutputColdFluidHatch) + ? 1 + : 0) + .newAny( + CASING_INDEX, + 3)) + .addElement( + 'H', + OutputHatch.withAdder( + GT_MetaTileEntity_HeatExchanger::addHotFluidInputToMachineList) + .withCount( + t -> isValidMetaTileEntity( + t.mInputHotFluidHatch) + ? 1 + : 0) + .newAny( + CASING_INDEX, + 3)) + .addElement( + 'c', + buildHatchAdder( + GT_MetaTileEntity_HeatExchanger.class).atLeast( + InputBus, + InputHatch, + OutputBus, + OutputHatch, + Maintenance) + .casingIndex( + CASING_INDEX) + .dot( + 1) + .buildAndChain( + onElementPass( + GT_MetaTileEntity_HeatExchanger::onCasingAdded, + ofBlock( + GregTech_API.sBlockCasings4, + (byte) 2)))) + .build(); public static float penalty_per_config = 0.015f; // penalize 1.5% efficiency per circuitry level (1-25) private GT_MetaTileEntity_Hatch_Input mInputHotFluidHatch; @@ -93,17 +128,24 @@ public class GT_MetaTileEntity_HeatExchanger extends @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Heat Exchanger").addInfo("Controller Block for the Large Heat Exchanger") - .addInfo("More complicated than a Fusion Reactor. Seriously").addInfo("Inputs are Hot Coolant or Lava") - .addInfo("Outputs Coolant or Pahoehoe Lava and SH Steam/Steam") - .addInfo("Read the wiki article to understand how it works") - .addInfo("Then go to the Discord to understand the wiki").addSeparator() - .beginStructureBlock(3, 4, 3, false).addController("Front bottom") - .addCasingInfoRange("Stable Titanium Machine Casing", 20, 32, false) - .addOtherStructurePart("Titanium Pipe Casing", "Center 2 blocks").addMaintenanceHatch("Any casing", 1) - .addInputHatch("Hot fluid, bottom center", 2).addInputHatch("Distilled water, any casing", 1) - .addOutputHatch("Cold fluid, top center", 3).addOutputHatch("Steam/SH Steam, any casing", 1) - .toolTipFinisher("Gregtech"); + tt.addMachineType("Heat Exchanger") + .addInfo("Controller Block for the Large Heat Exchanger") + .addInfo("More complicated than a Fusion Reactor. Seriously") + .addInfo("Inputs are Hot Coolant or Lava") + .addInfo("Outputs Coolant or Pahoehoe Lava and SH Steam/Steam") + .addInfo("Read the wiki article to understand how it works") + .addInfo("Then go to the Discord to understand the wiki") + .addSeparator() + .beginStructureBlock(3, 4, 3, false) + .addController("Front bottom") + .addCasingInfoRange("Stable Titanium Machine Casing", 20, 32, false) + .addOtherStructurePart("Titanium Pipe Casing", "Center 2 blocks") + .addMaintenanceHatch("Any casing", 1) + .addInputHatch("Hot fluid, bottom center", 2) + .addInputHatch("Distilled water, any casing", 1) + .addOutputHatch("Cold fluid, top center", 3) + .addOutputHatch("Steam/SH Steam, any casing", 1) + .toolTipFinisher("Gregtech"); return tt; } @@ -125,13 +167,26 @@ public class GT_MetaTileEntity_HeatExchanger extends public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - if (aActive) return new ITexture[] { casingTexturePages[0][CASING_INDEX], - TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { casingTexturePages[0][CASING_INDEX], - TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_GLOW).extFacing().glow().build() }; + if (aActive) return new ITexture[] { casingTexturePages[0][CASING_INDEX], TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { casingTexturePages[0][CASING_INDEX], TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_HEAT_EXCHANGER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_HEAT_EXCHANGER_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { casingTexturePages[0][CASING_INDEX] }; } @@ -162,7 +217,8 @@ public class GT_MetaTileEntity_HeatExchanger extends boolean do_solarSalt = false; // Do we have an integrated circuit with a valid configuration? - if (mInventory[1] != null && mInventory[1].getUnlocalizedName().startsWith("gt.integrated_circuit")) { + if (mInventory[1] != null && mInventory[1].getUnlocalizedName() + .startsWith("gt.integrated_circuit")) { int circuit_config = mInventory[1].getItemDamage(); if (circuit_config >= 1 && circuit_config <= 25) { // If so, apply the penalty and reduced threshold. @@ -177,19 +233,26 @@ public class GT_MetaTileEntity_HeatExchanger extends steam_output_multiplier /= 5f; // lava is not boosted superheated_threshold /= 4f; // unchanged do_lava = true; - } else if (mInputHotFluidHatch.getFluid().isFluidEqual(FluidRegistry.getFluidStack("ic2hotcoolant", 1))) { - steam_output_multiplier /= 2f; // was boosted x2 on top of x5 -> total x10 -> nerf with this code back to 5x - superheated_threshold /= 5f; // 10x smaller since the Hot Things production in reactor is the same. - do_coolant = true; - } else if (mInputHotFluidHatch.getFluid().isFluidEqual(FluidRegistry.getFluidStack("molten.solarsalthot", 1))) { - steam_output_multiplier *= 2.5f; // Solar Salt:Steam value is 5x higher than Hot Coolant's value - superheated_threshold /= 25f; // Given that, multiplier is 5x higher and threshold is 5x lower - do_solarSalt = true; - } else { - // If we're working with neither, fail out - superheated_threshold = 0; - return false; - } + } else if (mInputHotFluidHatch.getFluid() + .isFluidEqual(FluidRegistry.getFluidStack("ic2hotcoolant", 1))) { + steam_output_multiplier /= 2f; // was boosted x2 on top of x5 -> total x10 -> + // nerf with this code back to 5x + superheated_threshold /= 5f; // 10x smaller since the Hot Things production in + // reactor is the same. + do_coolant = true; + } else + if (mInputHotFluidHatch.getFluid() + .isFluidEqual(FluidRegistry.getFluidStack("molten.solarsalthot", 1))) { + steam_output_multiplier *= 2.5f; // Solar Salt:Steam value is 5x higher than Hot + // Coolant's value + superheated_threshold /= 25f; // Given that, multiplier is 5x higher and + // threshold is 5x lower + do_solarSalt = true; + } else { + // If we're working with neither, fail out + superheated_threshold = 0; + return false; + } superheated = fluidAmountToConsume >= superheated_threshold; // set the internal superheated flag if we have // enough hot fluid. Used in the diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java index ca9c31f350..fede7c283d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java @@ -43,13 +43,21 @@ public class GT_MetaTileEntity_ImplosionCompressor @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Implosion Compressor").addInfo("Explosions are fun") - .addInfo("Controller block for the Implosion Compressor") - .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front center").addCasingInfoRange("Solid Steel Machine Casing", 16, 24, false) - .addStructureInfo("Casings can be replaced with Explosion Warning Signs") - .addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1).addMufflerHatch("Any casing", 1) - .addInputBus("Any casing", 1).addOutputBus("Any casing", 1).toolTipFinisher("Gregtech"); + tt.addMachineType("Implosion Compressor") + .addInfo("Explosions are fun") + .addInfo("Controller block for the Implosion Compressor") + .addPollutionAmount(getPollutionPerSecond(null)) + .addSeparator() + .beginStructureBlock(3, 3, 3, true) + .addController("Front center") + .addCasingInfoRange("Solid Steel Machine Casing", 16, 24, false) + .addStructureInfo("Casings can be replaced with Explosion Warning Signs") + .addEnergyHatch("Any casing", 1) + .addMaintenanceHatch("Any casing", 1) + .addMufflerHatch("Any casing", 1) + .addInputBus("Any casing", 1) + .addOutputBus("Any casing", 1) + .toolTipFinisher("Gregtech"); return tt; } @@ -63,14 +71,26 @@ public class GT_MetaTileEntity_ImplosionCompressor public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - if (aActive) return new ITexture[] { BlockIcons.casingTexturePages[0][16], - 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[] { BlockIcons.casingTexturePages[0][16], - TextureFactory.builder().addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_IMPLOSION_COMPRESSOR_GLOW).extFacing().glow() - .build() }; + if (aActive) return new ITexture[] { BlockIcons.casingTexturePages[0][16], 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[] { BlockIcons.casingTexturePages[0][16], 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.casingTexturePages[0][16] }; } @@ -105,8 +125,12 @@ public class GT_MetaTileEntity_ImplosionCompressor } ItemStack[] tInputs = tInputList.toArray(new ItemStack[0]); if (!tInputList.isEmpty()) { - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sImplosionRecipes - .findRecipe(getBaseMetaTileEntity(), false, 9223372036854775807L, null, tInputs); + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sImplosionRecipes.findRecipe( + getBaseMetaTileEntity(), + false, + 9223372036854775807L, + null, + tInputs); if ((tRecipe != null) && (tRecipe.isRecipeInputEqual(true, null, tInputs))) { this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java index dc186dadeb..832d376dc6 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java @@ -54,65 +54,184 @@ public class GT_MetaTileEntity_IntegratedOreFactory private static final int CASING_INDEX2 = 49; private static final int MAX_PARA = 1024; private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition<GT_MetaTileEntity_IntegratedOreFactory> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_IntegratedOreFactory>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { - { " ", " ", " WWW ", " WWW ", " ", - " " }, - { " ", " sss ", " sppps", " sppps", " sss ", - " " }, - { " ", " sss ", " s s", " s s", " sss ", - " " }, - { " ", " sss ", " sppps", " sppps", " sss ", - " " }, - { " ", " sss ", " s s", " s s", " sss ", - " " }, - { " ", " sss ", " sppps", " sppps", " sss ", - " " }, - { "iiiiii ", "iIIIIiisssi", "iIIIIis s", "iIIIIis s", "iIIIIiisssi", - "iiiiii " }, - { "iggggi ", "gt t isssi", "g xx sppps", "g xx sppps", "gt t isssi", - "iggggi " }, - { "iggggi ", "gt t isssi", "g xx s s", "g xx s s", "gt t isssi", - "iggggi " }, - { "iggggi ", "gt t is~si", "g xx spppO", "g xx spppO", "gt t isssi", - "iggggi " }, - { "iggggi ", "gt t isssi", "g xx s O", "g xx s O", "gt t isssi", - "iggggi " }, - { "EEEEEE ", "EEEEEEEEEEE", "EEEEEEEEEEE", "EEEEEEEEEEE", "EEEEEEEEEEE", - "EEEEEE " } })) - .addElement('i', ofBlock(GregTech_API.sBlockCasings8, 7)) - .addElement('s', ofBlock(GregTech_API.sBlockCasings4, 1)) - .addElement( - 'g', - ofChain( - ofBlockUnlocalizedName("IC2", "blockAlloyGlass", 0, true), - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 0, true), - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks2", 0, true), - // warded glass - ofBlockUnlocalizedName("Thaumcraft", "blockCosmeticOpaque", 2, false))) - .addElement('x', ofBlock(GregTech_API.sBlockCasings2, 3)) - .addElement('p', ofBlock(GregTech_API.sBlockCasings2, 15)).addElement('t', ofFrame(Materials.TungstenSteel)) - .addElement( - 'E', - buildHatchAdder(GT_MetaTileEntity_IntegratedOreFactory.class).atLeast(Energy, Maintenance) - .casingIndex(CASING_INDEX1).dot(1).buildAndChain(GregTech_API.sBlockCasings8, 7)) - .addElement( - 'I', - buildHatchAdder(GT_MetaTileEntity_IntegratedOreFactory.class).atLeast(InputBus) - .casingIndex(CASING_INDEX1).dot(2).buildAndChain(GregTech_API.sBlockCasings8, 7)) - .addElement( - 'W', - buildHatchAdder(GT_MetaTileEntity_IntegratedOreFactory.class).atLeast(InputHatch, Muffler) - .casingIndex(CASING_INDEX2).dot(3).buildAndChain(GregTech_API.sBlockCasings4, 1)) - .addElement( - 'O', - buildHatchAdder(GT_MetaTileEntity_IntegratedOreFactory.class).atLeast(OutputBus, OutputHatch) - .casingIndex(CASING_INDEX2).dot(4).buildAndChain(GregTech_API.sBlockCasings4, 1)) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_IntegratedOreFactory> STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_IntegratedOreFactory>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { + { " ", + " ", + " WWW ", + " WWW ", + " ", + " " }, + { " ", + " sss ", + " sppps", + " sppps", + " sss ", + " " }, + { " ", + " sss ", + " s s", + " s s", + " sss ", + " " }, + { " ", + " sss ", + " sppps", + " sppps", + " sss ", + " " }, + { " ", + " sss ", + " s s", + " s s", + " sss ", + " " }, + { " ", + " sss ", + " sppps", + " sppps", + " sss ", + " " }, + { "iiiiii ", + "iIIIIiisssi", + "iIIIIis s", + "iIIIIis s", + "iIIIIiisssi", + "iiiiii " }, + { "iggggi ", + "gt t isssi", + "g xx sppps", + "g xx sppps", + "gt t isssi", + "iggggi " }, + { "iggggi ", + "gt t isssi", + "g xx s s", + "g xx s s", + "gt t isssi", + "iggggi " }, + { "iggggi ", + "gt t is~si", + "g xx spppO", + "g xx spppO", + "gt t isssi", + "iggggi " }, + { "iggggi ", + "gt t isssi", + "g xx s O", + "g xx s O", + "gt t isssi", + "iggggi " }, + { "EEEEEE ", + "EEEEEEEEEEE", + "EEEEEEEEEEE", + "EEEEEEEEEEE", + "EEEEEEEEEEE", + "EEEEEE " } })) + .addElement( + 'i', + ofBlock( + GregTech_API.sBlockCasings8, + 7)) + .addElement( + 's', + ofBlock( + GregTech_API.sBlockCasings4, + 1)) + .addElement( + 'g', + ofChain( + ofBlockUnlocalizedName( + "IC2", + "blockAlloyGlass", + 0, + true), + ofBlockUnlocalizedName( + "bartworks", + "BW_GlasBlocks", + 0, + true), + ofBlockUnlocalizedName( + "bartworks", + "BW_GlasBlocks2", + 0, + true), + // warded + // glass + ofBlockUnlocalizedName( + "Thaumcraft", + "blockCosmeticOpaque", + 2, + false))) + .addElement( + 'x', + ofBlock( + GregTech_API.sBlockCasings2, + 3)) + .addElement( + 'p', + ofBlock( + GregTech_API.sBlockCasings2, + 15)) + .addElement( + 't', + ofFrame( + Materials.TungstenSteel)) + .addElement( + 'E', + buildHatchAdder( + GT_MetaTileEntity_IntegratedOreFactory.class).atLeast( + Energy, + Maintenance) + .casingIndex( + CASING_INDEX1) + .dot( + 1) + .buildAndChain( + GregTech_API.sBlockCasings8, + 7)) + .addElement( + 'I', + buildHatchAdder( + GT_MetaTileEntity_IntegratedOreFactory.class).atLeast( + InputBus) + .casingIndex( + CASING_INDEX1) + .dot( + 2) + .buildAndChain( + GregTech_API.sBlockCasings8, + 7)) + .addElement( + 'W', + buildHatchAdder( + GT_MetaTileEntity_IntegratedOreFactory.class).atLeast( + InputHatch, + Muffler) + .casingIndex( + CASING_INDEX2) + .dot( + 3) + .buildAndChain( + GregTech_API.sBlockCasings4, + 1)) + .addElement( + 'O', + buildHatchAdder( + GT_MetaTileEntity_IntegratedOreFactory.class).atLeast( + OutputBus, + OutputHatch) + .casingIndex( + CASING_INDEX2) + .dot( + 4) + .buildAndChain( + GregTech_API.sBlockCasings4, + 1)) + .build(); private static final HashSet<Integer> isCrushedOre = new HashSet<>(); private static final HashSet<Integer> isCrushedPureOre = new HashSet<>(); @@ -188,20 +307,31 @@ public class GT_MetaTileEntity_IntegratedOreFactory @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Ore Processor").addInfo("Controller Block for the Integrated Ore Factory") - .addInfo("It is OP. I mean ore processor.").addInfo("Do all ore procession in one step.") - .addInfo("Can process up to 1024 ores per time.") - .addInfo("Every ore costs 30EU/t, 2L lubricant, 200L distilled water.") - .addInfo("Process time is depend on mode.").addInfo("Use a screwdriver to switch mode.") - .addInfo("Sneak click with screwdriver to void the stone dusts.").addSeparator() - .beginStructureBlock(6, 12, 11, false).addController("The third layer") - .addStructureInfo("128 advanced iridium plated machine casing") - .addStructureInfo("105 clean stainless steel machine casing").addStructureInfo("48 reinforced glass") - .addStructureInfo("30 tungstensteel pipe casing").addStructureInfo("16 tungstensteel frame box") - .addStructureInfo("16 steel gear box casing").addEnergyHatch("Button Casing", 1) - .addMaintenanceHatch("Button Casing", 1).addInputBus("Input ore/crushed ore", 2) - .addInputHatch("Input lubricant/distilled water/washing chemicals", 3) - .addMufflerHatch("Output Pollution", 3).addOutputBus("Output products", 4).toolTipFinisher("Gregtech"); + tt.addMachineType("Ore Processor") + .addInfo("Controller Block for the Integrated Ore Factory") + .addInfo("It is OP. I mean ore processor.") + .addInfo("Do all ore procession in one step.") + .addInfo("Can process up to 1024 ores per time.") + .addInfo("Every ore costs 30EU/t, 2L lubricant, 200L distilled water.") + .addInfo("Process time is depend on mode.") + .addInfo("Use a screwdriver to switch mode.") + .addInfo("Sneak click with screwdriver to void the stone dusts.") + .addSeparator() + .beginStructureBlock(6, 12, 11, false) + .addController("The third layer") + .addStructureInfo("128 advanced iridium plated machine casing") + .addStructureInfo("105 clean stainless steel machine casing") + .addStructureInfo("48 reinforced glass") + .addStructureInfo("30 tungstensteel pipe casing") + .addStructureInfo("16 tungstensteel frame box") + .addStructureInfo("16 steel gear box casing") + .addEnergyHatch("Button Casing", 1) + .addMaintenanceHatch("Button Casing", 1) + .addInputBus("Input ore/crushed ore", 2) + .addInputHatch("Input lubricant/distilled water/washing chemicals", 3) + .addMufflerHatch("Output Pollution", 3) + .addOutputBus("Output products", 4) + .toolTipFinisher("Gregtech"); return tt; } @@ -399,8 +529,12 @@ public class GT_MetaTileEntity_IntegratedOreFactory for (ItemStack aStack : sMidProduct) { int tID = GT_Utility.stackToInt(aStack); if (checkTypes(tID, aTables)) { - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sMaceratorRecipes - .findRecipe(getBaseMetaTileEntity(), false, GT_Values.V[15], null, aStack); + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.findRecipe( + getBaseMetaTileEntity(), + false, + GT_Values.V[15], + null, + aStack); if (tRecipe != null) { tProduct.addAll(getOutputStack(tRecipe, aStack.stackSize)); } else { @@ -447,8 +581,12 @@ public class GT_MetaTileEntity_IntegratedOreFactory for (ItemStack aStack : sMidProduct) { int tID = GT_Utility.stackToInt(aStack); if (checkTypes(tID, aTables)) { - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes - .findRecipe(getBaseMetaTileEntity(), false, GT_Values.V[15], null, aStack); + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes.findRecipe( + getBaseMetaTileEntity(), + false, + GT_Values.V[15], + null, + aStack); if (tRecipe != null) { tProduct.addAll(getOutputStack(tRecipe, aStack.stackSize)); } else { @@ -469,8 +607,12 @@ public class GT_MetaTileEntity_IntegratedOreFactory for (ItemStack aStack : sMidProduct) { int tID = GT_Utility.stackToInt(aStack); if (checkTypes(tID, aTables)) { - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes - .findRecipe(getBaseMetaTileEntity(), false, GT_Values.V[15], null, aStack); + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.findRecipe( + getBaseMetaTileEntity(), + false, + GT_Values.V[15], + null, + aStack); if (tRecipe != null) { tProduct.addAll(getOutputStack(tRecipe, aStack.stackSize)); } else { @@ -491,8 +633,12 @@ public class GT_MetaTileEntity_IntegratedOreFactory for (ItemStack aStack : sMidProduct) { int tID = GT_Utility.stackToInt(aStack); if (checkTypes(tID, aTables)) { - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sSifterRecipes - .findRecipe(getBaseMetaTileEntity(), false, GT_Values.V[15], null, aStack); + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sSifterRecipes.findRecipe( + getBaseMetaTileEntity(), + false, + GT_Values.V[15], + null, + aStack); if (tRecipe != null) { tProduct.addAll(getOutputStack(tRecipe, aStack.stackSize)); } else { @@ -520,7 +666,8 @@ public class GT_MetaTileEntity_IntegratedOreFactory getStoredFluids().toArray(new FluidStack[0]), aStack); if (tRecipe != null && tRecipe.getRepresentativeFluidInput(0) != null) { - FluidStack tInputFluid = tRecipe.getRepresentativeFluidInput(0).copy(); + FluidStack tInputFluid = tRecipe.getRepresentativeFluidInput(0) + .copy(); int tStored = getFluidAmount(tInputFluid); int tWashed = Math.min(tStored / tInputFluid.amount, aStack.stackSize); depleteInput(new FluidStack(tInputFluid.getFluid(), tWashed * tInputFluid.amount)); @@ -569,7 +716,9 @@ public class GT_MetaTileEntity_IntegratedOreFactory GT_Utility.copyAmountUnsafe(tAmount * aRecipe.getOutput(i).stackSize, aRecipe.getOutput(i))); } } - return tOutput.stream().filter(i -> (i != null && i.stackSize > 0)).collect(Collectors.toList()); + return tOutput.stream() + .filter(i -> (i != null && i.stackSize > 0)) + .collect(Collectors.toList()); } private void doCompress(List<ItemStack> aList) { @@ -655,12 +804,25 @@ public class GT_MetaTileEntity_IntegratedOreFactory boolean aActive, boolean aRedstone) { if (aSide == aFacing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX2), - TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX2), - TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_GLOW).extFacing().glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX2), TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_PROCESSING_ARRAY) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX2) }; } @@ -669,13 +831,13 @@ public class GT_MetaTileEntity_IntegratedOreFactory final EnumChatFormatting AQUA = EnumChatFormatting.AQUA; final String CRUSH = StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor.Macerate"); final String WASH = StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor.Ore_Washer") - .replace(" ", " " + AQUA); + .replace(" ", " " + AQUA); final String THERMAL = StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor.Thermal_Centrifuge") - .replace(" ", " " + AQUA); + .replace(" ", " " + AQUA); final String CENTRIFUGE = StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor.Centrifuge"); final String SIFTER = StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor.Sifter"); final String CHEM_WASH = StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor.Chemical_Bathing") - .replace(" ", " " + AQUA); + .replace(" ", " " + AQUA); final String ARROW = " " + AQUA + "-> "; List<String> des = new ArrayList<>(); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java index 6bd2da57db..d6fdc56854 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java @@ -51,30 +51,47 @@ public abstract class GT_MetaTileEntity_LargeBoiler extends @Override protected IStructureDefinition<GT_MetaTileEntity_LargeBoiler> computeValue(Class<?> type) { - return StructureDefinition.<GT_MetaTileEntity_LargeBoiler>builder().addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { { "ccc", "ccc", "ccc" }, { "ccc", "cPc", "ccc" }, { "ccc", "cPc", "ccc" }, - { "ccc", "cPc", "ccc" }, { "f~f", "fff", "fff" }, })) - .addElement('P', lazy(t -> ofBlock(t.getPipeBlock(), t.getPipeMeta()))) - .addElement( - 'c', - lazy( - t -> buildHatchAdder(GT_MetaTileEntity_LargeBoiler.class).atLeast(OutputHatch) - .casingIndex(t.getCasingTextureIndex()).dot(2).buildAndChain( - onElementPass( - GT_MetaTileEntity_LargeBoiler::onCasingAdded, - ofBlock(t.getCasingBlock(), t.getCasingMeta()))))) - .addElement( - 'f', - lazy( - t -> buildHatchAdder(GT_MetaTileEntity_LargeBoiler.class) - .atLeast(Maintenance, InputHatch, InputBus, Muffler) - .casingIndex(t.getFireboxTextureIndex()).dot(1).buildAndChain( - onElementPass( - GT_MetaTileEntity_LargeBoiler::onFireboxAdded, - ofBlock(t.getFireboxBlock(), t.getFireboxMeta()))))) - .build(); + return StructureDefinition.<GT_MetaTileEntity_LargeBoiler>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { { "ccc", "ccc", "ccc" }, { "ccc", "cPc", "ccc" }, + { "ccc", "cPc", "ccc" }, { "ccc", "cPc", "ccc" }, + { "f~f", "fff", "fff" }, })) + .addElement('P', lazy(t -> ofBlock(t.getPipeBlock(), t.getPipeMeta()))) + .addElement( + 'c', + lazy( + t -> buildHatchAdder( + GT_MetaTileEntity_LargeBoiler.class).atLeast(OutputHatch) + .casingIndex( + t.getCasingTextureIndex()) + .dot(2) + .buildAndChain( + onElementPass( + GT_MetaTileEntity_LargeBoiler::onCasingAdded, + ofBlock( + t.getCasingBlock(), + t.getCasingMeta()))))) + .addElement( + 'f', + lazy( + t -> buildHatchAdder( + GT_MetaTileEntity_LargeBoiler.class).atLeast( + Maintenance, + InputHatch, + InputBus, + Muffler) + .casingIndex( + t.getFireboxTextureIndex()) + .dot(1) + .buildAndChain( + onElementPass( + GT_MetaTileEntity_LargeBoiler::onFireboxAdded, + ofBlock( + t.getFireboxBlock(), + t.getFireboxMeta()))))) + .build(); } }; private boolean firstRun = true; @@ -99,7 +116,8 @@ public abstract class GT_MetaTileEntity_LargeBoiler extends protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Boiler").addInfo("Controller block for the Large " + getCasingMaterial() + " Boiler"); + tt.addMachineType("Boiler") + .addInfo("Controller block for the Large " + getCasingMaterial() + " Boiler"); // Tooltip differs between the boilers that output Superheated Steam (Titanium and Tungstensteel) and the ones // that do not (Bronze and Steel) if (isSuperheated()) { @@ -108,31 +126,37 @@ public abstract class GT_MetaTileEntity_LargeBoiler extends + "L of Superheated Steam with 1 Coal at " + formatNumbers((getEUt() * 40L) / superToNormalSteam) + "L/s") // ? - .addInfo("A programmed circuit in the main block throttles the boiler (-1000L/s per config)") - .addInfo("Only some solid fuels are allowed (check the NEI Large Boiler tab for details)") - .addInfo("If there are any disallowed fuels in the input bus, the boiler won't run!"); + .addInfo("A programmed circuit in the main block throttles the boiler (-1000L/s per config)") + .addInfo("Only some solid fuels are allowed (check the NEI Large Boiler tab for details)") + .addInfo("If there are any disallowed fuels in the input bus, the boiler won't run!"); } else { tt.addInfo( "Produces " + formatNumbers((getEUt() * 40) * (runtimeBoost(20) / 20f)) + "L of Steam with 1 Coal at " + formatNumbers(getEUt() * 40) + "L/s") // ? - .addInfo("A programmed circuit in the main block throttles the boiler (-1000L/s per config)") - .addInfo("Solid Fuels with a burn value that is too high or too low will not work"); + .addInfo("A programmed circuit in the main block throttles the boiler (-1000L/s per config)") + .addInfo("Solid Fuels with a burn value that is too high or too low will not work"); } tt.addInfo( String.format( "Diesel fuels have 1/4 efficiency - Takes %s seconds to heat up", formatNumbers(500.0 / getEfficiencyIncrease()))) // ? check semifluid again - .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 5, 3, false) - .addController("Front bottom") - .addCasingInfoRange(getCasingMaterial() + " " + getCasingBlockType() + " Casing", 24, 31, false) // ? - .addOtherStructurePart(getCasingMaterial() + " Fire Boxes", "Bottom layer, 3 minimum") - .addOtherStructurePart(getCasingMaterial() + " Pipe Casing Blocks", "Inner 3 blocks") - .addMaintenanceHatch("Any firebox", 1).addMufflerHatch("Any firebox", 1) - .addInputBus("Solid fuel, Any firebox", 1).addInputHatch("Liquid fuel, Any firebox", 1) - .addStructureInfo("You can use either, or both").addInputHatch("Water, Any firebox", 1) - .addOutputHatch("Steam, any casing", 2).toolTipFinisher("Gregtech"); + .addPollutionAmount(getPollutionPerSecond(null)) + .addSeparator() + .beginStructureBlock(3, 5, 3, false) + .addController("Front bottom") + .addCasingInfoRange(getCasingMaterial() + " " + getCasingBlockType() + " Casing", 24, 31, false) // ? + .addOtherStructurePart(getCasingMaterial() + " Fire Boxes", "Bottom layer, 3 minimum") + .addOtherStructurePart(getCasingMaterial() + " Pipe Casing Blocks", "Inner 3 blocks") + .addMaintenanceHatch("Any firebox", 1) + .addMufflerHatch("Any firebox", 1) + .addInputBus("Solid fuel, Any firebox", 1) + .addInputHatch("Liquid fuel, Any firebox", 1) + .addStructureInfo("You can use either, or both") + .addInputHatch("Water, Any firebox", 1) + .addOutputHatch("Steam, any casing", 2) + .toolTipFinisher("Gregtech"); return tt; } @@ -179,12 +203,25 @@ public abstract class GT_MetaTileEntity_LargeBoiler extends boolean aActive, boolean aRedstone) { if (aSide == aFacing) { if (aActive) return new ITexture[] { BlockIcons.getCasingTextureForId(getCasingTextureIndex()), - TextureFactory.builder().addIcon(OVERLAY_FRONT_LARGE_BOILER_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_LARGE_BOILER_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { BlockIcons.getCasingTextureForId(getCasingTextureIndex()), - TextureFactory.builder().addIcon(OVERLAY_FRONT_LARGE_BOILER).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_LARGE_BOILER_GLOW).extFacing().glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_LARGE_BOILER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_LARGE_BOILER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { BlockIcons.getCasingTextureForId(getCasingTextureIndex()), TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_LARGE_BOILER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_LARGE_BOILER_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(getCasingTextureIndex()) }; } @@ -379,7 +416,8 @@ public abstract class GT_MetaTileEntity_LargeBoiler extends if (mProgresstime > 0 && firstRun) { firstRun = false; GT_Mod.achievements.issueAchievement( - aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), + aBaseMetaTileEntity.getWorld() + .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "extremepressure"); } super.onPostTick(aBaseMetaTileEntity, aTick); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java index 70d9250206..4c717a85a8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java @@ -43,32 +43,64 @@ public class GT_MetaTileEntity_LargeChemicalReactor private static final int CASING_INDEX = 176; private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition<GT_MetaTileEntity_LargeChemicalReactor> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_LargeChemicalReactor>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { { "ccc", "cxc", "ccc" }, { "c~c", "xPx", "cxc" }, - { "ccc", "cxc", "ccc" }, })) - .addElement('P', ofBlock(GregTech_API.sBlockCasings8, 1)) - .addElement( - 'c', - buildHatchAdder(GT_MetaTileEntity_LargeChemicalReactor.class) - .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy) - .casingIndex(CASING_INDEX).dot(1).buildAndChain( - onElementPass( - GT_MetaTileEntity_LargeChemicalReactor::onCasingAdded, - ofBlock(GregTech_API.sBlockCasings8, 0)))) - .addElement( - 'x', - buildHatchAdder(GT_MetaTileEntity_LargeChemicalReactor.class) - .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy) - .casingIndex(CASING_INDEX).dot(1).buildAndChain( - CoilStructureElement.INSTANCE, - onElementPass( - GT_MetaTileEntity_LargeChemicalReactor::onCasingAdded, - ofBlock(GregTech_API.sBlockCasings8, 0)))) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_LargeChemicalReactor> STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_LargeChemicalReactor>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { + { "ccc", "cxc", + "ccc" }, + { "c~c", "xPx", + "cxc" }, + { "ccc", "cxc", + "ccc" }, })) + .addElement( + 'P', + ofBlock( + GregTech_API.sBlockCasings8, + 1)) + .addElement( + 'c', + buildHatchAdder( + GT_MetaTileEntity_LargeChemicalReactor.class).atLeast( + InputHatch, + OutputHatch, + InputBus, + OutputBus, + Maintenance, + Energy) + .casingIndex( + CASING_INDEX) + .dot( + 1) + .buildAndChain( + onElementPass( + GT_MetaTileEntity_LargeChemicalReactor::onCasingAdded, + ofBlock( + GregTech_API.sBlockCasings8, + 0)))) + .addElement( + 'x', + buildHatchAdder( + GT_MetaTileEntity_LargeChemicalReactor.class).atLeast( + InputHatch, + OutputHatch, + InputBus, + OutputBus, + Maintenance, + Energy) + .casingIndex( + CASING_INDEX) + .dot( + 1) + .buildAndChain( + CoilStructureElement.INSTANCE, + onElementPass( + GT_MetaTileEntity_LargeChemicalReactor::onCasingAdded, + ofBlock( + GregTech_API.sBlockCasings8, + 0)))) + .build(); private int mCasingAmount; private int mCoilAmount; @@ -89,16 +121,24 @@ public class GT_MetaTileEntity_LargeChemicalReactor @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 Large Chemical Reactor") - .addInfo("Does not lose efficiency when overclocked").addInfo("Accepts fluids instead of fluid cells") - .addSeparator().beginStructureBlock(3, 3, 3, false).addController("Front center") - .addCasingInfoRange("Chemically Inert Machine Casing", 8, 22, false) - .addOtherStructurePart("PTFE Pipe Machine Casing", "Center") - .addOtherStructurePart("Heating Coil", "Adjacent to the PTFE Pipe Machine Casing", 1) - .addEnergyHatch("Any casing", 1, 2).addMaintenanceHatch("Any casing", 1, 2) - .addInputBus("Any casing", 1, 2).addInputHatch("Any casing", 1, 2).addOutputBus("Any casing", 1, 2) - .addOutputHatch("Any casing", 1, 2).addStructureInfo("You can have multiple hatches/busses") - .toolTipFinisher("Gregtech"); + tt.addMachineType("Chemical Reactor") + .addInfo("Controller block for the Large Chemical Reactor") + .addInfo("Does not lose efficiency when overclocked") + .addInfo("Accepts fluids instead of fluid cells") + .addSeparator() + .beginStructureBlock(3, 3, 3, false) + .addController("Front center") + .addCasingInfoRange("Chemically Inert Machine Casing", 8, 22, false) + .addOtherStructurePart("PTFE Pipe Machine Casing", "Center") + .addOtherStructurePart("Heating Coil", "Adjacent to the PTFE Pipe Machine Casing", 1) + .addEnergyHatch("Any casing", 1, 2) + .addMaintenanceHatch("Any casing", 1, 2) + .addInputBus("Any casing", 1, 2) + .addInputHatch("Any casing", 1, 2) + .addOutputBus("Any casing", 1, 2) + .addOutputHatch("Any casing", 1, 2) + .addStructureInfo("You can have multiple hatches/busses") + .toolTipFinisher("Gregtech"); return tt; } @@ -106,14 +146,26 @@ public class GT_MetaTileEntity_LargeChemicalReactor public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - 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] }; } @@ -159,7 +211,8 @@ public class GT_MetaTileEntity_LargeChemicalReactor if (mLockedToSingleRecipe) { // We're locked to a single recipe, but haven't built the recipe checker yet. // Build the checker on next successful recipe. - tSingleRecipeCheckBuilder = GT_Single_Recipe_Check.builder(this).setBefore(); + tSingleRecipeCheckBuilder = GT_Single_Recipe_Check.builder(this) + .setBefore(); } tRecipe = GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.findRecipe( @@ -175,7 +228,9 @@ public class GT_MetaTileEntity_LargeChemicalReactor } if (mLockedToSingleRecipe) { - mSingleRecipeCheck = tSingleRecipeCheckBuilder.setAfter().setRecipe(tRecipe).build(); + mSingleRecipeCheck = tSingleRecipeCheckBuilder.setAfter() + .setRecipe(tRecipe) + .build(); } } @@ -288,8 +343,9 @@ public class GT_MetaTileEntity_LargeChemicalReactor GT_MetaTileEntity_LargeChemicalReactor gt_metaTileEntity_largeChemicalReactor, World world, int x, int y, int z, ItemStack trigger, AutoPlaceEnvironment env) { return BlocksToPlace.create( - IntStream.range(0, 8).mapToObj(i -> new ItemStack(GregTech_API.sBlockCasings5, 1, i)) - .collect(Collectors.toList())); + IntStream.range(0, 8) + .mapToObj(i -> new ItemStack(GregTech_API.sBlockCasings5, 1, i)) + .collect(Collectors.toList())); } @Override @@ -298,7 +354,8 @@ public class GT_MetaTileEntity_LargeChemicalReactor if (t.mCoilAmount > 0) return PlaceResult.SKIP; if (check(t, world, x, y, z)) return PlaceResult.SKIP; if (!StructureLibAPI.isBlockTriviallyReplaceable(world, x, y, z, env.getActor())) return PlaceResult.REJECT; - ItemStack result = env.getSource().takeOne(ItemStackPredicate.from(GregTech_API.sBlockCasings5), true); + ItemStack result = env.getSource() + .takeOne(ItemStackPredicate.from(GregTech_API.sBlockCasings5), true); if (result == null) return PlaceResult.REJECT; PlaceResult ret = StructureUtility.survivalPlaceBlock( result, diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java index 1c401a741e..38c3cc9af7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java @@ -49,24 +49,34 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends @Override protected IStructureDefinition<GT_MetaTileEntity_LargeTurbine> computeValue(Class<?> type) { return StructureDefinition.<GT_MetaTileEntity_LargeTurbine>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { { " ", " ", " ", " ", " ", }, - { " --- ", " ccc ", " hhh ", " hhh ", " hhh ", }, - { " --- ", " c~c ", " h-h ", " h-h ", " hdh ", }, - { " --- ", " ccc ", " hhh ", " hhh ", " hhh ", }, - { " ", " ", " ", " ", " ", }, })) - .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta()))) - .addElement('d', lazy(t -> Dynamo.newAny(t.getCasingTextureIndex(), 1))) - .addElement( - 'h', - lazy( - t -> buildHatchAdder(GT_MetaTileEntity_LargeTurbine.class) - .atLeast(Maintenance, InputHatch, OutputHatch, OutputBus, InputBus, Muffler) - .casingIndex(t.getCasingTextureIndex()).dot(2) - .buildAndChain(t.getCasingBlock(), t.getCasingMeta()))) - .build(); + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { { " ", " ", " ", " ", " ", }, + { " --- ", " ccc ", " hhh ", " hhh ", " hhh ", }, + { " --- ", " c~c ", " h-h ", " h-h ", " hdh ", }, + { " --- ", " ccc ", " hhh ", " hhh ", " hhh ", }, + { " ", " ", " ", " ", " ", }, })) + .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta()))) + .addElement('d', lazy(t -> Dynamo.newAny(t.getCasingTextureIndex(), 1))) + .addElement( + 'h', + lazy( + t -> buildHatchAdder( + GT_MetaTileEntity_LargeTurbine.class).atLeast( + Maintenance, + InputHatch, + OutputHatch, + OutputBus, + InputBus, + Muffler) + .casingIndex( + t.getCasingTextureIndex()) + .dot(2) + .buildAndChain( + t.getCasingBlock(), + t.getCasingMeta()))) + .build(); } }; @@ -167,7 +177,8 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends aX + tDirection.offsetX, tY + tDirection.offsetY, aZ + tDirection.offsetZ)); - tLighting.setupLighting(tBlock, tX, tY, tZ, tFacing).setupColor(tFacing, Dyes._NULL.mRGBa); + tLighting.setupLighting(tBlock, tX, tY, tZ, tFacing) + .setupColor(tFacing, Dyes._NULL.mRGBa); GT_RenderUtil.renderBlockIcon( aRenderer, tBlock, @@ -230,15 +241,18 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends if (baseEff == 0 || optFlow == 0 || counter >= 512 - || this.getBaseMetaTileEntity().hasWorkJustBeenEnabled() - || this.getBaseMetaTileEntity().hasInventoryBeenModified()) { + || this.getBaseMetaTileEntity() + .hasWorkJustBeenEnabled() + || this.getBaseMetaTileEntity() + .hasInventoryBeenModified()) { counter = 0; baseEff = GT_Utility.safeInt( (long) ((5F + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolCombatDamage(aStack)) * 1000F)); optFlow = GT_Utility.safeInt( (long) Math.max( Float.MIN_NORMAL, - ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack).getSpeedMultiplier() + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack) + .getSpeedMultiplier() * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolSpeed * 50)); @@ -368,8 +382,10 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends long maxEnergy = 0; for (GT_MetaTileEntity_Hatch_Dynamo tHatch : mDynamoHatches) { if (isValidMetaTileEntity(tHatch)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); + storedEnergy += tHatch.getBaseMetaTileEntity() + .getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity() + .getEUCapacity(); } } String[] ret = new String[] { @@ -420,7 +436,9 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends + EnumChatFormatting.RESET + " %" /* 8 */ }; - if (!this.getClass().getName().contains("Steam")) + if (!this.getClass() + .getName() + .contains("Steam")) ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW + GT_Utility.safeInt((long) realOptFlow) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java index 99eb312b76..3acf460d3f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java @@ -32,27 +32,38 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return new ITexture[] { MACHINE_CASINGS[1][aColorIndex + 1], - aFacing == aSide - ? (aActive ? TextureFactory.builder().addIcon(LARGETURBINE_NEW_ACTIVE5).build() - : hasTurbine() ? TextureFactory.builder().addIcon(LARGETURBINE_NEW5).build() - : TextureFactory.builder().addIcon(LARGETURBINE_NEW_EMPTY5).build()) + return new ITexture[] { MACHINE_CASINGS[1][aColorIndex + 1], aFacing + == aSide ? (aActive ? TextureFactory.builder() + .addIcon(LARGETURBINE_NEW_ACTIVE5) + .build() + : hasTurbine() ? TextureFactory.builder() + .addIcon(LARGETURBINE_NEW5) + .build() + : TextureFactory.builder() + .addIcon(LARGETURBINE_NEW_EMPTY5) + .build()) : casingTexturePages[0][58] }; } @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Gas Turbine").addInfo("Controller block for the Large Gas Turbine") - .addInfo("Needs a Turbine, place inside controller") - .addInfo("Warning: Will be capped at 8192 EU/t in a future update") - .addInfo("See the Advanced Large Gas Turbine as the next, uncapped, option") - // .addInfo("The excess fuel that gets consumed will be voided!") - .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 4, true) - .addController("Front center").addCasingInfoRange("Stainless Steel Turbine Casing", 8, 30, false) - .addDynamoHatch("Back center", 1).addMaintenanceHatch("Side centered", 2) - .addMufflerHatch("Side centered", 2).addInputHatch("Gas Fuel, Side centered", 2) - .toolTipFinisher("Gregtech"); + tt.addMachineType("Gas Turbine") + .addInfo("Controller block for the Large Gas Turbine") + .addInfo("Needs a Turbine, place inside controller") + .addInfo("Warning: Will be capped at 8192 EU/t in a future update") + .addInfo("See the Advanced Large Gas Turbine as the next, uncapped, option") + // .addInfo("The excess fuel that gets consumed will be voided!") + .addPollutionAmount(getPollutionPerSecond(null)) + .addSeparator() + .beginStructureBlock(3, 3, 4, true) + .addController("Front center") + .addCasingInfoRange("Stainless Steel Turbine Casing", 8, 30, false) + .addDynamoHatch("Back center", 1) + .addMaintenanceHatch("Side centered", 2) + .addMufflerHatch("Side centered", 2) + .addInputHatch("Gas Fuel, Side centered", 2) + .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java index f1a7427463..54787a1914 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java @@ -32,26 +32,38 @@ public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntit @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return new ITexture[] { MACHINE_CASINGS[1][aColorIndex + 1], - aFacing == aSide - ? (aActive ? TextureFactory.builder().addIcon(LARGETURBINE_NEW_ACTIVE5).build() - : hasTurbine() ? TextureFactory.builder().addIcon(LARGETURBINE_NEW5).build() - : TextureFactory.builder().addIcon(LARGETURBINE_NEW_EMPTY5).build()) + return new ITexture[] { MACHINE_CASINGS[1][aColorIndex + 1], aFacing + == aSide ? (aActive ? TextureFactory.builder() + .addIcon(LARGETURBINE_NEW_ACTIVE5) + .build() + : hasTurbine() ? TextureFactory.builder() + .addIcon(LARGETURBINE_NEW5) + .build() + : TextureFactory.builder() + .addIcon(LARGETURBINE_NEW_EMPTY5) + .build()) : casingTexturePages[1][57] }; } @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Gas Turbine").addInfo("Warning: This is an experimental multiblock, subject to changes ") - .addInfo("Controller block for the Large Advanced Gas Turbine") - .addInfo("Needs a Turbine, place inside controller").addInfo("Only accepts gases above 800k EU/bucket") - .addInfo("Has no maximum EU/t output, only depends on the Dynamo Hatch") - .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 4, true) - .addController("Front center").addCasingInfoRange("Advanced Gas Turbine Casing", 8, 30, false) - .addDynamoHatch("Back center", 1).addMaintenanceHatch("Side centered", 2) - .addMufflerHatch("Side centered", 2).addInputHatch("Gas Fuel, Side centered", 2) - .toolTipFinisher("Gregtech"); + tt.addMachineType("Gas Turbine") + .addInfo("Warning: This is an experimental multiblock, subject to changes ") + .addInfo("Controller block for the Large Advanced Gas Turbine") + .addInfo("Needs a Turbine, place inside controller") + .addInfo("Only accepts gases above 800k EU/bucket") + .addInfo("Has no maximum EU/t output, only depends on the Dynamo Hatch") + .addPollutionAmount(getPollutionPerSecond(null)) + .addSeparator() + .beginStructureBlock(3, 3, 4, true) + .addController("Front center") + .addCasingInfoRange("Advanced Gas Turbine Casing", 8, 30, false) + .addDynamoHatch("Back center", 1) + .addMaintenanceHatch("Side centered", 2) + .addMufflerHatch("Side centered", 2) + .addInputHatch("Gas Fuel, Side centered", 2) + .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java index d6e2f16a3d..ef288cf1ec 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java @@ -38,25 +38,37 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return new ITexture[] { MACHINE_CASINGS[1][aColorIndex + 1], - aFacing == aSide - ? (aActive ? TextureFactory.builder().addIcon(LARGETURBINE_NEW_ACTIVE5).build() - : hasTurbine() ? TextureFactory.builder().addIcon(LARGETURBINE_NEW5).build() - : TextureFactory.builder().addIcon(LARGETURBINE_NEW_EMPTY5).build()) + return new ITexture[] { MACHINE_CASINGS[1][aColorIndex + 1], aFacing + == aSide ? (aActive ? TextureFactory.builder() + .addIcon(LARGETURBINE_NEW_ACTIVE5) + .build() + : hasTurbine() ? TextureFactory.builder() + .addIcon(LARGETURBINE_NEW5) + .build() + : TextureFactory.builder() + .addIcon(LARGETURBINE_NEW_EMPTY5) + .build()) : casingTexturePages[0][59] }; } @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Steam Turbine").addInfo("Controller block for the Large High Pressure Steam Turbine") - .addInfo("Needs a Turbine, place inside controller").addInfo("Outputs Steam as well as producing power") - .addInfo("Power output depends on turbine and fitting") - .addInfo("Use screwdriver to adjust fitting of turbine").addSeparator() - .beginStructureBlock(3, 3, 4, true).addController("Front center") - .addCasingInfoRange("Titanium Turbine Casing", 8, 31, false).addDynamoHatch("Back center", 1) - .addMaintenanceHatch("Side centered", 2).addInputHatch("Superheated Steam, Side centered", 2) - .addOutputHatch("Steam, Side centered", 2).toolTipFinisher("Gregtech"); + tt.addMachineType("Steam Turbine") + .addInfo("Controller block for the Large High Pressure Steam Turbine") + .addInfo("Needs a Turbine, place inside controller") + .addInfo("Outputs Steam as well as producing power") + .addInfo("Power output depends on turbine and fitting") + .addInfo("Use screwdriver to adjust fitting of turbine") + .addSeparator() + .beginStructureBlock(3, 3, 4, true) + .addController("Front center") + .addCasingInfoRange("Titanium Turbine Casing", 8, 31, false) + .addDynamoHatch("Back center", 1) + .addMaintenanceHatch("Side centered", 2) + .addInputHatch("Superheated Steam, Side centered", 2) + .addOutputHatch("Steam, Side centered", 2) + .toolTipFinisher("Gregtech"); return tt; } @@ -121,8 +133,11 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La if (!achievement) { try { GT_Mod.achievements.issueAchievement( - this.getBaseMetaTileEntity().getWorld() - .getPlayerEntityByName(this.getBaseMetaTileEntity().getOwnerName()), + this.getBaseMetaTileEntity() + .getWorld() + .getPlayerEntityByName( + this.getBaseMetaTileEntity() + .getOwnerName()), "efficientsteam"); } catch (Exception ignored) {} achievement = true; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index d778abbc36..22681138ea 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -38,24 +38,35 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return new ITexture[] { MACHINE_CASINGS[1][aColorIndex + 1], - aFacing == aSide - ? (aActive ? TextureFactory.builder().addIcon(LARGETURBINE_NEW_ACTIVE5).build() - : hasTurbine() ? TextureFactory.builder().addIcon(LARGETURBINE_NEW5).build() - : TextureFactory.builder().addIcon(LARGETURBINE_NEW_EMPTY5).build()) + return new ITexture[] { MACHINE_CASINGS[1][aColorIndex + 1], aFacing + == aSide ? (aActive ? TextureFactory.builder() + .addIcon(LARGETURBINE_NEW_ACTIVE5) + .build() + : hasTurbine() ? TextureFactory.builder() + .addIcon(LARGETURBINE_NEW5) + .build() + : TextureFactory.builder() + .addIcon(LARGETURBINE_NEW_EMPTY5) + .build()) : casingTexturePages[0][60] }; } @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Plasma Turbine").addInfo("Controller block for the Large Plasma Generator") - .addInfo("Needs a Turbine, place inside controller") - .addInfo("Use your Fusion Reactor to produce the Plasma").addSeparator() - .beginStructureBlock(3, 3, 4, true).addController("Front center") - .addCasingInfoRange("Tungstensteel Turbine Casing", 8, 31, false).addDynamoHatch("Back center", 1) - .addMaintenanceHatch("Side centered", 2).addInputHatch("Plasma Fluid, Side centered", 2) - .addOutputHatch("Molten Fluid, optional, Side centered", 2).toolTipFinisher("Gregtech"); + tt.addMachineType("Plasma Turbine") + .addInfo("Controller block for the Large Plasma Generator") + .addInfo("Needs a Turbine, place inside controller") + .addInfo("Use your Fusion Reactor to produce the Plasma") + .addSeparator() + .beginStructureBlock(3, 3, 4, true) + .addController("Front center") + .addCasingInfoRange("Tungstensteel Turbine Casing", 8, 31, false) + .addDynamoHatch("Back center", 1) + .addMaintenanceHatch("Side centered", 2) + .addInputHatch("Plasma Fluid, Side centered", 2) + .addOutputHatch("Molten Fluid, optional, Side centered", 2) + .toolTipFinisher("Gregtech"); return tt; } @@ -103,8 +114,8 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar FluidStack firstFuelType = new FluidStack(aFluids.get(0), 0); // Identify a SINGLE type of fluid to process. // Doesn't matter which one. Ignore the rest! int fuelValue = getFuelValue(firstFuelType); - actualOptimalFlow = GT_Utility - .safeInt((long) Math.ceil((double) aOptFlow * flowMultipliers[2] / (double) fuelValue)); + actualOptimalFlow = GT_Utility.safeInt( + (long) Math.ceil((double) aOptFlow * flowMultipliers[2] / (double) fuelValue)); this.realOptFlow = actualOptimalFlow; // For scanner info // Allowed to use up to 550% optimal flow rate, depending on the value of overflowMultiplier. @@ -199,17 +210,20 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar if (!tFluids.isEmpty()) { if (baseEff == 0 || optFlow == 0 || counter >= 512 - || this.getBaseMetaTileEntity().hasWorkJustBeenEnabled() - || this.getBaseMetaTileEntity().hasInventoryBeenModified()) { + || this.getBaseMetaTileEntity() + .hasWorkJustBeenEnabled() + || this.getBaseMetaTileEntity() + .hasInventoryBeenModified()) { counter = 0; baseEff = GT_Utility.safeInt( (long) ((5F + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolCombatDamage(aStack)) * 1000F)); optFlow = GT_Utility.safeInt( (long) Math.max( Float.MIN_NORMAL, - ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack).getSpeedMultiplier() - * ((GT_MetaGenerated_Tool) aStack.getItem()) - .getPrimaryMaterial(aStack).mToolSpeed + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack) + .getSpeedMultiplier() + * ((GT_MetaGenerated_Tool) aStack.getItem()).getPrimaryMaterial( + aStack).mToolSpeed * 50)); overflowMultiplier = getOverflowMultiplier(aStack); @@ -288,8 +302,10 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar long maxEnergy = 0; for (GT_MetaTileEntity_Hatch_Dynamo tHatch : mDynamoHatches) { if (isValidMetaTileEntity(tHatch)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); + storedEnergy += tHatch.getBaseMetaTileEntity() + .getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity() + .getEUCapacity(); } } String[] ret = new String[] { @@ -340,7 +356,9 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar + EnumChatFormatting.RESET + " %" /* 8 */ }; - if (!this.getClass().getName().contains("Steam")) + if (!this.getClass() + .getName() + .contains("Steam")) ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW + GT_Utility.safeInt((long) realOptFlow) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java index 3ccc635d92..1f5c7a5bb6 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java @@ -39,26 +39,37 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return new ITexture[] { MACHINE_CASINGS[1][aColorIndex + 1], - aFacing == aSide - ? (aActive ? TextureFactory.builder().addIcon(LARGETURBINE_NEW_ACTIVE5).build() - : hasTurbine() ? TextureFactory.builder().addIcon(LARGETURBINE_NEW5).build() - : TextureFactory.builder().addIcon(LARGETURBINE_NEW_EMPTY5).build()) + return new ITexture[] { MACHINE_CASINGS[1][aColorIndex + 1], aFacing + == aSide ? (aActive ? TextureFactory.builder() + .addIcon(LARGETURBINE_NEW_ACTIVE5) + .build() + : hasTurbine() ? TextureFactory.builder() + .addIcon(LARGETURBINE_NEW5) + .build() + : TextureFactory.builder() + .addIcon(LARGETURBINE_NEW_EMPTY5) + .build()) : casingTexturePages[0][57] }; } @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Steam Turbine").addInfo("Controller block for the Large Steam Turbine") - .addInfo("Needs a Turbine, place inside controller") - .addInfo("Outputs Distilled Water as well as producing power") - .addInfo("Power output depends on turbine and fitting") - .addInfo("Use screwdriver to adjust fitting of turbine").addSeparator() - .beginStructureBlock(3, 3, 4, true).addController("Front center") - .addCasingInfoRange("Turbine Casing", 8, 31, false).addDynamoHatch("Back center", 1) - .addMaintenanceHatch("Side centered", 2).addInputHatch("Steam, Side centered", 2) - .addOutputHatch("Distilled Water, Side centered", 2).toolTipFinisher("Gregtech"); + tt.addMachineType("Steam Turbine") + .addInfo("Controller block for the Large Steam Turbine") + .addInfo("Needs a Turbine, place inside controller") + .addInfo("Outputs Distilled Water as well as producing power") + .addInfo("Power output depends on turbine and fitting") + .addInfo("Use screwdriver to adjust fitting of turbine") + .addSeparator() + .beginStructureBlock(3, 3, 4, true) + .addController("Front center") + .addCasingInfoRange("Turbine Casing", 8, 31, false) + .addDynamoHatch("Back center", 1) + .addMaintenanceHatch("Side centered", 2) + .addInputHatch("Steam, Side centered", 2) + .addOutputHatch("Distilled Water, Side centered", 2) + .toolTipFinisher("Gregtech"); return tt; } @@ -130,8 +141,11 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg totalFlow += flow; // track total input used if (!achievement) { GT_Mod.achievements.issueAchievement( - this.getBaseMetaTileEntity().getWorld() - .getPlayerEntityByName(this.getBaseMetaTileEntity().getOwnerName()), + this.getBaseMetaTileEntity() + .getWorld() + .getPlayerEntityByName( + this.getBaseMetaTileEntity() + .getOwnerName()), "muchsteam"); achievement = true; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java index 95825c9eb0..0d90438020 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java @@ -49,28 +49,50 @@ public class GT_MetaTileEntity_MultiFurnace extends private static final int CASING_INDEX = 11; private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition<GT_MetaTileEntity_MultiFurnace> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_MultiFurnace>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { { "ccc", "cmc", "ccc" }, { "CCC", "C-C", "CCC" }, - { "b~b", "bbb", "bbb" } })) - .addElement('c', ofBlock(GregTech_API.sBlockCasings1, CASING_INDEX)) - .addElement('m', Muffler.newAny(CASING_INDEX, 2)) - .addElement( - 'C', - GT_StructureUtility.ofCoil( - GT_MetaTileEntity_MultiFurnace::setCoilLevel, - GT_MetaTileEntity_MultiFurnace::getCoilLevel)) - .addElement( - 'b', - ofChain( - GT_StructureUtility.<GT_MetaTileEntity_MultiFurnace>buildHatchAdder() - .atLeast(Maintenance, InputBus, OutputBus, Energy).casingIndex(CASING_INDEX).dot(1) - .build(), - ofBlock(GregTech_API.sBlockCasings1, CASING_INDEX))) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_MultiFurnace> STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_MultiFurnace>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { + { "ccc", "cmc", + "ccc" }, + { "CCC", "C-C", + "CCC" }, + { "b~b", "bbb", + "bbb" } })) + .addElement( + 'c', + ofBlock( + GregTech_API.sBlockCasings1, + CASING_INDEX)) + .addElement( + 'm', + Muffler.newAny( + CASING_INDEX, + 2)) + .addElement( + 'C', + GT_StructureUtility.ofCoil( + GT_MetaTileEntity_MultiFurnace::setCoilLevel, + GT_MetaTileEntity_MultiFurnace::getCoilLevel)) + .addElement( + 'b', + ofChain( + GT_StructureUtility.<GT_MetaTileEntity_MultiFurnace>buildHatchAdder() + .atLeast( + Maintenance, + InputBus, + OutputBus, + Energy) + .casingIndex( + CASING_INDEX) + .dot( + 1) + .build(), + ofBlock( + GregTech_API.sBlockCasings1, + CASING_INDEX))) + .build(); public GT_MetaTileEntity_MultiFurnace(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -88,13 +110,22 @@ public class GT_MetaTileEntity_MultiFurnace extends @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Furnace").addInfo("Controller Block for the Multi Smelter") - .addInfo("Smelts up to 8-8192 items at once").addInfo("Items smelted increases with coil tier") - .addPollutionAmount(getPollutionPerSecond(null)).addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front bottom").addCasingInfoRange("Heat Proof Machine Casing", 8, 14, false) - .addOtherStructurePart("Heating Coils", "Middle layer").addEnergyHatch("Any bottom casing", 1) - .addMaintenanceHatch("Any bottom casing", 1).addMufflerHatch("Top Middle", 2) - .addInputBus("Any bottom casing", 1).addOutputBus("Any bottom casing", 1).toolTipFinisher("Gregtech"); + tt.addMachineType("Furnace") + .addInfo("Controller Block for the Multi Smelter") + .addInfo("Smelts up to 8-8192 items at once") + .addInfo("Items smelted increases with coil tier") + .addPollutionAmount(getPollutionPerSecond(null)) + .addSeparator() + .beginStructureBlock(3, 3, 3, true) + .addController("Front bottom") + .addCasingInfoRange("Heat Proof Machine Casing", 8, 14, false) + .addOtherStructurePart("Heating Coils", "Middle layer") + .addEnergyHatch("Any bottom casing", 1) + .addMaintenanceHatch("Any bottom casing", 1) + .addMufflerHatch("Top Middle", 2) + .addInputBus("Any bottom casing", 1) + .addOutputBus("Any bottom casing", 1) + .toolTipFinisher("Gregtech"); return tt; } @@ -102,12 +133,25 @@ public class GT_MetaTileEntity_MultiFurnace extends public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide != aFacing) return new ITexture[] { casingTexturePages[0][CASING_INDEX] }; - if (aActive) return new ITexture[] { casingTexturePages[0][CASING_INDEX], - TextureFactory.builder().addIcon(OVERLAY_FRONT_MULTI_SMELTER_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_MULTI_SMELTER_ACTIVE_GLOW).extFacing().glow().build() }; - return new ITexture[] { casingTexturePages[0][CASING_INDEX], - TextureFactory.builder().addIcon(OVERLAY_FRONT_MULTI_SMELTER).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_MULTI_SMELTER_GLOW).extFacing().glow().build() }; + if (aActive) return new ITexture[] { casingTexturePages[0][CASING_INDEX], TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_MULTI_SMELTER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_MULTI_SMELTER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { casingTexturePages[0][CASING_INDEX], TextureFactory.builder() + .addIcon(OVERLAY_FRONT_MULTI_SMELTER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_MULTI_SMELTER_GLOW) + .extFacing() + .glow() + .build() }; } @Override @@ -214,7 +258,7 @@ public class GT_MetaTileEntity_MultiFurnace extends if (tUsedMeta >= 12 && tUsedMeta <= 14 && aBaseMetaTileEntity.getBlock(xPos, tY + 1, zPos) == GregTech_API.sBlockCasings1) aBaseMetaTileEntity.getWorld() - .setBlock(xPos, tY + 1, zPos, GregTech_API.sBlockCasings5, tUsedMeta - 12, 3); + .setBlock(xPos, tY + 1, zPos, GregTech_API.sBlockCasings5, tUsedMeta - 12, 3); } } @@ -227,8 +271,10 @@ public class GT_MetaTileEntity_MultiFurnace extends long storedEnergy = 0; long maxEnergy = 0; for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) if (isValidMetaTileEntity(tHatch)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); + storedEnergy += tHatch.getBaseMetaTileEntity() + .getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity() + .getEUCapacity(); } return new String[] { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java index 4a872e3833..4887c95930 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java @@ -51,9 +51,8 @@ public class GT_MetaTileEntity_NanoForge extends private static final String STRUCTURE_PIECE_MAIN = "main"; private static final String STRUCTURE_PIECE_TIER2 = "tier2"; private static final String STRUCTURE_PIECE_TIER3 = "tier3"; - private static final IStructureDefinition<GT_MetaTileEntity_NanoForge> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_NanoForge>builder() - // spotless:off + private static final IStructureDefinition<GT_MetaTileEntity_NanoForge> STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_NanoForge>builder() + // spotless:off .addShape(STRUCTURE_PIECE_MAIN, transpose(new String[][] { {" "," "," F "," C "," C "," C "," C "," F "," "," "}, {" "," "," F "," C "," C "," C "," C "," F "," "," "}, @@ -141,15 +140,39 @@ public class GT_MetaTileEntity_NanoForge extends {" CCCCCC ", "CCCCCCCC", "CCCCCCCC", "CCCCCCCC", "CCCCCCCC", "CCCCCCCC", "CCCCCCCC", " CCCCCC "} })) //spotless:on - .addElement('F', ofFrame(Materials.StellarAlloy)).addElement('C', ofBlock(GregTech_API.sBlockCasings8, 10)) - .addElement('A', ofBlock(GregTech_API.sBlockCasings2, 5)) - .addElement( - 'B', - buildHatchAdder(GT_MetaTileEntity_NanoForge.class) - .atLeast(InputHatch, OutputBus, InputBus, Maintenance, Energy.or(ExoticEnergy)).dot(1) - .casingIndex(((GT_Block_Casings8) GregTech_API.sBlockCasings8).getTextureIndex(10)) - .buildAndChain(GregTech_API.sBlockCasings8, 10)) - .build(); + .addElement( + 'F', + ofFrame( + Materials.StellarAlloy)) + .addElement( + 'C', + ofBlock( + GregTech_API.sBlockCasings8, + 10)) + .addElement( + 'A', + ofBlock( + GregTech_API.sBlockCasings2, + 5)) + .addElement( + 'B', + buildHatchAdder( + GT_MetaTileEntity_NanoForge.class).atLeast( + InputHatch, + OutputBus, + InputBus, + Maintenance, + Energy.or( + ExoticEnergy)) + .dot( + 1) + .casingIndex( + ((GT_Block_Casings8) GregTech_API.sBlockCasings8).getTextureIndex( + 10)) + .buildAndChain( + GregTech_API.sBlockCasings8, + 10)) + .build(); private byte mSpecialTier = 0; public GT_MetaTileEntity_NanoForge(int aID, String aName, String aNameRegional) { @@ -187,13 +210,26 @@ public class GT_MetaTileEntity_NanoForge extends if (aSide == aFacing) { if (aActive) return new ITexture[] { BlockIcons.getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 10)), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_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[] { BlockIcons.getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 10)), - 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) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { BlockIcons.getCasingTextureForId(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 10)) }; @@ -235,8 +271,15 @@ public class GT_MetaTileEntity_NanoForge extends mOutputItems = null; mOutputFluids = null; long tTotalEU = getMaxInputEu(); - GT_Recipe tRecipe = map - .findRecipe(getBaseMetaTileEntity(), null, false, false, tTotalEU, tFluidInputs, null, tItemInputs); + GT_Recipe tRecipe = map.findRecipe( + getBaseMetaTileEntity(), + null, + false, + false, + tTotalEU, + tFluidInputs, + null, + tItemInputs); if (tRecipe == null) return false; @@ -362,100 +405,112 @@ public class GT_MetaTileEntity_NanoForge extends @Override public IAlignmentLimits getAlignmentLimits() { // The nano forge should only be buildable upright - return IAlignmentLimits.Builder.allowAll().deny(ForgeDirection.DOWN).deny(ForgeDirection.UP) - .deny(Rotation.UPSIDE_DOWN).deny(Rotation.CLOCKWISE).deny(Rotation.COUNTER_CLOCKWISE).build(); + return IAlignmentLimits.Builder.allowAll() + .deny(ForgeDirection.DOWN) + .deny(ForgeDirection.UP) + .deny(Rotation.UPSIDE_DOWN) + .deny(Rotation.CLOCKWISE) + .deny(Rotation.COUNTER_CLOCKWISE) + .build(); } @Override protected void drawTexts(DynamicPositionedColumn screenElements, SlotWidget inventorySlot) { super.drawTexts(screenElements, inventorySlot); screenElements.widget( - new TextWidget(StatCollector.translateToLocal("GT5U.gui.button.tier") + " " + mSpecialTier) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0)) - .widget( - new FakeSyncWidget.IntegerSyncer( - () -> (int) mSpecialTier, - val -> mSpecialTier = (byte) (val % Byte.MAX_VALUE))); + new TextWidget( + StatCollector.translateToLocal("GT5U.gui.button.tier") + " " + mSpecialTier).setDefaultColor( + COLOR_TEXT_WHITE.get()) + .setEnabled( + widget -> getBaseMetaTileEntity().getErrorDisplayID() + == 0)) + .widget( + new FakeSyncWidget.IntegerSyncer( + () -> (int) mSpecialTier, + val -> mSpecialTier = (byte) (val % Byte.MAX_VALUE))); } @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Nanite Fabricator").addInfo("Controller block for the Nano Forge") - .addInfo("Requires insane amounts of power to create nanites. Each tier") - .addInfo("the multi gains a new building next to it. The nanite in the") - .addInfo("controller slot controls the tier.").addInfo("--------------------------------------------") - .addInfo("Requires a Carbon Nanite to use tier " + EnumChatFormatting.DARK_PURPLE + 1) - .addInfo("Requires a Neutronium Nanite to use tier " + EnumChatFormatting.DARK_PURPLE + 2) - .addInfo("Requires a Transcendent Metal Nanite to use tier " + EnumChatFormatting.DARK_PURPLE + 3) - .addInfo("--------------------------------------------") - .addInfo("If a recipe's tier is lower than the tier of the Nano Forge") - .addInfo("it gains " + EnumChatFormatting.RED + "perfect overclock" + EnumChatFormatting.GRAY + ".") - .addInfo(AuthorBlueWeabo).addSeparator().beginStructureBlock(30, 38, 13, false) - .addStructureInfo("Nano Forge Structure is too complex! See schematic for details.") - .addStructureInfo("--------------------------------------------") - .addStructureInfo("Tier " + EnumChatFormatting.DARK_PURPLE + 1 + EnumChatFormatting.GRAY) - .addStructureInfo( - EnumChatFormatting.GOLD + "527" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing") - .addStructureInfo( - EnumChatFormatting.GOLD + "171" + EnumChatFormatting.GRAY + " Stellar Alloy Frame Box") - .addStructureInfo("--------------------------------------------") - .addStructureInfo("Tier " + EnumChatFormatting.DARK_PURPLE + 2 + EnumChatFormatting.GRAY) - .addStructureInfo( - EnumChatFormatting.GOLD + "148" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing") - .addStructureInfo(EnumChatFormatting.GOLD + "16" + EnumChatFormatting.GRAY + " Assembling Line Casing") - .addStructureInfo("--------------------------------------------") - .addStructureInfo("Tier " + EnumChatFormatting.DARK_PURPLE + 3 + EnumChatFormatting.GRAY) - .addStructureInfo( - EnumChatFormatting.GOLD + "228" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing") - .addStructureInfo(EnumChatFormatting.GOLD + "84" + EnumChatFormatting.GRAY + " Stellar Alloy Frame Box") - .addStructureInfo(EnumChatFormatting.GOLD + "16" + EnumChatFormatting.GRAY + " Assembling Line Casing") - .addStructureInfo("--------------------------------------------") - .addStructureInfo( - "Requires " + EnumChatFormatting.GOLD - + "1" - + EnumChatFormatting.GRAY - + "-" - + EnumChatFormatting.GOLD - + "2" - + EnumChatFormatting.GRAY - + " energy hatches or " - + EnumChatFormatting.GOLD - + "1" - + EnumChatFormatting.GRAY - + " TT energy hatch.") - .addStructureInfo( - "Requires " + EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " maintenance hatch.") - .addStructureInfo( - "Requires " + EnumChatFormatting.GOLD - + 1 - + EnumChatFormatting.GRAY - + "+" - + EnumChatFormatting.GRAY - + " input hatches.") - .addStructureInfo( - "Requires " + EnumChatFormatting.GOLD - + 0 - + EnumChatFormatting.GRAY - + "+" - + EnumChatFormatting.GRAY - + " output hatches.") - .addStructureInfo( - "Requires " + EnumChatFormatting.GOLD - + 1 - + EnumChatFormatting.GRAY - + "+" - + EnumChatFormatting.GRAY - + " input busses.") - .addStructureInfo( - "Requires " + EnumChatFormatting.GOLD - + 1 - + EnumChatFormatting.GRAY - + "+" - + EnumChatFormatting.GRAY - + " output busses.") - .addStructureInfo("--------------------------------------------").toolTipFinisher("GregTech"); + tt.addMachineType("Nanite Fabricator") + .addInfo("Controller block for the Nano Forge") + .addInfo("Requires insane amounts of power to create nanites. Each tier") + .addInfo("the multi gains a new building next to it. The nanite in the") + .addInfo("controller slot controls the tier.") + .addInfo("--------------------------------------------") + .addInfo("Requires a Carbon Nanite to use tier " + EnumChatFormatting.DARK_PURPLE + 1) + .addInfo("Requires a Neutronium Nanite to use tier " + EnumChatFormatting.DARK_PURPLE + 2) + .addInfo("Requires a Transcendent Metal Nanite to use tier " + EnumChatFormatting.DARK_PURPLE + 3) + .addInfo("--------------------------------------------") + .addInfo("If a recipe's tier is lower than the tier of the Nano Forge") + .addInfo("it gains " + EnumChatFormatting.RED + "perfect overclock" + EnumChatFormatting.GRAY + ".") + .addInfo(AuthorBlueWeabo) + .addSeparator() + .beginStructureBlock(30, 38, 13, false) + .addStructureInfo("Nano Forge Structure is too complex! See schematic for details.") + .addStructureInfo("--------------------------------------------") + .addStructureInfo("Tier " + EnumChatFormatting.DARK_PURPLE + 1 + EnumChatFormatting.GRAY) + .addStructureInfo( + EnumChatFormatting.GOLD + "527" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing") + .addStructureInfo(EnumChatFormatting.GOLD + "171" + EnumChatFormatting.GRAY + " Stellar Alloy Frame Box") + .addStructureInfo("--------------------------------------------") + .addStructureInfo("Tier " + EnumChatFormatting.DARK_PURPLE + 2 + EnumChatFormatting.GRAY) + .addStructureInfo( + EnumChatFormatting.GOLD + "148" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing") + .addStructureInfo(EnumChatFormatting.GOLD + "16" + EnumChatFormatting.GRAY + " Assembling Line Casing") + .addStructureInfo("--------------------------------------------") + .addStructureInfo("Tier " + EnumChatFormatting.DARK_PURPLE + 3 + EnumChatFormatting.GRAY) + .addStructureInfo( + EnumChatFormatting.GOLD + "228" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing") + .addStructureInfo(EnumChatFormatting.GOLD + "84" + EnumChatFormatting.GRAY + " Stellar Alloy Frame Box") + .addStructureInfo(EnumChatFormatting.GOLD + "16" + EnumChatFormatting.GRAY + " Assembling Line Casing") + .addStructureInfo("--------------------------------------------") + .addStructureInfo( + "Requires " + EnumChatFormatting.GOLD + + "1" + + EnumChatFormatting.GRAY + + "-" + + EnumChatFormatting.GOLD + + "2" + + EnumChatFormatting.GRAY + + " energy hatches or " + + EnumChatFormatting.GOLD + + "1" + + EnumChatFormatting.GRAY + + " TT energy hatch.") + .addStructureInfo( + "Requires " + EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " maintenance hatch.") + .addStructureInfo( + "Requires " + EnumChatFormatting.GOLD + + 1 + + EnumChatFormatting.GRAY + + "+" + + EnumChatFormatting.GRAY + + " input hatches.") + .addStructureInfo( + "Requires " + EnumChatFormatting.GOLD + + 0 + + EnumChatFormatting.GRAY + + "+" + + EnumChatFormatting.GRAY + + " output hatches.") + .addStructureInfo( + "Requires " + EnumChatFormatting.GOLD + + 1 + + EnumChatFormatting.GRAY + + "+" + + EnumChatFormatting.GRAY + + " input busses.") + .addStructureInfo( + "Requires " + EnumChatFormatting.GOLD + + 1 + + EnumChatFormatting.GRAY + + "+" + + EnumChatFormatting.GRAY + + " output busses.") + .addStructureInfo("--------------------------------------------") + .toolTipFinisher("GregTech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java index f2be5d276d..c35f387fd1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java @@ -42,52 +42,82 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult private static final byte CASING_INDEX = 49; private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition<GT_MetaTileEntity_OilCracker> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_OilCracker>builder() - .addShape( - STRUCTURE_PIECE_MAIN, - transpose( - new String[][] { { "lcmcr", "lcmcr", "lcmcr" }, { "lc~cr", "l---r", "lcmcr" }, - { "lcmcr", "lcmcr", "lcmcr" }, })) - .addElement( - 'c', - ofCoil(GT_MetaTileEntity_OilCracker::setCoilLevel, GT_MetaTileEntity_OilCracker::getCoilLevel)) - .addElement( - 'l', - buildHatchAdder(GT_MetaTileEntity_OilCracker.class).atLeast( - GT_HatchElement.InputHatch - .withAdder(GT_MetaTileEntity_OilCracker::addLeftHatchToMachineList), - GT_HatchElement.Energy, - GT_HatchElement.Maintenance).dot(2).casingIndex(CASING_INDEX).buildAndChain( - onElementPass( - GT_MetaTileEntity_OilCracker::onCasingAdded, - ofBlock(GregTech_API.sBlockCasings4, 1)))) - .addElement( - 'r', - buildHatchAdder(GT_MetaTileEntity_OilCracker.class).atLeast( - GT_HatchElement.OutputHatch - .withAdder(GT_MetaTileEntity_OilCracker::addRightHatchToMachineList), - GT_HatchElement.Energy, - GT_HatchElement.Maintenance).dot(3).casingIndex(CASING_INDEX).buildAndChain( - onElementPass( - GT_MetaTileEntity_OilCracker::onCasingAdded, - ofBlock(GregTech_API.sBlockCasings4, 1)))) - .addElement( - 'm', - buildHatchAdder( - GT_MetaTileEntity_OilCracker.class) - .atLeast( - GT_HatchElement.InputHatch - .withAdder( - GT_MetaTileEntity_OilCracker::addMiddleInputToMachineList) - .withCount(t -> t.mMiddleInputHatches.size()), - GT_HatchElement.Energy, - GT_HatchElement.Maintenance) - .dot(1).casingIndex(CASING_INDEX).buildAndChain( - onElementPass( - GT_MetaTileEntity_OilCracker::onCasingAdded, - ofBlock(GregTech_API.sBlockCasings4, 1)))) - .build(); + private static final IStructureDefinition<GT_MetaTileEntity_OilCracker> STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_OilCracker>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + transpose( + new String[][] { + { "lcmcr", + "lcmcr", + "lcmcr" }, + { "lc~cr", + "l---r", + "lcmcr" }, + { "lcmcr", + "lcmcr", + "lcmcr" }, })) + .addElement( + 'c', + ofCoil( + GT_MetaTileEntity_OilCracker::setCoilLevel, + GT_MetaTileEntity_OilCracker::getCoilLevel)) + .addElement( + 'l', + buildHatchAdder( + GT_MetaTileEntity_OilCracker.class).atLeast( + GT_HatchElement.InputHatch.withAdder( + GT_MetaTileEntity_OilCracker::addLeftHatchToMachineList), + GT_HatchElement.Energy, + GT_HatchElement.Maintenance) + .dot( + 2) + .casingIndex( + CASING_INDEX) + .buildAndChain( + onElementPass( + GT_MetaTileEntity_OilCracker::onCasingAdded, + ofBlock( + GregTech_API.sBlockCasings4, + 1)))) + .addElement( + 'r', + buildHatchAdder( + GT_MetaTileEntity_OilCracker.class).atLeast( + GT_HatchElement.OutputHatch.withAdder( + GT_MetaTileEntity_OilCracker::addRightHatchToMachineList), + GT_HatchElement.Energy, + GT_HatchElement.Maintenance) + .dot( + 3) + .casingIndex( + CASING_INDEX) + .buildAndChain( + onElementPass( + GT_MetaTileEntity_OilCracker::onCasingAdded, + ofBlock( + GregTech_API.sBlockCasings4, + 1)))) + .addElement( + 'm', + buildHatchAdder( + GT_MetaTileEntity_OilCracker.class).atLeast( + GT_HatchElement.InputHatch.withAdder( + GT_MetaTileEntity_OilCracker::addMiddleInputToMachineList) + .withCount( + t -> t.mMiddleInputHatches.size()), + GT_HatchElement.Energy, + GT_HatchElement.Maintenance) + .dot( + 1) + .casingIndex( + CASING_INDEX) + .buildAndChain( + onElementPass( + GT_MetaTileEntity_OilCracker::onCasingAdded, + ofBlock( + GregTech_API.sBlockCasings4, + 1)))) + .build(); private HeatingCoilLevel heatLevel; protected final List<GT_MetaTileEntity_Hatch_Input> mMiddleInputHatches = new ArrayList<>(); // 0 -> left, 1 -> right, any other -> not found @@ -106,23 +136,29 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Cracker").addInfo("Controller block for the Oil Cracking Unit") - .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").addSeparator() - .beginStructureBlock(5, 3, 3, true).addController("Front center") - .addCasingInfoRange("Clean Stainless Steel Machine Casing", 18, 21, false) - .addOtherStructurePart("2 Rings of 8 Coils", "Each side of the controller") - .addInfo("Gets 10% EU/t reduction per coil tier, up to a maximum of 50%") - .addEnergyHatch("Any casing", 1, 2, 3).addMaintenanceHatch("Any casing", 1, 2, 3) - .addInputHatch("Steam/Hydrogen ONLY, Any middle ring casing", 1) - .addInputHatch("Any left/right side casing", 2, 3).addOutputHatch("Any right/left side casing", 2, 3) - .addStructureInfo("Input/Output Hatches must be on opposite sides!") - .addStructureHint("GT5U.cracker.io_side").toolTipFinisher("Gregtech"); + tt.addMachineType("Cracker") + .addInfo("Controller block for the Oil Cracking Unit") + .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") + .addSeparator() + .beginStructureBlock(5, 3, 3, true) + .addController("Front center") + .addCasingInfoRange("Clean Stainless Steel Machine Casing", 18, 21, false) + .addOtherStructurePart("2 Rings of 8 Coils", "Each side of the controller") + .addInfo("Gets 10% EU/t reduction per coil tier, up to a maximum of 50%") + .addEnergyHatch("Any casing", 1, 2, 3) + .addMaintenanceHatch("Any casing", 1, 2, 3) + .addInputHatch("Steam/Hydrogen ONLY, Any middle ring casing", 1) + .addInputHatch("Any left/right side casing", 2, 3) + .addOutputHatch("Any right/left side casing", 2, 3) + .addStructureInfo("Input/Output Hatches must be on opposite sides!") + .addStructureHint("GT5U.cracker.io_side") + .toolTipFinisher("Gregtech"); return tt; } @@ -130,13 +166,26 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - 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] }; } @@ -318,7 +367,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult if (aBaseMetaTileEntity.getBlock(xPos, yPos, zPos) != GregTech_API.sBlockCasings1) continue; aBaseMetaTileEntity.getWorld() - .setBlock(xPos, yPos, zPos, GregTech_API.sBlockCasings5, tUsedMeta - 12, 3); + .setBlock(xPos, yPos, zPos, GregTech_API.sBlockCasings5, tUsedMeta - 12, 3); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java index fa8619492f..f8eb8c7670 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java @@ -57,12 +57,26 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - if (aActive) return new ITexture[] { getCasingTextureForId(casingTextureIndex), - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_DRILL_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_DRILL_ACTIVE_GLOW).extFacing().glow().build() }; - return new ITexture[] { getCasingTextureForId(casingTextureIndex), - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_DRILL).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_DRILL_GLOW).extFacing().glow().build() }; + if (aActive) return new ITexture[] { getCasingTextureForId(casingTextureIndex), TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_OIL_DRILL_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_DRILL_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { getCasingTextureForId(casingTextureIndex), TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_OIL_DRILL) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_DRILL_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { getCasingTextureForId(casingTextureIndex) }; } @@ -82,24 +96,28 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D } protected GT_Multiblock_Tooltip_Builder createTooltip(String tierSuffix) { - String casings = getCasingBlockItem().get(0).getDisplayName(); + String casings = getCasingBlockItem().get(0) + .getDisplayName(); final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Pump") - .addInfo( - "Controller Block for the Oil/Gas/Fluid Drilling Rig " + (tierSuffix != null ? tierSuffix : "")) - .addInfo("Works on " + getRangeInChunks() + "x" + getRangeInChunks() + " chunks") - .addInfo("Use a Screwdriver to configure range") - .addInfo("Use Programmed Circuits to ignore near exhausted oil field") - .addInfo("If total circuit # is greater than output amount it will halt. If it worked right.") // doesn't - // work - .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(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top") - .addEnergyHatch(VN[getMinTier()] + "+, Any base casing", 1).addMaintenanceHatch("Any base casing", 1) - .addInputBus("Mining Pipes or Circuits, optional, any base casing", 1) - .addOutputHatch("Any base casing", 1).toolTipFinisher("Gregtech"); + .addInfo("Controller Block for the Oil/Gas/Fluid Drilling Rig " + (tierSuffix != null ? tierSuffix : "")) + .addInfo("Works on " + getRangeInChunks() + "x" + getRangeInChunks() + " chunks") + .addInfo("Use a Screwdriver to configure range") + .addInfo("Use Programmed Circuits to ignore near exhausted oil field") + .addInfo("If total circuit # is greater than output amount it will halt. If it worked right.") // doesn't + // work + .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(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top") + .addEnergyHatch(VN[getMinTier()] + "+, Any base casing", 1) + .addMaintenanceHatch("Any base casing", 1) + .addInputBus("Mining Pipes or Circuits, optional, any base casing", 1) + .addOutputHatch("Any base casing", 1) + .toolTipFinisher("Gregtech"); return tt; } @@ -202,7 +220,9 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D if (mOilFieldChunks.isEmpty()) { Chunk tChunk = getBaseMetaTileEntity().getWorld() - .getChunkFromBlockCoords(getBaseMetaTileEntity().getXCoord(), getBaseMetaTileEntity().getZCoord()); + .getChunkFromBlockCoords( + getBaseMetaTileEntity().getXCoord(), + getBaseMetaTileEntity().getZCoord()); int range = chunkRangeConfig; int xChunk = Math.floorDiv(tChunk.xPosition, range) * range; // Java was written by idiots. For negative // values, / returns rounded towards zero. @@ -223,10 +243,13 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D if (debugDriller) { GT_Log.out.println(" getChunkX = " + (xChunk + i) + " getChunkZ = " + (zChunk + j)); } - tChunk = getBaseMetaTileEntity().getWorld().getChunkFromChunkCoords(xChunk + i, zChunk + j); + tChunk = getBaseMetaTileEntity().getWorld() + .getChunkFromChunkCoords(xChunk + i, zChunk + j); tFluid = undergroundOilReadInformation(tChunk); if (debugDriller) { - GT_Log.out.println(" Fluid in chunk = " + tFluid.getFluid().getID()); + GT_Log.out.println( + " Fluid in chunk = " + tFluid.getFluid() + .getID()); } if (tOil.isFluidEqual(tFluid) && tFluid.amount > 0) { mOilFieldChunks.add(tChunk); @@ -296,7 +319,9 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D + " " + StatCollector.translateToLocal("GT5U.machines.chunks"), "Drilling fluid: " + EnumChatFormatting.GREEN - + (mOilId > 0 ? FluidRegistry.getFluid(mOilId).getName() : "None") + + (mOilId > 0 ? FluidRegistry.getFluid(mOilId) + .getName() + : "None") + EnumChatFormatting.RESET, "Drilling flow: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers( diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java index e54fcbbd28..b92fcfae7f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillInfinite.java @@ -23,18 +23,24 @@ public class GT_MetaTileEntity_OilDrillInfinite extends GT_MetaTileEntity_OilDri @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { - String casings = getCasingBlockItem().get(0).getDisplayName(); + String casings = getCasingBlockItem().get(0) + .getDisplayName(); final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Pump").addInfo("Controller Block for the Infinite Oil/Gas/Fluid Drilling Rig ") - .addInfo("Works on " + getRangeInChunks() + "x" + getRangeInChunks() + " chunks").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(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top") - .addEnergyHatch(VN[getMinTier()] + "+, Any base casing", 1).addMaintenanceHatch("Any base casing", 1) - .addInputBus("Mining Pipes or Circuits, optional, any base casing", 1) - .addOutputHatch("Any base casing", 1).toolTipFinisher("Gregtech"); + tt.addMachineType("Pump") + .addInfo("Controller Block for the Infinite Oil/Gas/Fluid Drilling Rig ") + .addInfo("Works on " + getRangeInChunks() + "x" + getRangeInChunks() + " chunks") + .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(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top") + .addEnergyHatch(VN[getMinTier()] + "+, Any base casing", 1) + .addMaintenanceHatch("Any base casing", 1) + .addInputBus("Mining Pipes or Circuits, optional, any base casing", 1) + .addOutputHatch("Any base casing", 1) + .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java index 46b91ec2cf..c058c8880f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java @@ -142,7 +142,8 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile z = oreBlockPos.chunkPosZ; if (GT_Utility.eraseBlockByFakePlayer(getFakePlayer(getBaseMetaTileEntity()), x, y, z, true)) oreBlock = getBaseMetaTileEntity().getBlock(x, y, z); - oreBlockMetadata = getBaseMetaTileEntity().getWorld().getBlockMetadata(x, y, z); + oreBlockMetadata = getBaseMetaTileEntity().getWorld() + .getBlockMetadata(x, y, z); } if (!tryConsumeDrillingFluid()) { @@ -160,10 +161,19 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile ItemStack cobble = GT_Utility.getCobbleForOre(oreBlock, metaData); if (replaceWithCobblestone) { getBaseMetaTileEntity().getWorld() - .setBlock(x, y, z, Block.getBlockFromItem(cobble.getItem()), cobble.getItemDamage(), 3); + .setBlock( + x, + y, + z, + Block.getBlockFromItem(cobble.getItem()), + cobble.getItemDamage(), + 3); } else { getBaseMetaTileEntity().getWorld() - .setBlockToAir(oreBlockPos.chunkPosX, oreBlockPos.chunkPosY, oreBlockPos.chunkPosZ); + .setBlockToAir( + oreBlockPos.chunkPosX, + oreBlockPos.chunkPosY, + oreBlockPos.chunkPosZ); } mOutputItems = getOutputByDrops(oreBlockDrops); } @@ -250,8 +260,9 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile return false; } mCurrentChunk = new ChunkCoordIntPair(nextChunkX, nextChunkZ); - GT_ChunkManager - .requestChunkLoad((TileEntity) getBaseMetaTileEntity(), new ChunkCoordIntPair(nextChunkX, nextChunkZ)); + GT_ChunkManager.requestChunkLoad( + (TileEntity) getBaseMetaTileEntity(), + new ChunkCoordIntPair(nextChunkX, nextChunkZ)); return true; } @@ -286,8 +297,12 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile outputItems.add(multiplyStackSize(currentItem)); return; } - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sMaceratorRecipes - .findRecipe(getBaseMetaTileEntity(), false, voltage, null, currentItem); + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.findRecipe( + getBaseMetaTileEntity(), + false, + voltage, + null, + currentItem); if (tRecipe == null) { outputItems.add(currentItem); return; @@ -380,26 +395,31 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile protected abstract int getBaseProgressTime(); protected GT_Multiblock_Tooltip_Builder createTooltip(String tierSuffix) { - String casings = getCasingBlockItem().get(0).getDisplayName(); + String casings = getCasingBlockItem().get(0) + .getDisplayName(); final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Miner") - .addInfo("Controller Block for the Ore Drilling Plant " + (tierSuffix != null ? tierSuffix : "")) - .addInfo("Use a Screwdriver to configure block radius") - .addInfo("Maximum radius is " + (getRadiusInChunks() << 4) + " blocks") - .addInfo("Use Soldering iron to turn off chunk mode") - .addInfo("Use Wire Cutter to toggle replacing mined blocks with cobblestone") - .addInfo("In chunk mode, working area center is the chunk corner nearest to the drill") - .addInfo("Gives ~3x as much crushed ore vs normal processing") - .addInfo("Fortune bonus of " + (mTier + 3) + ". Only works on small ores").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(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top") - .addEnergyHatch(VN[getMinTier()] + "+, Any base casing", 1).addMaintenanceHatch("Any base casing", 1) - .addInputBus("Mining Pipes, optional, any base casing", 1) - .addInputHatch("Drilling Fluid, any base casing", 1).addOutputBus("Any base casing", 1) - .toolTipFinisher("Gregtech"); + .addInfo("Controller Block for the Ore Drilling Plant " + (tierSuffix != null ? tierSuffix : "")) + .addInfo("Use a Screwdriver to configure block radius") + .addInfo("Maximum radius is " + (getRadiusInChunks() << 4) + " blocks") + .addInfo("Use Soldering iron to turn off chunk mode") + .addInfo("Use Wire Cutter to toggle replacing mined blocks with cobblestone") + .addInfo("In chunk mode, working area center is the chunk corner nearest to the drill") + .addInfo("Gives ~3x as much crushed ore vs normal processing") + .addInfo("Fortune bonus of " + (mTier + 3) + ". Only works on small ores") + .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(getFrameMaterial().mName + " Frame Boxes", "Each pillar's side and 1x3x1 on top") + .addEnergyHatch(VN[getMinTier()] + "+, Any base casing", 1) + .addMaintenanceHatch("Any base casing", 1) + .addInputBus("Mining Pipes, optional, any base casing", 1) + .addInputHatch("Drilling Fluid, any base casing", 1) + .addOutputBus("Any base casing", 1) + .toolTipFinisher("Gregtech"); return tt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java index df878d8050..7ad3c1b4bf 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java @@ -95,12 +95,12 @@ public class GT_MetaTileEntity_PCBFactory extends private static final int mTier2BitMap = 0b10; private static final int mTier1BitMap = 0b1; private static final int COOLANT_CONSUMED_PER_SEC = 10; - private static final IStructureDefinition<GT_MetaTileEntity_PCBFactory> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_PCBFactory>builder().addShape( - tier1, - transpose( - new String[][] { - // spotless:off + private static final IStructureDefinition<GT_MetaTileEntity_PCBFactory> STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_PCBFactory>builder() + .addShape( + tier1, + transpose( + new String[][] { + // spotless:off {" ","E E","E E","EEEEEEE","E E","E E"," "}, {"EEEEEEE","CAAAAAC","CAAAAAC","CCCCCCC","CCCCCCC","CCCCCCC","E E"}, {"EAAAAAE","C-----C","C-----C","C-----C","C-----C","C-----C","ECCCCCE"}, @@ -108,11 +108,12 @@ public class GT_MetaTileEntity_PCBFactory extends {"EAAAAAE","C-----C","B-FFF-B","B-FFF-B","B-FFF-B","C-----C","EPPPPPE"}, {"ECC~CCE","CDDDDDC","CDDDDDC","CDDDDDC","CDDDDDC","CDDDDDC","EPPPPPE"} //spotless:on - })).addShape( - tier2, - transpose( - new String[][] { - // spotless:off + })) + .addShape( + tier2, + transpose( + new String[][] { + // spotless:off {" "," "," ","HGGH","HGGH","HGGH","HGGH","HGGH"," "," "," "}, {" "," ","HGGH","GGGG","GGGG","GGGG","GGGG","GGGG","HGGH"," "," "}, {" ","HGGH","GGGG","G G","G G","G G","G G","G G","GGGG","HGGH"," "}, @@ -121,11 +122,12 @@ public class GT_MetaTileEntity_PCBFactory extends {"HGGH","G G","G G","G G","G G","G G","G G","G G","G G","G G","HGGH"}, {"HGGH","GGGG","GGGG","GGGG","GGGG","GGGG","GGGG","GGGG","GGGG","GGGG","HGGH"} //spotless:on - })).addShape( - tier3, - transpose( - new String[][] { - // spotless:off + })) + .addShape( + tier3, + transpose( + new String[][] { + // spotless:off {" "," "," "," "," I "," I "," "," "," "," "}, {" "," "," "," I "," I "," I "," I "," "," "," "}, {" "," "," KKK "," KIK "," K K "," K K "," I "," "," "," "}, @@ -149,11 +151,12 @@ public class GT_MetaTileEntity_PCBFactory extends {" "," III "," I I "," I I "," I I "," I I "," I I "," I I "," III "," "}, {" II~II ","IIJJJII","IJJJJJI","IJJJJJI","IJJJJJI","IJJJJJI","IJJJJJI","IJJJJJI","IIJJJII"," IIIII "} //spotless:on - })).addShape( - bioUpgrade, - transpose( - new String[][] { - // spotless:off + })) + .addShape( + bioUpgrade, + transpose( + new String[][] { + // spotless:off {" "," "," LLLLLL "," "," "}, {" "," "," L L "," "," "}, {"E E E E"," LLL LLL "," LLL LLL "," LLL LLL ","E E E E"}, @@ -162,12 +165,12 @@ public class GT_MetaTileEntity_PCBFactory extends {"EAAAE EAAAE","A A A A","A A A A","A A A A","EAAAE EAAAE"}, {"ELLLE ELLLE","LLLLL LLLLL","LLLLL LLLLL","LLLLL LLLLL","ELLLE ELLLE"} //spotless:on - })) - .addShape( - ocTier1Upgrade, - transpose( - new String[][] { - // spotless:off + })) + .addShape( + ocTier1Upgrade, + transpose( + new String[][] { + // spotless:off {"EKKKE","K K","K K","K K","EKKKE"}, {"E E"," KKK "," K K "," KKK ","E E"}, {"E E"," NNN "," N N "," NNN ","E E"}, @@ -179,11 +182,12 @@ public class GT_MetaTileEntity_PCBFactory extends {"ENNNE","NKKKN","NK KN","NKKKN","ENNNE"}, {"EGGGE","GGGGG","GGMGG","GGGGG","EGGGE"} //spotless:on - })).addShape( - ocTier2Upgrade, - transpose( - new String[][] { - // spotless:off + })) + .addShape( + ocTier2Upgrade, + transpose( + new String[][] { + // spotless:off {"RGGGR","G G","G G","G G","RGGGR"}, {"R R"," GGG "," GTG "," GGG ","R R"}, {"R R"," NNN "," NTN "," NNN ","R R"}, @@ -195,50 +199,172 @@ public class GT_MetaTileEntity_PCBFactory extends {"RNNNR","NQQQN","NQTQN","NQQQN","RNNNR"}, {"RGGGR","GGGGG","GGSGG","GGGGG","RGGGR"} //spotless:on - })).addElement('E', ofFrame(Materials.DamascusSteel)) - .addElement('C', ofBlock(GregTech_API.sBlockCasings8, 11)) - .addElement('D', ofBlock(GregTech_API.sBlockReinforced, 2)) - .addElement( - 'A', - ofChain( - ofBlockUnlocalizedName("IC2", "blockAlloyGlass", 0, true), - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 0, true), - ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks2", 0, true), - // warded glass - ofBlockUnlocalizedName("Thaumcraft", "blockCosmeticOpaque", 2, false))) - .addElement('B', ofBlock(GregTech_API.sBlockCasings3, 10)).addElement('F', ofFrame(Materials.VibrantAlloy)) - .addElement( - 'P', - buildHatchAdder(GT_MetaTileEntity_PCBFactory.class) - .atLeast(InputHatch, OutputBus, InputBus, Maintenance, Energy.or(ExoticEnergy)).dot(1) - .casingIndex(((GT_Block_Casings8) GregTech_API.sBlockCasings8).getTextureIndex(11)) - .buildAndChain(GregTech_API.sBlockCasings8, 11)) - .addElement('H', ofFrame(Materials.Duranium)).addElement('G', ofBlock(GregTech_API.sBlockCasings8, 12)) - .addElement('I', ofBlock(GregTech_API.sBlockCasings8, 13)) - .addElement('K', ofBlock(GregTech_API.sBlockCasings8, 10)) - .addElement( - 'J', - buildHatchAdder(GT_MetaTileEntity_PCBFactory.class) - .atLeast(InputHatch, OutputBus, InputBus, Maintenance, Energy.or(ExoticEnergy)).dot(1) - .casingIndex(((GT_Block_Casings8) GregTech_API.sBlockCasings8).getTextureIndex(13)) - .buildAndChain(GregTech_API.sBlockCasings8, 13)) - .addElement('L', ofBlock(GregTech_API.sBlockCasings4, 1)) - .addElement( - 'M', - buildHatchAdder(GT_MetaTileEntity_PCBFactory.class).hatchClass(GT_MetaTileEntity_Hatch_Input.class) - .adder(GT_MetaTileEntity_PCBFactory::addCoolantInputToMachineList) - .casingIndex(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 12)).dot(2) - .buildAndChain(GregTech_API.sBlockCasings8, 12)) - .addElement('N', ofBlock(GregTech_API.sBlockCasings2, 15)) - .addElement('O', ofBlock(GregTech_API.sBlockCasings8, 4)) - .addElement( - 'S', - buildHatchAdder(GT_MetaTileEntity_PCBFactory.class).hatchClass(GT_MetaTileEntity_Hatch_Input.class) - .adder(GT_MetaTileEntity_PCBFactory::addCoolantInputToMachineList) - .casingIndex(GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 12)).dot(2) - .buildAndChain(GregTech_API.sBlockCasings8, 12)) - .addElement('R', ofFrame(Materials.Americium)).addElement('Q', ofBlock(GregTech_API.sBlockCasings8, 14)) - .addElement('T', ofBlock(GregTech_API.sBlockCasings1, 15)).build(); + })) + .addElement( + 'E', + ofFrame( + Materials.DamascusSteel)) + .addElement( + 'C', + ofBlock( + GregTech_API.sBlockCasings8, + 11)) + .addElement( + 'D', + ofBlock( + GregTech_API.sBlockReinforced, + 2)) + .addElement( + 'A', + ofChain( + ofBlockUnlocalizedName( + "IC2", + "blockAlloyGlass", + 0, + true), + ofBlockUnlocalizedName( + "bartworks", + "BW_GlasBlocks", + 0, + true), + ofBlockUnlocalizedName( + "bartworks", + "BW_GlasBlocks2", + 0, + true), + // warded + // glass + ofBlockUnlocalizedName( + "Thaumcraft", + "blockCosmeticOpaque", + 2, + false))) + .addElement( + 'B', + ofBlock( + GregTech_API.sBlockCasings3, + 10)) + .addElement( + 'F', + ofFrame( + Materials.VibrantAlloy)) + .addElement( + 'P', + buildHatchAdder( + GT_MetaTileEntity_PCBFactory.class).atLeast( + InputHatch, + OutputBus, + InputBus, + Maintenance, + Energy.or( + ExoticEnergy)) + .dot( + 1) + .casingIndex( + ((GT_Block_Casings8) GregTech_API.sBlockCasings8).getTextureIndex( + 11)) + .buildAndChain( + GregTech_API.sBlockCasings8, + 11)) + .addElement( + 'H', + ofFrame( + Materials.Duranium)) + .addElement( + 'G', + ofBlock( + GregTech_API.sBlockCasings8, + 12)) + .addElement( + 'I', + ofBlock( + GregTech_API.sBlockCasings8, + 13)) + .addElement( + 'K', + ofBlock( + GregTech_API.sBlockCasings8, + 10)) + .addElement( + 'J', + buildHatchAdder( + GT_MetaTileEntity_PCBFactory.class).atLeast( + InputHatch, + OutputBus, + InputBus, + Maintenance, + Energy.or( + ExoticEnergy)) + .dot( + 1) + .casingIndex( + ((GT_Block_Casings8) GregTech_API.sBlockCasings8).getTextureIndex( + 13)) + .buildAndChain( + GregTech_API.sBlockCasings8, + 13)) + .addElement( + 'L', + ofBlock( + GregTech_API.sBlockCasings4, + 1)) + .addElement( + 'M', + buildHatchAdder( + GT_MetaTileEntity_PCBFactory.class).hatchClass( + GT_MetaTileEntity_Hatch_Input.class) + .adder( + GT_MetaTileEntity_PCBFactory::addCoolantInputToMachineList) + .casingIndex( + GT_Utility.getCasingTextureIndex( + GregTech_API.sBlockCasings8, + 12)) + .dot( + 2) + .buildAndChain( + GregTech_API.sBlockCasings8, + 12)) + .addElement( + 'N', + ofBlock( + GregTech_API.sBlockCasings2, + 15)) + .addElement( + 'O', + ofBlock( + GregTech_API.sBlockCasings8, + 4)) + .addElement( + 'S', + buildHatchAdder( + GT_MetaTileEntity_PCBFactory.class).hatchClass( + GT_MetaTileEntity_Hatch_Input.class) + .adder( + GT_MetaTileEntity_PCBFactory::addCoolantInputToMachineList) + .casingIndex( + GT_Utility.getCasingTextureIndex( + GregTech_API.sBlockCasings8, + 12)) + .dot( + 2) + .buildAndChain( + GregTech_API.sBlockCasings8, + 12)) + .addElement( + 'R', + ofFrame( + Materials.Americium)) + .addElement( + 'Q', + ofBlock( + GregTech_API.sBlockCasings8, + 14)) + .addElement( + 'T', + ofBlock( + GregTech_API.sBlockCasings1, + 15)) + .build(); @Override public void construct(ItemStack stackSize, boolean hintsOnly) { @@ -374,15 +500,28 @@ public class GT_MetaTileEntity_PCBFactory extends BlockIcons.getCasingTextureForId( getTier() < 3 ? GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 11) : GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 13)), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_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[] { BlockIcons.getCasingTextureForId( getTier() < 3 ? GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 11) : GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 13)), - 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) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { BlockIcons.getCasingTextureForId( mSetTier < 3 ? ((GT_Block_Casings8) GregTech_API.sBlockCasings8).getTextureIndex(11) @@ -518,8 +657,15 @@ public class GT_MetaTileEntity_PCBFactory extends long amps = getMaxInputAmps(); int tier = GT_Utility.getTier(voltage); - GT_Recipe tRecipe = aMap - .findRecipe(getBaseMetaTileEntity(), null, true, false, V[tier], aFluidInputs, aStack, aItemInputs); + GT_Recipe tRecipe = aMap.findRecipe( + getBaseMetaTileEntity(), + null, + true, + false, + V[tier], + aFluidInputs, + aStack, + aItemInputs); if (tRecipe == null) { return false; @@ -552,9 +698,14 @@ public class GT_MetaTileEntity_PCBFactory extends && ((recipeBitMap & mBioBitMap) == 0 || ((recipeBitMap & mBioBitMap) == mBioBitMap && mBioUpgrade)); if (recipeAllowed) { - GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe).setItemInputs(aItemInputs) - .setFluidInputs(aFluidInputs).setMaxParallel(aMaxParallel).setAvailableEUt(getMaxInputEu()) - .setEUtModifier(aExtraPower).enableConsumption().build(); + GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(tRecipe) + .setItemInputs(aItemInputs) + .setFluidInputs(aFluidInputs) + .setMaxParallel(aMaxParallel) + .setAvailableEUt(getMaxInputEu()) + .setEUtModifier(aExtraPower) + .enableConsumption() + .build(); mCurrentParallel = helper.getCurrentParallel(); if (mCurrentParallel > 0) { @@ -565,8 +716,14 @@ public class GT_MetaTileEntity_PCBFactory extends if (mOCTier1 || mOCTier2) { GT_OverclockCalculator calc = new GT_OverclockCalculator().setRecipeEUt(tRecipe.mEUt) - .setDuration(tRecipe.mDuration).setEUt(voltage).setAmperage(amps) - .setEUtDiscount(aExtraPower).setSpeedBoost((float) Math.pow(mRoughnessMultiplier, 2)); + .setDuration(tRecipe.mDuration) + .setEUt(voltage) + .setAmperage(amps) + .setEUtDiscount(aExtraPower) + .setSpeedBoost( + (float) Math.pow( + mRoughnessMultiplier, + 2)); if (mOCTier2) { calc.enablePerfectOC(); } @@ -849,8 +1006,10 @@ public class GT_MetaTileEntity_PCBFactory extends long maxEnergy = 0; for (GT_MetaTileEntity_Hatch tHatch : getExoticAndNormalEnergyHatchList()) { if (isValidMetaTileEntity(tHatch)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); + storedEnergy += tHatch.getBaseMetaTileEntity() + .getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity() + .getEUCapacity(); } } long voltage = getAverageInputVoltage(); @@ -919,120 +1078,110 @@ public class GT_MetaTileEntity_PCBFactory extends @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Circuit Board Fabricator").addInfo("Controller for the PCB Factory") - .addInfo( - EnumChatFormatting.GOLD.toString() + EnumChatFormatting.BOLD - + "IMPORTANT!" - + " Check the configuration menu before building.") - .addInfo("Tier of the machine determines the available recipes.") - .addInfo("Machine tier (1-3) is set in the controller GUI.") - .addInfo("The configuration menu can be used to add upgrades.") - .addInfo("Each tier and upgrade requires additional structures.") - .addInfo("Power consumption is multiplied by Sqrt(structures).") - .addInfo("Tier 2 and 3 allow parallel by using extra nanites.") - .addInfo("Every doubling of nanites adds one parallel.") - .addInfo("1x->1, 2x->2, 4x->3, 8x->4 with no limit.") - .addInfo("Recipes require a cooling upgrade to be overclocked.") - .addInfo("Liquid Cooling uses 10 L/s of distilled water and enables default overclocks.") - .addInfo("Thermosink uses 10 L/s of Space Coolant and enables perfect overclocks.") - .addInfo("Trace size can be changed to modify the material usage and machine speed.") - .addInfo(AuthorBlueWeabo).beginStructureBlock(30, 38, 13, false).addSeparator() - .addMaintenanceHatch(EnumChatFormatting.GOLD + "1", 1) - .addEnergyHatch(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + "+", 1) - .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + "+", 1) - .addOutputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + "+", 1) - .addInputHatch(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + "+", 1) - .addStructureInfo( - "Coolant Hatch (Input Hatch): " + EnumChatFormatting.GOLD - + "1" - + EnumChatFormatting.GRAY - + "Center of the Liquid Cooling/Thermosink") - .addStructureInfo( - EnumChatFormatting.BLUE + "Base Multi (Tier " - + EnumChatFormatting.DARK_PURPLE - + 1 - + EnumChatFormatting.BLUE - + "):") - .addStructureInfo( - EnumChatFormatting.GOLD + "40" + EnumChatFormatting.GRAY + " Damascus Steel Frame Box") - .addStructureInfo(EnumChatFormatting.GOLD + "9" + EnumChatFormatting.GRAY + " Vibrant Alloy Frame Box") - .addStructureInfo(EnumChatFormatting.GOLD + "25" + EnumChatFormatting.GRAY + " Reinforced Glass") - .addStructureInfo( - EnumChatFormatting.GOLD + "77" - + EnumChatFormatting.GRAY - + " Basic Photolithography Framework Casing") - .addStructureInfo(EnumChatFormatting.GOLD + "12" + EnumChatFormatting.GRAY + " Grate Machine Casing") - .addStructureInfo(EnumChatFormatting.GOLD + "25" + EnumChatFormatting.GRAY + " Plascrete Block") - .addStructureInfo( - EnumChatFormatting.BLUE + "Tier " - + EnumChatFormatting.DARK_PURPLE - + 2 - + EnumChatFormatting.BLUE - + " (Adds to Tier " - + EnumChatFormatting.DARK_PURPLE - + 1 - + EnumChatFormatting.BLUE - + "):") - .addStructureInfo(EnumChatFormatting.GOLD + "34" + EnumChatFormatting.GRAY + " Duranium Frame Box") - .addStructureInfo( - EnumChatFormatting.GOLD + "158" - + EnumChatFormatting.GRAY - + " Reinforced Photolithography Framework Casing") - .addStructureInfo( - EnumChatFormatting.BLUE + "Tier " - + EnumChatFormatting.DARK_PURPLE - + 3 - + EnumChatFormatting.BLUE - + ":") - .addStructureInfo( - EnumChatFormatting.GOLD + "292" - + EnumChatFormatting.GRAY - + " Radiation Proof Photolithography Framework Casing") - .addStructureInfo( - EnumChatFormatting.GOLD + "76" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing") - .addStructureInfo(EnumChatFormatting.BLUE + "Biochamber Upgrade") - .addStructureInfo( - EnumChatFormatting.GOLD + "68" - + EnumChatFormatting.GRAY - + " Clean Stainless Steel Machine Casing") - .addStructureInfo( - EnumChatFormatting.GOLD + "40" + EnumChatFormatting.GRAY + " Damascus Steel Frame Box") - .addStructureInfo(EnumChatFormatting.GOLD + "72" + EnumChatFormatting.GRAY + " Reinforced Glass") - .addStructureInfo( - EnumChatFormatting.BLUE + "Liquid Cooling Tower (Tier " - + EnumChatFormatting.DARK_PURPLE - + 1 - + EnumChatFormatting.BLUE - + "):") - .addStructureInfo( - EnumChatFormatting.GOLD + "40" + EnumChatFormatting.GRAY + " Damascus Steel Frame Box") - .addStructureInfo( - EnumChatFormatting.GOLD + "68" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing") - .addStructureInfo( - EnumChatFormatting.GOLD + "12" + EnumChatFormatting.GRAY + " Extreme Engine Intake Casing") - .addStructureInfo( - EnumChatFormatting.GOLD + "20" + EnumChatFormatting.GRAY + " Tungstensteel Pipe Casing") - .addStructureInfo( - EnumChatFormatting.GOLD + "21" - + EnumChatFormatting.GRAY - + " Reinforced Photolithography Framework Casing") - .addStructureInfo( - EnumChatFormatting.BLUE + "Thermosink Radiator(Tier " - + EnumChatFormatting.DARK_PURPLE - + 2 - + EnumChatFormatting.BLUE - + "):") - .addStructureInfo(EnumChatFormatting.GOLD + "40" + EnumChatFormatting.GRAY + " Americium Frame Box") - .addStructureInfo( - EnumChatFormatting.GOLD + "41" - + EnumChatFormatting.GRAY - + " Reinforced Photolithography Framework Casing") - .addStructureInfo( - EnumChatFormatting.GOLD + "8" + EnumChatFormatting.GRAY + " Superconducting Coil Block") - .addStructureInfo( - EnumChatFormatting.GOLD + "20" + EnumChatFormatting.GRAY + " Tungstensteel Pipe Casing") - .addStructureInfo(EnumChatFormatting.GOLD + "48" + EnumChatFormatting.GRAY + " Infinity Cooled Casing") - .toolTipFinisher("GregTech"); + tt.addMachineType("Circuit Board Fabricator") + .addInfo("Controller for the PCB Factory") + .addInfo( + EnumChatFormatting.GOLD.toString() + EnumChatFormatting.BOLD + + "IMPORTANT!" + + " Check the configuration menu before building.") + .addInfo("Tier of the machine determines the available recipes.") + .addInfo("Machine tier (1-3) is set in the controller GUI.") + .addInfo("The configuration menu can be used to add upgrades.") + .addInfo("Each tier and upgrade requires additional structures.") + .addInfo("Power consumption is multiplied by Sqrt(structures).") + .addInfo("Tier 2 and 3 allow parallel by using extra nanites.") + .addInfo("Every doubling of nanites adds one parallel.") + .addInfo("1x->1, 2x->2, 4x->3, 8x->4 with no limit.") + .addInfo("Recipes require a cooling upgrade to be overclocked.") + .addInfo("Liquid Cooling uses 10 L/s of distilled water and enables default overclocks.") + .addInfo("Thermosink uses 10 L/s of Space Coolant and enables perfect overclocks.") + .addInfo("Trace size can be changed to modify the material usage and machine speed.") + .addInfo(AuthorBlueWeabo) + .beginStructureBlock(30, 38, 13, false) + .addSeparator() + .addMaintenanceHatch(EnumChatFormatting.GOLD + "1", 1) + .addEnergyHatch(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + "+", 1) + .addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + "+", 1) + .addOutputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + "+", 1) + .addInputHatch(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + "+", 1) + .addStructureInfo( + "Coolant Hatch (Input Hatch): " + EnumChatFormatting.GOLD + + "1" + + EnumChatFormatting.GRAY + + "Center of the Liquid Cooling/Thermosink") + .addStructureInfo( + EnumChatFormatting.BLUE + "Base Multi (Tier " + + EnumChatFormatting.DARK_PURPLE + + 1 + + EnumChatFormatting.BLUE + + "):") + .addStructureInfo(EnumChatFormatting.GOLD + "40" + EnumChatFormatting.GRAY + " Damascus Steel Frame Box") + .addStructureInfo(EnumChatFormatting.GOLD + "9" + EnumChatFormatting.GRAY + " Vibrant Alloy Frame Box") + .addStructureInfo(EnumChatFormatting.GOLD + "25" + EnumChatFormatting.GRAY + " Reinforced Glass") + .addStructureInfo( + EnumChatFormatting.GOLD + "77" + EnumChatFormatting.GRAY + " Basic Photolithography Framework Casing") + .addStructureInfo(EnumChatFormatting.GOLD + "12" + EnumChatFormatting.GRAY + " Grate Machine Casing") + .addStructureInfo(EnumChatFormatting.GOLD + "25" + EnumChatFormatting.GRAY + " Plascrete Block") + .addStructureInfo( + EnumChatFormatting.BLUE + "Tier " + + EnumChatFormatting.DARK_PURPLE + + 2 + + EnumChatFormatting.BLUE + + " (Adds to Tier " + + EnumChatFormatting.DARK_PURPLE + + 1 + + EnumChatFormatting.BLUE + + "):") + .addStructureInfo(EnumChatFormatting.GOLD + "34" + EnumChatFormatting.GRAY + " Duranium Frame Box") + .addStructureInfo( + EnumChatFormatting.GOLD + "158" + + EnumChatFormatting.GRAY + + " Reinforced Photolithography Framework Casing") + .addStructureInfo( + EnumChatFormatting.BLUE + "Tier " + + EnumChatFormatting.DARK_PURPLE + + 3 + + EnumChatFormatting.BLUE + + ":") + .addStructureInfo( + EnumChatFormatting.GOLD + "292" + + EnumChatFormatting.GRAY + + " Radiation Proof Photolithography Framework Casing") + .addStructureInfo(EnumChatFormatting.GOLD + "76" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing") + .addStructureInfo(EnumChatFormatting.BLUE + "Biochamber Upgrade") + .addStructureInfo( + EnumChatFormatting.GOLD + "68" + EnumChatFormatting.GRAY + " Clean Stainless Steel Machine Casing") + .addStructureInfo(EnumChatFormatting.GOLD + "40" + EnumChatFormatting.GRAY + " Damascus Steel Frame Box") + .addStructureInfo(EnumChatFormatting.GOLD + "72" + EnumChatFormatting.GRAY + " Reinforced Glass") + .addStructureInfo( + EnumChatFormatting.BLUE + "Liquid Cooling Tower (Tier " + + EnumChatFormatting.DARK_PURPLE + + 1 + + EnumChatFormatting.BLUE + + "):") + .addStructureInfo(EnumChatFormatting.GOLD + "40" + EnumChatFormatting.GRAY + " Damascus Steel Frame Box") + .addStructureInfo(EnumChatFormatting.GOLD + "68" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing") + .addStructureInfo(EnumChatFormatting.GOLD + "12" + EnumChatFormatting.GRAY + " Extreme Engine Intake Casing") + .addStructureInfo(EnumChatFormatting.GOLD + "20" + EnumChatFormatting.GRAY + " Tungstensteel Pipe Casing") + .addStructureInfo( + EnumChatFormatting.GOLD + "21" + + EnumChatFormatting.GRAY + + " Reinforced Photolithography Framework Casing") + .addStructureInfo( + EnumChatFormatting.BLUE + "Thermosink Radiator(Tier " + + EnumChatFormatting.DARK_PURPLE + + 2 + + EnumChatFormatting.BLUE + + "):") + .addStructureInfo(EnumChatFormatting.GOLD + "40" + EnumChatFormatting.GRAY + " Americium Frame Box") + .addStructureInfo( + EnumChatFormatting.GOLD + "41" + + EnumChatFormatting.GRAY + + " Reinforced Photolithography Framework Casing") + .addStructureInfo(EnumChatFormatting.GOLD + "8" + EnumChatFormatting.GRAY + " Superconducting Coil Block") + .addStructureInfo(EnumChatFormatting.GOLD + "20" + EnumChatFormatting.GRAY + " Tungstensteel Pipe Casing") + .addStructureInfo(EnumChatFormatting.GOLD + "48" + EnumChatFormatting.GRAY + " Infinity Cooled Casing") + .toolTipFinisher("GregTech"); return tt; } @@ -1124,21 +1273,34 @@ public class GT_MetaTileEntity_PCBFactory extends buildContext.addSyncedWindow(10, this::createConfigurationWindow); builder.widget( new ButtonWidget().setOnClick( - (clickData, widget) -> { if (!widget.isClient()) widget.getContext().openSyncedWindow(10); }) - .setSize(16, 16).setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(GT_UITextures.BUTTON_STANDARD); - ret.add(GT_UITextures.OVERLAY_BUTTON_CYCLIC); - return ret.toArray(new IDrawable[0]); - }).addTooltip("Configuration Menu").setPos(174, 130)) - .widget( - new TextWidget(new Text("Tier")).setTextAlignment(Alignment.Center).setScale(0.91f) - .setSize(20, 16).setPos(173, 98)) - .widget( - new TextFieldWidget().setGetterInt(() -> mSetTier).setSetterInt(val -> { mSetTier = val; }) - .setNumbers(1, 3).setTextColor(Color.WHITE.normal).setTextAlignment(Alignment.Center) - .addTooltip("PCB Factory Tier").setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD) - .setSize(18, 18).setPos(173, 110)); + (clickData, widget) -> { + if (!widget.isClient()) widget.getContext() + .openSyncedWindow(10); + }) + .setSize(16, 16) + .setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(GT_UITextures.BUTTON_STANDARD); + ret.add(GT_UITextures.OVERLAY_BUTTON_CYCLIC); + return ret.toArray(new IDrawable[0]); + }) + .addTooltip("Configuration Menu") + .setPos(174, 130)) + .widget( + new TextWidget(new Text("Tier")).setTextAlignment(Alignment.Center) + .setScale(0.91f) + .setSize(20, 16) + .setPos(173, 98)) + .widget( + new TextFieldWidget().setGetterInt(() -> mSetTier) + .setSetterInt(val -> { mSetTier = val; }) + .setNumbers(1, 3) + .setTextColor(Color.WHITE.normal) + .setTextAlignment(Alignment.Center) + .addTooltip("PCB Factory Tier") + .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD) + .setSize(18, 18) + .setPos(173, 110)); } protected ModularWindow createConfigurationWindow(final EntityPlayer player) { @@ -1146,192 +1308,364 @@ public class GT_MetaTileEntity_PCBFactory extends builder.setBackground(GT_UITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); builder.setGuiTint(getGUIColorization()); builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC).setPos(5, 5).setSize(16, 16)) - .widget(new TextWidget("Configuration Menu").setPos(25, 9)) - .widget(ButtonWidget.closeWindowButton(true).setPos(185, 3)) - .widget( - new DynamicPositionedColumn().setSynced(false) - .widget( - new MultiChildWidget() - .addChild(new CycleButtonWidget().setToggle(() -> mBioUpgrade, val -> { - mBioUpgrade = val; - if (!mBioUpgrade) { - GT_Utility.sendChatToPlayer( - player, - GT_Utility - .trans("339.1", "Biochamber Upgrade Disabled")); - } else { - GT_Utility.sendChatToPlayer( - player, - GT_Utility.trans("339", "Biochamber Upgrade Enabled")); - } - }).setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setSize(90, 18).addTooltip( - "Enables nanites to construct organic circuitry. Required for Bioware and Wetware boards.")) - .addChild( - new DrawableWidget() - .setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC) - .setSize(18, 18)) - .addChild( - new TextWidget("Biochamber").setTextAlignment(Alignment.Center) - .setPos(23, 5)) - .setEnabled(widget -> !getBaseMetaTileEntity().isActive())) - .widget( - new MultiChildWidget() - .addChild(new CycleButtonWidget().setToggle(() -> mBioRotate, val -> { - mBioRotate = val; - if (!mBioRotate) { - GT_Utility.sendChatToPlayer( - player, - GT_Utility - .trans("340.1", "Rotated biochamber disabled")); - } else { - GT_Utility.sendChatToPlayer( - player, - GT_Utility.trans("340", "Rotated biochamber enabled")); - } - }).setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setSize(90, 18) - .addTooltip("Rotates the biochamber by 90 degrees.")) - .addChild( - new DrawableWidget() - .setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC) - .setSize(18, 18)) - .addChild( - new TextWidget("Bio Rotation") - .setTextAlignment(Alignment.Center).setPos(23, 5)) - .setEnabled(widget -> !getBaseMetaTileEntity().isActive())) - .widget( - new MultiChildWidget() - .addChild(new CycleButtonWidget().setToggle(() -> mOCTier1, val -> { - mOCTier1 = val; - if (!mOCTier1) { - GT_Utility.sendChatToPlayer( - player, - GT_Utility.trans("341.1", "Tier 1 cooling disabled")); - } else { - GT_Utility.sendChatToPlayer( - player, - GT_Utility.trans("341", "Tier 1 cooling enabled")); - } - }).setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setSize(90, 18).addTooltip( - "Allows for overclocking. Requires 10 L/s of distilled water. Cooling upgrades are mutually exclusive.")) - .addChild( - new DrawableWidget() - .setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC) - .setSize(18, 18)) - .addChild( - new TextWidget("Liquid Cooling") - .setTextAlignment(Alignment.Center).setPos(20, 5)) - .setEnabled(widget -> !getBaseMetaTileEntity().isActive())) - .widget( - new MultiChildWidget() - .addChild(new CycleButtonWidget().setToggle(() -> mOCTier2, val -> { - mOCTier2 = val; - if (!mOCTier2) { - GT_Utility.sendChatToPlayer( - player, - GT_Utility.trans("342.1", "Tier 2 cooling disabled")); - } else { - GT_Utility.sendChatToPlayer( - player, - GT_Utility.trans("342", "Tier 2 cooling enabled")); - } - }).setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setSize(90, 18).addTooltip( - "Enables perfect overclocking by allowing nanites to work with extreme speed and efficiency. Uses 10 L/s of space coolant.")) - .addChild( - new DrawableWidget() - .setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC) - .setSize(18, 18)) - .addChild( - new TextWidget("Thermosink").setTextAlignment(Alignment.Center) - .setPos(20, 5)) - .setEnabled(widget -> !getBaseMetaTileEntity().isActive())) - .widget( - new TextWidget(new Text("Trace Size")).setSize(90, 18) - .setEnabled(widget -> !getBaseMetaTileEntity().isActive()).setPos(0, 4)) - .widget( - new TextFieldWidget() - .setGetterInt(() -> (int) ((1f / mRoughnessMultiplier) * 100f)) - .setSetterInt(val -> { mRoughnessMultiplier = 100f / val; }) - .setNumbers(50, 200).setTextColor(Color.WHITE.normal) - .setTextAlignment(Alignment.Center) - .addTooltip( - "Set the trace size. Smaller traces allow material savings but take longer to fabricate. Larger traces waste material but are fast. 50-200 μm.") - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD).setSize(90, 16)) - .widget( - new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CROSS) - .setSize(18, 18) - .addTooltip( - new Text("Can't change configuration when running !") - .color(Color.RED.dark(3))) - .setEnabled(widget -> getBaseMetaTileEntity().isActive())) - .setPos(10, 25)) - .widget( - new DynamicPositionedColumn().setSynced(false) - .widget( - new TextWidget(new Text("Bio Upgrade Offsets")).setSize(72, 18) - .setEnabled(widget -> !getBaseMetaTileEntity().isActive())) - .widget( - new DynamicPositionedRow().setSynced(false).widget( - new TextFieldWidget().setGetterInt(() -> mBioOffsets[0]) - .setSetterInt(val -> { mBioOffsets[0] = val; }) - .setNumbers(-16, 16).setTextColor(Color.WHITE.normal) - .setTextAlignment(Alignment.Center).addTooltip("X Offset") - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD) - .setSize(36, 18)) - .widget( - new TextFieldWidget().setGetterInt(() -> mBioOffsets[1]) - .setSetterInt(val -> { mBioOffsets[1] = val; }) - .setNumbers(-16, 16).setTextColor(Color.WHITE.normal) - .setTextAlignment(Alignment.Center) - .addTooltip("Z Offset") - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD) - .setSize(36, 18)) - .setEnabled(widget -> !getBaseMetaTileEntity().isActive())) - .widget( - new TextWidget(new Text("Cooler Tier 1 Offsets")).setSize(72, 18) - .setEnabled(widget -> !getBaseMetaTileEntity().isActive())) - .widget( - new DynamicPositionedRow().setSynced(false).widget( - new TextFieldWidget().setGetterInt(() -> mOCTier1Offsets[0]) - .setSetterInt(val -> { mOCTier1Offsets[0] = val; }) - .setNumbers(-16, 16).setTextColor(Color.WHITE.normal) - .setTextAlignment(Alignment.Center).addTooltip("X Offset") - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD) - .setSize(36, 18)) - .widget( - new TextFieldWidget().setGetterInt(() -> mOCTier1Offsets[1]) - .setSetterInt(val -> { mOCTier1Offsets[1] = val; }) - .setNumbers(-16, 16).setTextColor(Color.WHITE.normal) - .setTextAlignment(Alignment.Center) - .addTooltip("Z Offset") - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD) - .setSize(36, 18)) - .setEnabled(widget -> !getBaseMetaTileEntity().isActive())) - .widget( - new TextWidget(new Text("Cooler Tier 2 Offsets")).setSize(72, 18) - .setEnabled(widget -> !getBaseMetaTileEntity().isActive())) - .widget( - new DynamicPositionedRow().setSynced(false).widget( - new TextFieldWidget().setGetterInt(() -> mOCTier2Offsets[0]) - .setSetterInt(val -> { mOCTier2Offsets[0] = val; }) - .setNumbers(-16, 16).setTextColor(Color.WHITE.normal) - .setTextAlignment(Alignment.Center).addTooltip("X Offset") - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD) - .setSize(36, 18)) - .widget( - new TextFieldWidget().setGetterInt(() -> mOCTier2Offsets[1]) - .setSetterInt(val -> { mOCTier2Offsets[1] = val; }) - .setNumbers(-16, 16).setTextColor(Color.WHITE.normal) - .setTextAlignment(Alignment.Center) - .addTooltip("Z Offset") - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD) - .setSize(36, 18)) - .setEnabled(widget -> !getBaseMetaTileEntity().isActive())) - .setPos(110, 25)); + new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC) + .setPos(5, 5) + .setSize(16, 16)) + .widget(new TextWidget("Configuration Menu").setPos(25, 9)) + .widget( + ButtonWidget.closeWindowButton(true) + .setPos(185, 3)) + .widget( + new DynamicPositionedColumn().setSynced(false) + .widget( + new MultiChildWidget().addChild( + new CycleButtonWidget().setToggle( + () -> mBioUpgrade, + val -> { + mBioUpgrade = val; + if (!mBioUpgrade) { + GT_Utility.sendChatToPlayer( + player, + GT_Utility.trans( + "339.1", + "Biochamber Upgrade Disabled")); + } else { + GT_Utility.sendChatToPlayer( + player, + GT_Utility.trans( + "339", + "Biochamber Upgrade Enabled")); + } + }) + .setVariableBackground( + GT_UITextures.BUTTON_STANDARD_TOGGLE) + .setSize(90, 18) + .addTooltip( + "Enables nanites to construct organic circuitry. Required for Bioware and Wetware boards.")) + .addChild( + new DrawableWidget().setDrawable( + GT_UITextures.OVERLAY_BUTTON_CYCLIC) + .setSize( + 18, + 18)) + .addChild( + new TextWidget( + "Biochamber").setTextAlignment( + Alignment.Center) + .setPos( + 23, + 5)) + .setEnabled( + widget -> !getBaseMetaTileEntity().isActive())) + .widget( + new MultiChildWidget().addChild( + new CycleButtonWidget().setToggle( + () -> mBioRotate, + val -> { + mBioRotate = val; + if (!mBioRotate) { + GT_Utility.sendChatToPlayer( + player, + GT_Utility.trans( + "340.1", + "Rotated biochamber disabled")); + } else { + GT_Utility.sendChatToPlayer( + player, + GT_Utility.trans( + "340", + "Rotated biochamber enabled")); + } + }) + .setVariableBackground( + GT_UITextures.BUTTON_STANDARD_TOGGLE) + .setSize(90, 18) + .addTooltip( + "Rotates the biochamber by 90 degrees.")) + .addChild( + new DrawableWidget().setDrawable( + GT_UITextures.OVERLAY_BUTTON_CYCLIC) + .setSize( + 18, + 18)) + .addChild( + new TextWidget( + "Bio Rotation").setTextAlignment( + Alignment.Center) + .setPos( + 23, + 5)) + .setEnabled( + widget -> !getBaseMetaTileEntity().isActive())) + .widget( + new MultiChildWidget().addChild( + new CycleButtonWidget().setToggle( + () -> mOCTier1, + val -> { + mOCTier1 = val; + if (!mOCTier1) { + GT_Utility.sendChatToPlayer( + player, + GT_Utility.trans( + "341.1", + "Tier 1 cooling disabled")); + } else { + GT_Utility.sendChatToPlayer( + player, + GT_Utility.trans( + "341", + "Tier 1 cooling enabled")); + } + }) + .setVariableBackground( + GT_UITextures.BUTTON_STANDARD_TOGGLE) + .setSize(90, 18) + .addTooltip( + "Allows for overclocking. Requires 10 L/s of distilled water. Cooling upgrades are mutually exclusive.")) + .addChild( + new DrawableWidget().setDrawable( + GT_UITextures.OVERLAY_BUTTON_CYCLIC) + .setSize( + 18, + 18)) + .addChild( + new TextWidget( + "Liquid Cooling").setTextAlignment( + Alignment.Center) + .setPos( + 20, + 5)) + .setEnabled( + widget -> !getBaseMetaTileEntity().isActive())) + .widget( + new MultiChildWidget().addChild( + new CycleButtonWidget().setToggle( + () -> mOCTier2, + val -> { + mOCTier2 = val; + if (!mOCTier2) { + GT_Utility.sendChatToPlayer( + player, + GT_Utility.trans( + "342.1", + "Tier 2 cooling disabled")); + } else { + GT_Utility.sendChatToPlayer( + player, + GT_Utility.trans( + "342", + "Tier 2 cooling enabled")); + } + }) + .setVariableBackground( + GT_UITextures.BUTTON_STANDARD_TOGGLE) + .setSize(90, 18) + .addTooltip( + "Enables perfect overclocking by allowing nanites to work with extreme speed and efficiency. Uses 10 L/s of space coolant.")) + .addChild( + new DrawableWidget().setDrawable( + GT_UITextures.OVERLAY_BUTTON_CYCLIC) + .setSize( + 18, + 18)) + .addChild( + new TextWidget( + "Thermosink").setTextAlignment( + Alignment.Center) + .setPos( + 20, + 5)) + .setEnabled( + widget -> !getBaseMetaTileEntity().isActive())) + .widget( + new TextWidget(new Text("Trace Size")).setSize(90, 18) + .setEnabled( + widget -> !getBaseMetaTileEntity().isActive()) + .setPos(0, 4)) + .widget( + new TextFieldWidget().setGetterInt( + () -> (int) ((1f / mRoughnessMultiplier) * 100f)) + .setSetterInt( + val -> { + mRoughnessMultiplier = 100f + / val; + }) + .setNumbers(50, 200) + .setTextColor(Color.WHITE.normal) + .setTextAlignment(Alignment.Center) + .addTooltip( + "Set the trace size. Smaller traces allow material savings but take longer to fabricate. Larger traces waste material but are fast. 50-200 μm.") + .setBackground( + GT_UITextures.BACKGROUND_TEXT_FIELD) + .setSize(90, 16)) + .widget( + new DrawableWidget().setDrawable( + GT_UITextures.OVERLAY_BUTTON_CROSS) + .setSize(18, 18) + .addTooltip( + new Text( + "Can't change configuration when running !").color( + Color.RED.dark( + 3))) + .setEnabled( + widget -> getBaseMetaTileEntity().isActive())) + .setPos(10, 25)) + .widget( + new DynamicPositionedColumn().setSynced(false) + .widget( + new TextWidget( + new Text("Bio Upgrade Offsets")).setSize(72, 18) + .setEnabled( + widget -> !getBaseMetaTileEntity().isActive())) + .widget( + new DynamicPositionedRow().setSynced(false) + .widget( + new TextFieldWidget().setGetterInt( + () -> mBioOffsets[0]) + .setSetterInt( + val -> { + mBioOffsets[0] = val; + }) + .setNumbers( + -16, + 16) + .setTextColor( + Color.WHITE.normal) + .setTextAlignment( + Alignment.Center) + .addTooltip( + "X Offset") + .setBackground( + GT_UITextures.BACKGROUND_TEXT_FIELD) + .setSize( + 36, + 18)) + .widget( + new TextFieldWidget().setGetterInt( + () -> mBioOffsets[1]) + .setSetterInt( + val -> { + mBioOffsets[1] = val; + }) + .setNumbers( + -16, + 16) + .setTextColor( + Color.WHITE.normal) + .setTextAlignment( + Alignment.Center) + .addTooltip( + "Z Offset") + .setBackground( + GT_UITextures.BACKGROUND_TEXT_FIELD) + .setSize( + 36, + 18)) + .setEnabled( + widget -> !getBaseMetaTileEntity().isActive())) + .widget( + new TextWidget( + new Text("Cooler Tier 1 Offsets")).setSize(72, 18) + .setEnabled( + widget -> !getBaseMetaTileEntity().isActive())) + .widget( + new DynamicPositionedRow().setSynced(false) + .widget( + new TextFieldWidget().setGetterInt( + () -> mOCTier1Offsets[0]) + .setSetterInt( + val -> { + mOCTier1Offsets[0] = val; + }) + .setNumbers( + -16, + 16) + .setTextColor( + Color.WHITE.normal) + .setTextAlignment( + Alignment.Center) + .addTooltip( + "X Offset") + .setBackground( + GT_UITextures.BACKGROUND_TEXT_FIELD) + .setSize( + 36, + 18)) + .widget( + new TextFieldWidget().setGetterInt( + () -> mOCTier1Offsets[1]) + .setSetterInt( + val -> { + mOCTier1Offsets[1] = val; + }) + .setNumbers( + -16, + 16) + .setTextColor( + Color.WHITE.normal) + .setTextAlignment( + Alignment.Center) + .addTooltip( + "Z Offset") + .setBackground( + GT_UITextures.BACKGROUND_TEXT_FIELD) + .setSize( + 36, + 18)) + .setEnabled( + widget -> !getBaseMetaTileEntity().isActive())) + .widget( + new TextWidget( + new Text("Cooler Tier 2 Offsets")).setSize(72, 18) + .setEnabled( + widget -> !getBaseMetaTileEntity().isActive())) + .widget( + new DynamicPositionedRow().setSynced(false) + .widget( + new TextFieldWidget().setGetterInt( + () -> mOCTier2Offsets[0]) + .setSetterInt( + val -> { + mOCTier2Offsets[0] = val; + }) + .setNumbers( + -16, + 16) + .setTextColor( + Color.WHITE.normal) + .setTextAlignment( + Alignment.Center) + .addTooltip( + "X Offset") + .setBackground( + GT_UITextures.BACKGROUND_TEXT_FIELD) + .setSize( + 36, + 18)) + .widget( + new TextFieldWidget().setGetterInt( + () -> mOCTier2Offsets[1]) + .setSetterInt( + val -> { + mOCTier2Offsets[1] = val; + }) + .setNumbers( + -16, + 16) + .setTextColor( + Color.WHITE.normal) + .setTextAlignment( + Alignment.Center) + .addTooltip( + "Z Offset") + .setBackground( + GT_UITextures.BACKGROUND_TEXT_FIELD) + .setSize( + 36, + 18)) + .setEnabled( + widget -> !getBaseMetaTileEntity().isActive())) + .setPos(110, 25)); return builder.build(); } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java index d058bf1f42..25c3b7157e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java @@ -480,19 +480,44 @@ public class GT_MetaTileEntity_PlasmaForge extends GT_MetaTileEntity_AbstractMul private boolean isMultiChunkloaded = true; protected static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition<GT_MetaTileEntity_PlasmaForge> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_PlasmaForge>builder().addShape(STRUCTURE_PIECE_MAIN, structure_string) - .addElement( - 'C', - ofCoil(GT_MetaTileEntity_PlasmaForge::setCoilLevel, GT_MetaTileEntity_PlasmaForge::getCoilLevel)) - .addElement( - 'b', - buildHatchAdder(GT_MetaTileEntity_PlasmaForge.class) - .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Energy, ExoticEnergy, Maintenance) - .casingIndex(DIM_INJECTION_CASING).dot(3) - .buildAndChain(GregTech_API.sBlockCasings1, DIM_INJECTION_CASING)) - .addElement('N', ofBlock(GregTech_API.sBlockCasings1, DIM_TRANS_CASING)) - .addElement('s', ofBlock(GregTech_API.sBlockCasings1, DIM_BRIDGE_CASING)).build(); + private static final IStructureDefinition<GT_MetaTileEntity_PlasmaForge> STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_PlasmaForge>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + structure_string) + .addElement( + 'C', + ofCoil( + GT_MetaTileEntity_PlasmaForge::setCoilLevel, + GT_MetaTileEntity_PlasmaForge::getCoilLevel)) + .addElement( + 'b', + buildHatchAdder( + GT_MetaTileEntity_PlasmaForge.class).atLeast( + InputHatch, + OutputHatch, + InputBus, + OutputBus, + Energy, + ExoticEnergy, + Maintenance) + .casingIndex( + DIM_INJECTION_CASING) + .dot( + 3) + .buildAndChain( + GregTech_API.sBlockCasings1, + DIM_INJECTION_CASING)) + .addElement( + 'N', + ofBlock( + GregTech_API.sBlockCasings1, + DIM_TRANS_CASING)) + .addElement( + 's', + ofBlock( + GregTech_API.sBlockCasings1, + DIM_BRIDGE_CASING)) + .build(); @Override protected boolean addBottomHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { @@ -517,87 +542,87 @@ public class GT_MetaTileEntity_PlasmaForge extends GT_MetaTileEntity_AbstractMul protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addInfo("Transcending Dimensional Boundaries.") - .addInfo( - "Takes " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(max_efficiency_time_in_ticks / (3600 * 20)) - + EnumChatFormatting.GRAY - + " hours of continuous run time to fully breach dimensional") - .addInfo("boundaries and achieve maximum efficiency. This reduces fuel") - .addInfo( - "consumption by up to " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(100 * maximum_discount) - + "%" - + EnumChatFormatting.GRAY - + ". Supports overclocking beyond MAX voltage.") - .addInfo(AuthorColen).addSeparator().beginStructureBlock(33, 24, 33, false) - .addStructureInfo("DTPF Structure is too complex! See schematic for details.") - .addStructureInfo( - EnumChatFormatting.GOLD + "2,112" + EnumChatFormatting.GRAY + " Heating coils required.") - .addStructureInfo( - EnumChatFormatting.GOLD + "120" - + EnumChatFormatting.GRAY - + " Dimensional bridge blocks required.") - .addStructureInfo( - EnumChatFormatting.GOLD + "1,270" - + EnumChatFormatting.GRAY - + " Dimensional injection casings required.") - .addStructureInfo( - EnumChatFormatting.GOLD + "2,121" - + EnumChatFormatting.GRAY - + " Dimensionally transcendent casings required.") - .addStructureInfo("--------------------------------------------") - .addStructureInfo( - "Requires " + EnumChatFormatting.GOLD - + "1" - + EnumChatFormatting.GRAY - + "-" - + EnumChatFormatting.GOLD - + "2" - + EnumChatFormatting.GRAY - + " energy hatches or " - + EnumChatFormatting.GOLD - + "1" - + EnumChatFormatting.GRAY - + " TT energy hatch.") - .addStructureInfo( - "Requires " + EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " maintenance hatch.") - .addStructureInfo( - "Requires " + EnumChatFormatting.GOLD - + min_input_hatch - + EnumChatFormatting.GRAY - + "-" - + EnumChatFormatting.GOLD - + max_input_hatch - + EnumChatFormatting.GRAY - + " input hatches.") - .addStructureInfo( - "Requires " + EnumChatFormatting.GOLD - + min_output_hatch - + EnumChatFormatting.GRAY - + "-" - + EnumChatFormatting.GOLD - + max_output_hatch - + EnumChatFormatting.GRAY - + " output hatches.") - .addStructureInfo( - "Requires " + EnumChatFormatting.GOLD - + min_input_bus - + EnumChatFormatting.GRAY - + "-" - + EnumChatFormatting.GOLD - + max_input_bus - + EnumChatFormatting.GRAY - + " input busses.") - .addStructureInfo( - "Requires " + EnumChatFormatting.GOLD - + min_output_bus - + EnumChatFormatting.GRAY - + "-" - + EnumChatFormatting.GOLD - + max_input_bus - + EnumChatFormatting.GRAY - + " output busses.") - .addStructureInfo("--------------------------------------------").toolTipFinisher("Gregtech"); + .addInfo( + "Takes " + EnumChatFormatting.RED + + GT_Utility.formatNumbers(max_efficiency_time_in_ticks / (3600 * 20)) + + EnumChatFormatting.GRAY + + " hours of continuous run time to fully breach dimensional") + .addInfo("boundaries and achieve maximum efficiency. This reduces fuel") + .addInfo( + "consumption by up to " + EnumChatFormatting.RED + + GT_Utility.formatNumbers(100 * maximum_discount) + + "%" + + EnumChatFormatting.GRAY + + ". Supports overclocking beyond MAX voltage.") + .addInfo(AuthorColen) + .addSeparator() + .beginStructureBlock(33, 24, 33, false) + .addStructureInfo("DTPF Structure is too complex! See schematic for details.") + .addStructureInfo(EnumChatFormatting.GOLD + "2,112" + EnumChatFormatting.GRAY + " Heating coils required.") + .addStructureInfo( + EnumChatFormatting.GOLD + "120" + EnumChatFormatting.GRAY + " Dimensional bridge blocks required.") + .addStructureInfo( + EnumChatFormatting.GOLD + "1,270" + + EnumChatFormatting.GRAY + + " Dimensional injection casings required.") + .addStructureInfo( + EnumChatFormatting.GOLD + "2,121" + + EnumChatFormatting.GRAY + + " Dimensionally transcendent casings required.") + .addStructureInfo("--------------------------------------------") + .addStructureInfo( + "Requires " + EnumChatFormatting.GOLD + + "1" + + EnumChatFormatting.GRAY + + "-" + + EnumChatFormatting.GOLD + + "2" + + EnumChatFormatting.GRAY + + " energy hatches or " + + EnumChatFormatting.GOLD + + "1" + + EnumChatFormatting.GRAY + + " TT energy hatch.") + .addStructureInfo( + "Requires " + EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " maintenance hatch.") + .addStructureInfo( + "Requires " + EnumChatFormatting.GOLD + + min_input_hatch + + EnumChatFormatting.GRAY + + "-" + + EnumChatFormatting.GOLD + + max_input_hatch + + EnumChatFormatting.GRAY + + " input hatches.") + .addStructureInfo( + "Requires " + EnumChatFormatting.GOLD + + min_output_hatch + + EnumChatFormatting.GRAY + + "-" + + EnumChatFormatting.GOLD + + max_output_hatch + + EnumChatFormatting.GRAY + + " output hatches.") + .addStructureInfo( + "Requires " + EnumChatFormatting.GOLD + + min_input_bus + + EnumChatFormatting.GRAY + + "-" + + EnumChatFormatting.GOLD + + max_input_bus + + EnumChatFormatting.GRAY + + " input busses.") + .addStructureInfo( + "Requires " + EnumChatFormatting.GOLD + + min_output_bus + + EnumChatFormatting.GRAY + + "-" + + EnumChatFormatting.GOLD + + max_input_bus + + EnumChatFormatting.GRAY + + " output busses.") + .addStructureInfo("--------------------------------------------") + .toolTipFinisher("Gregtech"); return tt; } @@ -611,11 +636,20 @@ public class GT_MetaTileEntity_PlasmaForge extends GT_MetaTileEntity_AbstractMul public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - if (aActive) return new ITexture[] { casingTexturePages[0][DIM_BRIDGE_CASING], - TextureFactory.builder().addIcon(OVERLAY_DTPF_ON).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FUSION1_GLOW).extFacing().glow().build() }; - return new ITexture[] { casingTexturePages[0][DIM_BRIDGE_CASING], - TextureFactory.builder().addIcon(OVERLAY_DTPF_OFF).extFacing().build() }; + if (aActive) return new ITexture[] { casingTexturePages[0][DIM_BRIDGE_CASING], TextureFactory.builder() + .addIcon( + OVERLAY_DTPF_ON) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FUSION1_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { casingTexturePages[0][DIM_BRIDGE_CASING], TextureFactory.builder() + .addIcon(OVERLAY_DTPF_OFF) + .extFacing() + .build() }; } return new ITexture[] { casingTexturePages[0][DIM_BRIDGE_CASING] }; } @@ -658,8 +692,12 @@ public class GT_MetaTileEntity_PlasmaForge extends GT_MetaTileEntity_AbstractMul long tTotalEU = GT_ExoticEnergyInputHelper.getTotalEuMulti(getExoticAndNormalEnergyHatchList()); // Look up recipe. If not found it will return null. - GT_Recipe tRecipe_0 = GT_Recipe.GT_Recipe_Map.sPlasmaForgeRecipes - .findRecipe(getBaseMetaTileEntity(), false, tTotalEU, tFluids, tItems); + GT_Recipe tRecipe_0 = GT_Recipe.GT_Recipe_Map.sPlasmaForgeRecipes.findRecipe( + getBaseMetaTileEntity(), + false, + tTotalEU, + tFluids, + tItems); // Check if recipe found. if (tRecipe_0 == null) return false; @@ -808,8 +846,10 @@ public class GT_MetaTileEntity_PlasmaForge extends GT_MetaTileEntity_AbstractMul for (GT_MetaTileEntity_Hatch tHatch : mExoticEnergyHatches) { if (isValidMetaTileEntity(tHatch)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); + storedEnergy += tHatch.getBaseMetaTileEntity() + .getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity() + .getEUCapacity(); } } @@ -840,14 +880,14 @@ public class GT_MetaTileEntity_PlasmaForge extends GT_MetaTileEntity_AbstractMul StatCollector.translateToLocal("GT5U.multiblock.mei") + ": " + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers( - GT_ExoticEnergyInputHelper - .getAverageInputVoltageMulti(getExoticAndNormalEnergyHatchList())) + GT_ExoticEnergyInputHelper.getAverageInputVoltageMulti( + getExoticAndNormalEnergyHatchList())) + EnumChatFormatting.RESET + " EU/t(*" + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers( - GT_ExoticEnergyInputHelper - .getMaxWorkingInputAmpsMulti(getExoticAndNormalEnergyHatchList())) + GT_ExoticEnergyInputHelper.getMaxWorkingInputAmpsMulti( + getExoticAndNormalEnergyHatchList())) + EnumChatFormatting.RESET + "A) " + StatCollector.translateToLocal("GT5U.machines.tier") diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java index 67afa63df8..04811bb5d4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java @@ -52,16 +52,20 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn @Override protected IStructureDefinition<GT_MetaTileEntity_PrimitiveBlastFurnace> computeValue(Class<?> type) { return IStructureDefinition.<GT_MetaTileEntity_PrimitiveBlastFurnace>builder() - .addShape( - "main", - transpose( - new String[][] { { "ccc", "c-c", "ccc" }, { "ccc", "clc", "ccc" }, - { "c~c", "clc", "ccc" }, { "ccc", "ccc", "ccc" }, })) - .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMetaID()))) - .addElement( - 'l', - ofChain(isAir(), ofBlockAnyMeta(Blocks.lava, 1), ofBlockAnyMeta(Blocks.flowing_lava, 1))) - .build(); + .addShape( + "main", + transpose( + new String[][] { { "ccc", "c-c", "ccc" }, + { "ccc", "clc", "ccc" }, { "c~c", "clc", "ccc" }, + { "ccc", "ccc", "ccc" }, })) + .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMetaID()))) + .addElement( + 'l', + ofChain( + isAir(), + ofBlockAnyMeta(Blocks.lava, 1), + ofBlockAnyMeta(Blocks.flowing_lava, 1))) + .build(); } }; @@ -155,7 +159,8 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn @Override public boolean allowCoverOnSide(byte aSide, GT_ItemStack aCoverID) { - return (GregTech_API.getCoverBehaviorNew(aCoverID.toStack()).isSimpleCover()) + return (GregTech_API.getCoverBehaviorNew(aCoverID.toStack()) + .isSimpleCover()) && (super.allowCoverOnSide(aSide, aCoverID)); } @@ -201,7 +206,9 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn @Override public void setExtendedFacing(ExtendedFacing alignment) { - getBaseMetaTileEntity().setFrontFacing((byte) alignment.getDirection().ordinal()); + getBaseMetaTileEntity().setFrontFacing( + (byte) alignment.getDirection() + .ordinal()); } @Override @@ -210,18 +217,19 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn } private boolean checkMachine() { - return STRUCTURE_DEFINITION.get(this.getClass()).check( - this, - "main", - getBaseMetaTileEntity().getWorld(), - getExtendedFacing(), - getBaseMetaTileEntity().getXCoord(), - getBaseMetaTileEntity().getYCoord(), - getBaseMetaTileEntity().getZCoord(), - 1, - 2, - 0, - !mMachine); + return STRUCTURE_DEFINITION.get(this.getClass()) + .check( + this, + "main", + getBaseMetaTileEntity().getWorld(), + getExtendedFacing(), + getBaseMetaTileEntity().getXCoord(), + getBaseMetaTileEntity().getYCoord(), + getBaseMetaTileEntity().getZCoord(), + 1, + 2, + 0, + !mMachine); } protected abstract Block getCasingBlock(); @@ -240,12 +248,15 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive())) { new WorldSpawnedEventBuilder.ParticleEventBuilder().setMotion(0D, 0.3D, 0D) - .setIdentifier(ParticleFX.LARGE_SMOKE) - .setPosition( - lavaX + XSTR_INSTANCE.nextFloat(), - aBaseMetaTileEntity.getOffsetY(aBaseMetaTileEntity.getBackFacing(), 1), - lavaZ + XSTR_INSTANCE.nextFloat()) - .setWorld(getBaseMetaTileEntity().getWorld()).run(); + .setIdentifier(ParticleFX.LARGE_SMOKE) + .setPosition( + lavaX + XSTR_INSTANCE.nextFloat(), + aBaseMetaTileEntity.getOffsetY( + aBaseMetaTileEntity.getBackFacing(), + 1), + lavaZ + XSTR_INSTANCE.nextFloat()) + .setWorld(getBaseMetaTileEntity().getWorld()) + .run(); } if (aBaseMetaTileEntity.isServerSide()) { if (mUpdated) { @@ -265,7 +276,7 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn this.mMaxProgresstime = 0; GT_Mod.achievements.issueAchievement( aBaseMetaTileEntity.getWorld() - .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), + .getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "steel"); } } else if (aBaseMetaTileEntity.isAllowedToWork()) { @@ -282,22 +293,26 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn final short lavaY = aBaseMetaTileEntity.getYCoord(); if (aBaseMetaTileEntity.isActive()) { if (aBaseMetaTileEntity.getAir(lavaX, lavaY, lavaZ)) { - aBaseMetaTileEntity.getWorld().setBlock(lavaX, lavaY, lavaZ, Blocks.lava, 1, 2); + aBaseMetaTileEntity.getWorld() + .setBlock(lavaX, lavaY, lavaZ, Blocks.lava, 1, 2); this.mUpdate = 1; } if (aBaseMetaTileEntity.getAir(lavaX, lavaY + 1, lavaZ)) { - aBaseMetaTileEntity.getWorld().setBlock(lavaX, lavaY + 1, lavaZ, Blocks.lava, 1, 2); + aBaseMetaTileEntity.getWorld() + .setBlock(lavaX, lavaY + 1, lavaZ, Blocks.lava, 1, 2); this.mUpdate = 1; } } else { Block lowerLava = aBaseMetaTileEntity.getBlock(lavaX, lavaY, lavaZ); Block upperLava = aBaseMetaTileEntity.getBlock(lavaX, lavaY + 1, lavaZ); if (lowerLava == Blocks.lava) { - aBaseMetaTileEntity.getWorld().setBlock(lavaX, lavaY, lavaZ, Blocks.air, 0, 2); + aBaseMetaTileEntity.getWorld() + .setBlock(lavaX, lavaY, lavaZ, Blocks.air, 0, 2); this.mUpdate = 1; } if (upperLava == Blocks.lava) { - aBaseMetaTileEntity.getWorld().setBlock(lavaX, lavaY + 1, lavaZ, Blocks.air, 0, 2); + aBaseMetaTileEntity.getWorld() + .setBlock(lavaX, lavaY + 1, lavaZ, Blocks.air, 0, 2); this.mUpdate = 1; } } @@ -349,9 +364,13 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn } ParticleEventBuilder particleEventBuilder = (new ParticleEventBuilder()).setMotion(0D, 0D, 0D) - .setPosition(x, y, z).setWorld(getBaseMetaTileEntity().getWorld()); - particleEventBuilder.setIdentifier(ParticleFX.SMOKE).run(); - particleEventBuilder.setIdentifier(ParticleFX.FLAME).run(); + .setPosition(x, y, z) + .setWorld( + getBaseMetaTileEntity().getWorld()); + particleEventBuilder.setIdentifier(ParticleFX.SMOKE) + .run(); + particleEventBuilder.setIdentifier(ParticleFX.FLAME) + .run(); } } @@ -449,21 +468,22 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn @Override public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) { if (mMachine) return -1; - return STRUCTURE_DEFINITION.get(getClass()).survivalBuild( - this, - stackSize, - "main", - getBaseMetaTileEntity().getWorld(), - getExtendedFacing(), - getBaseMetaTileEntity().getXCoord(), - getBaseMetaTileEntity().getYCoord(), - getBaseMetaTileEntity().getZCoord(), - 1, - 2, - 0, - elementBudget, - env, - false); + return STRUCTURE_DEFINITION.get(getClass()) + .survivalBuild( + this, + stackSize, + "main", + getBaseMetaTileEntity().getWorld(), + getExtendedFacing(), + getBaseMetaTileEntity().getXCoord(), + getBaseMetaTileEntity().getYCoord(), + getBaseMetaTileEntity().getZCoord(), + 1, + 2, + 0, + elementBudget, + env, + false); } @Override @@ -473,19 +493,20 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn @Override public void construct(ItemStack stackSize, boolean hintsOnly) { - STRUCTURE_DEFINITION.get(getClass()).buildOrHints( - this, - stackSize, - "main", - getBaseMetaTileEntity().getWorld(), - getExtendedFacing(), - getBaseMetaTileEntity().getXCoord(), - getBaseMetaTileEntity().getYCoord(), - getBaseMetaTileEntity().getZCoord(), - 1, - 2, - 0, - hintsOnly); + STRUCTURE_DEFINITION.get(getClass()) + .buildOrHints( + this, + stackSize, + "main", + getBaseMetaTileEntity().getWorld(), + getExtendedFacing(), + getBaseMetaTileEntity().getXCoord(), + getBaseMetaTileEntity().getYCoord(), + getBaseMetaTileEntity().getZCoord(), + 1, + 2, + 0, + hintsOnly); } @Override @@ -496,39 +517,53 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new SlotWidget(inventoryHandler, 0).setBackground( - getGUITextureSet().getItemSlot(), - GT_UITextures.OVERLAY_SLOT_INGOT_STEAM.get(getSteamVariant())).setPos(33, 15)) - .widget( - new SlotWidget(inventoryHandler, 1).setBackground( - getGUITextureSet().getItemSlot(), - GT_UITextures.OVERLAY_SLOT_DUST_STEAM.get(getSteamVariant())).setPos(33, 33)) - .widget( - new SlotWidget(inventoryHandler, 2).setBackground( - getGUITextureSet().getItemSlot(), - GT_UITextures.OVERLAY_SLOT_FURNACE_STEAM.get(getSteamVariant())).setPos(33, 51)) - .widget( - new SlotWidget(inventoryHandler, 3).setAccess(true, false) - .setBackground( - getGUITextureSet().getItemSlot(), - GT_UITextures.OVERLAY_SLOT_INGOT_STEAM.get(getSteamVariant())) - .setPos(85, 24)) - .widget( - new SlotWidget(inventoryHandler, 4).setAccess(true, false) - .setBackground( - getGUITextureSet().getItemSlot(), - GT_UITextures.OVERLAY_SLOT_DUST_STEAM.get(getSteamVariant())) - .setPos(103, 24)) - .widget( - new SlotWidget(inventoryHandler, 5).setAccess(true, false) - .setBackground( - getGUITextureSet().getItemSlot(), - GT_UITextures.OVERLAY_SLOT_DUST_STEAM.get(getSteamVariant())) - .setPos(121, 24)) - .widget( - new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ARROW_2_STEAM.get(getSteamVariant()), 20) - .setProgress(() -> (float) mProgresstime / mMaxProgresstime) - .setNEITransferRect(getRecipeMap().mNEIName).setPos(58, 24).setSize(20, 18)); + new SlotWidget(inventoryHandler, 0) + .setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_INGOT_STEAM.get( + getSteamVariant())) + .setPos(33, 15)) + .widget( + new SlotWidget(inventoryHandler, 1) + .setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_DUST_STEAM.get( + getSteamVariant())) + .setPos(33, 33)) + .widget( + new SlotWidget(inventoryHandler, 2) + .setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_FURNACE_STEAM.get( + getSteamVariant())) + .setPos(33, 51)) + .widget( + new SlotWidget(inventoryHandler, 3).setAccess(true, false) + .setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_INGOT_STEAM.get( + getSteamVariant())) + .setPos(85, 24)) + .widget( + new SlotWidget(inventoryHandler, 4).setAccess(true, false) + .setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_DUST_STEAM.get( + getSteamVariant())) + .setPos(103, 24)) + .widget( + new SlotWidget(inventoryHandler, 5).setAccess(true, false) + .setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_DUST_STEAM.get( + getSteamVariant())) + .setPos(121, 24)) + .widget( + new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_ARROW_2_STEAM.get(getSteamVariant()), 20) + .setProgress(() -> (float) mProgresstime / mMaxProgresstime) + .setNEITransferRect(getRecipeMap().mNEIName) + .setPos(58, 24) + .setSize(20, 18)); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java index b988f1f7a5..d50b7debfa 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java @@ -86,18 +86,25 @@ public class GT_MetaTileEntity_ProcessingArray @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Processing Array").addInfo("Runs supplied machines as if placed in the world") - .addInfo("Place up to 64 singleblock GT machines into the controller") - .addInfo("Note that you still need to supply power to them all") - .addInfo("Use a screwdriver to enable separate input busses") - .addInfo("Use a wire cutter to disable UEV+ downtiering") - .addInfo("Doesn't work on certain machines, deal with it") - .addInfo("Use it if you hate GT++, or want even more speed later on").addSeparator() - .beginStructureBlock(3, 3, 3, true).addController("Front center") - .addCasingInfoRange("Robust Tungstensteel Machine Casing", 14, 24, false) - .addEnergyHatch("Any casing", 1).addMaintenanceHatch("Any casing", 1).addInputBus("Any casing", 1) - .addInputHatch("Any casing", 1).addOutputBus("Any casing", 1).addOutputHatch("Any casing", 1) - .toolTipFinisher("Gregtech"); + tt.addMachineType("Processing Array") + .addInfo("Runs supplied machines as if placed in the world") + .addInfo("Place up to 64 singleblock GT machines into the controller") + .addInfo("Note that you still need to supply power to them all") + .addInfo("Use a screwdriver to enable separate input busses") + .addInfo("Use a wire cutter to disable UEV+ downtiering") + .addInfo("Doesn't work on certain machines, deal with it") + .addInfo("Use it if you hate GT++, or want even more speed later on") + .addSeparator() + .beginStructureBlock(3, 3, 3, true) + .addController("Front center") + .addCasingInfoRange("Robust Tungstensteel Machine Casing", 14, 24, false) + .addEnergyHatch("Any casing", 1) + .addMaintenanceHatch("Any casing", 1) + .addInputBus("Any casing", 1) + .addInputHatch("Any casing", 1) + .addOutputBus("Any casing", 1) + .addOutputHatch("Any casing", 1) + .toolTipFinisher("Gregtech"); return tt; } @@ -111,13 +118,26 @@ public class GT_MetaTileEntity_ProcessingArray public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - if (aActive) return new ITexture[] { BlockIcons.casingTexturePages[0][48], - TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { BlockIcons.casingTexturePages[0][48], - TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_GLOW).extFacing().glow().build() }; + if (aActive) return new ITexture[] { BlockIcons.casingTexturePages[0][48], TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { BlockIcons.casingTexturePages[0][48], TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_PROCESSING_ARRAY) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_PROCESSING_ARRAY_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { Textures.BlockIcons.casingTexturePages[0][48] }; } @@ -135,8 +155,10 @@ public class GT_MetaTileEntity_ProcessingArray @Override public GT_Recipe_Map getRecipeMap() { if (isCorrectMachinePart(mInventory[1])) { - int length = mInventory[1].getUnlocalizedName().length(); - String aMachineName = mInventory[1].getUnlocalizedName().substring(17, length - 8); + int length = mInventory[1].getUnlocalizedName() + .length(); + String aMachineName = mInventory[1].getUnlocalizedName() + .substring(17, length - 8); return GT_ProcessingArray_Manager.giveRecipeMap(aMachineName); } return null; @@ -144,7 +166,8 @@ public class GT_MetaTileEntity_ProcessingArray @Override public boolean isCorrectMachinePart(ItemStack aStack) { - return aStack != null && aStack.getUnlocalizedName().startsWith("gt.blockmachines."); + return aStack != null && aStack.getUnlocalizedName() + .startsWith("gt.blockmachines."); } @Override @@ -166,8 +189,10 @@ public class GT_MetaTileEntity_ProcessingArray startRecipeProcessing(); boolean result = checkRecipe(mInventory[1]); if (result) { - int length = mInventory[1].getUnlocalizedName().length(); - String aMachineName = mInventory[1].getUnlocalizedName().substring(17, length - 8); + int length = mInventory[1].getUnlocalizedName() + .length(); + String aMachineName = mInventory[1].getUnlocalizedName() + .substring(17, length - 8); SoundResource sound = GT_ProcessingArray_Manager.getSoundResource(aMachineName); if (sound != null) { sendLoopStart((byte) sound.id); @@ -265,7 +290,7 @@ public class GT_MetaTileEntity_ProcessingArray // We're locked to a single recipe, but haven't built the recipe checker yet. // Build the checker on next successful recipe. tSingleRecipeCheckBuilder = GT_Single_Recipe_Check_Processing_Array.processingArrayBuilder(this) - .setBefore(tInputs, tFluids); + .setBefore(tInputs, tFluids); } boolean recipeLocked = false; @@ -277,8 +302,10 @@ public class GT_MetaTileEntity_ProcessingArray break; } else if (mLockedToSingleRecipe && !recipeLocked) { // We want to lock to a single run of the recipe. - mSingleRecipeCheck = tSingleRecipeCheckBuilder.setAfter(tInputs, tFluids).setRecipe(tRecipe) - .setRecipeAmperage(map.mAmperage).build(); + mSingleRecipeCheck = tSingleRecipeCheckBuilder.setAfter(tInputs, tFluids) + .setRecipe(tRecipe) + .setRecipeAmperage(map.mAmperage) + .build(); recipeLocked = true; } } @@ -324,13 +351,15 @@ public class GT_MetaTileEntity_ProcessingArray ItemStack[] tOut = new ItemStack[aRecipe.mOutputs.length]; for (int h = 0; h < aRecipe.mOutputs.length; h++) { if (aRecipe.getOutput(h) != null) { - tOut[h] = aRecipe.getOutput(h).copy(); + tOut[h] = aRecipe.getOutput(h) + .copy(); tOut[h].stackSize = 0; } } FluidStack[] tFOut = new FluidStack[aRecipe.mFluidOutputs.length]; for (int i = 0; i < aRecipe.mFluidOutputs.length; i++) - if (aRecipe.getFluidOutput(i) != null) tFOut[i] = aRecipe.getFluidOutput(i).copy(); + if (aRecipe.getFluidOutput(i) != null) tFOut[i] = aRecipe.getFluidOutput(i) + .copy(); for (int f = 0; f < tOut.length; f++) { if (aRecipe.mOutputs[f] != null && tOut[f] != null) { for (int g = 0; g < parallel * multiplier; g++) { @@ -348,9 +377,11 @@ public class GT_MetaTileEntity_ProcessingArray oNumber++; } this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); - this.mOutputItems = Arrays.stream(tOut).filter(Objects::nonNull) - .flatMap(GT_MetaTileEntity_ProcessingArray::splitOversizedStack).filter(is -> is.stackSize > 0) - .toArray(ItemStack[]::new); + this.mOutputItems = Arrays.stream(tOut) + .filter(Objects::nonNull) + .flatMap(GT_MetaTileEntity_ProcessingArray::splitOversizedStack) + .filter(is -> is.stackSize > 0) + .toArray(ItemStack[]::new); this.mOutputFluids = tFOut; updateSlots(); return true; @@ -473,8 +504,15 @@ public class GT_MetaTileEntity_ProcessingArray @Override protected List<IHatchElement<? super GT_MetaTileEntity_CubicMultiBlockBase<?>>> getAllowedHatches() { - return ImmutableList - .of(InputHatch, OutputHatch, InputBus, OutputBus, Muffler, Maintenance, Energy, ExoticEnergy); + return ImmutableList.of( + InputHatch, + OutputHatch, + InputBus, + OutputBus, + Muffler, + Maintenance, + Energy, + ExoticEnergy); } @Override @@ -494,8 +532,10 @@ public class GT_MetaTileEntity_ProcessingArray long maxEnergy = 0; for (GT_MetaTileEntity_Hatch tHatch : mExoticEnergyHatches) { if (isValidMetaTileEntity(tHatch)) { - storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU(); - maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity(); + storedEnergy += tHatch.getBaseMetaTileEntity() + .getStoredEU(); + maxEnergy += tHatch.getBaseMetaTileEntity() + .getEUCapacity(); } } @@ -536,8 +576,8 @@ public class GT_MetaTileEntity_ProcessingArray + ": " + EnumChatFormatting.YELLOW + VN[GT_Utility.getTier( - GT_ExoticEnergyInputHelper - .getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList()))] + GT_ExoticEnergyInputHelper.getMaxInputVoltageMulti( + getExoticAndNormalEnergyHatchList()))] + EnumChatFormatting.RESET, StatCollector.translateToLocal("GT5U.multiblock.problems") + ": " + EnumChatFormatting.RED @@ -649,19 +689,22 @@ public class GT_MetaTileEntity_ProcessingArray super.addUIWidgets(builder, buildContext); builder.widget( - new ButtonWidget().setOnClick((clickData, widget) -> downtierUEV = !downtierUEV).setPlayClickSound(true) - .setBackground(() -> { - List<UITexture> ret = new ArrayList<>(); - ret.add(GT_UITextures.BUTTON_STANDARD); - if (downtierUEV) { - ret.add(GT_UITextures.OVERLAY_BUTTON_DOWN_TIERING_ON); - } else { - ret.add(GT_UITextures.OVERLAY_BUTTON_DOWN_TIERING_OFF); - } - return ret.toArray(new IDrawable[0]); - }).setPos(80, 91).setSize(16, 16) - .addTooltip(StatCollector.translateToLocal("GT5U.gui.button.down_tier")) - .setTooltipShowUpDelay(TOOLTIP_DELAY)) - .widget(new FakeSyncWidget.BooleanSyncer(() -> downtierUEV, val -> downtierUEV = val)); + new ButtonWidget().setOnClick((clickData, widget) -> downtierUEV = !downtierUEV) + .setPlayClickSound(true) + .setBackground(() -> { + List<UITexture> ret = new ArrayList<>(); + ret.add(GT_UITextures.BUTTON_STANDARD); + if (downtierUEV) { + ret.add(GT_UITextures.OVERLAY_BUTTON_DOWN_TIERING_ON); + } else { + ret.add(GT_UITextures.OVERLAY_BUTTON_DOWN_TIERING_OFF); + } + return ret.toArray(new IDrawable[0]); + }) + .setPos(80, 91) + .setSize(16, 16) + .addTooltip(StatCollector.translateToLocal("GT5U.gui.button.down_tier")) + .setTooltipShowUpDelay(TOOLTIP_DELAY)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> downtierUEV, val -> downtierUEV = val)); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java index a1e85f9b25..2644f9f49e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java @@ -54,31 +54,49 @@ public class GT_MetaTileEntity_PyrolyseOven extends : ofBlock(GregTech_API.sBlockCasings1, 0); return StructureDefinition.<GT_MetaTileEntity_PyrolyseOven>builder() - .addShape( - "main", - transpose( - new String[][] { { "ccccc", "ctttc", "ctttc", "ctttc", "ccccc" }, - { "ccccc", "c---c", "c---c", "c---c", "ccccc" }, - { "ccccc", "c---c", "c---c", "c---c", "ccccc" }, - { "bb~bb", "bCCCb", "bCCCb", "bCCCb", "bbbbb" }, })) - .addElement('c', onElementPass(GT_MetaTileEntity_PyrolyseOven::onCasingAdded, tCasingElement)) - .addElement( - 'C', - ofCoil( - GT_MetaTileEntity_PyrolyseOven::setCoilLevel, - GT_MetaTileEntity_PyrolyseOven::getCoilLevel)) - .addElement( - 'b', - buildHatchAdder(GT_MetaTileEntity_PyrolyseOven.class) - .atLeast(OutputBus, OutputHatch, Energy, Maintenance).casingIndex(CASING_INDEX).dot(1) - .buildAndChain( - onElementPass(GT_MetaTileEntity_PyrolyseOven::onCasingAdded, tCasingElement))) - .addElement( - 't', - buildHatchAdder(GT_MetaTileEntity_PyrolyseOven.class).atLeast(InputBus, InputHatch, Muffler) - .casingIndex(CASING_INDEX).dot(1).buildAndChain( - onElementPass(GT_MetaTileEntity_PyrolyseOven::onCasingAdded, tCasingElement))) - .build(); + .addShape( + "main", + transpose( + new String[][] { { "ccccc", "ctttc", "ctttc", "ctttc", "ccccc" }, + { "ccccc", "c---c", "c---c", "c---c", "ccccc" }, + { "ccccc", "c---c", "c---c", "c---c", "ccccc" }, + { "bb~bb", "bCCCb", "bCCCb", "bCCCb", "bbbbb" }, })) + .addElement( + 'c', + onElementPass(GT_MetaTileEntity_PyrolyseOven::onCasingAdded, tCasingElement)) + .addElement( + 'C', + ofCoil( + GT_MetaTileEntity_PyrolyseOven::setCoilLevel, + GT_MetaTileEntity_PyrolyseOven::getCoilLevel)) + .addElement( + 'b', + buildHatchAdder( + GT_MetaTileEntity_PyrolyseOven.class).atLeast( + OutputBus, + OutputHatch, + Energy, + Maintenance) + .casingIndex(CASING_INDEX) + .dot(1) + .buildAndChain( + onElementPass( + GT_MetaTileEntity_PyrolyseOven::onCasingAdded, + tCasingElement))) + .addElement( + 't', + buildHatchAdder( + GT_MetaTileEntity_PyrolyseOven.class).atLeast( + InputBus, + InputHatch, + Muffler) + .casingIndex(CASING_INDEX) + .dot(1) + .buildAndChain( + onElementPass( + GT_MetaTileEntity_PyrolyseOven::onCasingAdded, + tCasingElement))) + .build(); } private int mCasingAmount; @@ -94,17 +112,26 @@ public class GT_MetaTileEntity_PyrolyseOven extends @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Coke Oven").addInfo("Controller block for the Pyrolyse Oven") - .addInfo("Industrial Charcoal producer").addInfo("Processing speed scales linearly with Coil tier:") - .addInfo("CuNi: 50%, FeAlCr: 100%, Ni4Cr: 150%, TPV: 200%, etc.") - .addInfo("EU/t is not affected by Coil tier").addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator().beginStructureBlock(5, 4, 5, true).addController("Front center") - .addCasingInfoRange("Pyrolyse Oven Casing", 60, 80, false) - .addOtherStructurePart("Heating Coils", "Center 3x1x3 of the bottom layer") - .addEnergyHatch("Any bottom layer casing", 1).addMaintenanceHatch("Any bottom layer casing", 1) - .addMufflerHatch("Center 3x1x3 area in top layer", 2).addInputBus("Center 3x1x3 area in top layer", 2) - .addInputHatch("Center 3x1x3 area in top layer", 2).addOutputBus("Any bottom layer casing", 1) - .addOutputHatch("Any bottom layer casing", 1).toolTipFinisher("Gregtech"); + tt.addMachineType("Coke Oven") + .addInfo("Controller block for the Pyrolyse Oven") + .addInfo("Industrial Charcoal producer") + .addInfo("Processing speed scales linearly with Coil tier:") + .addInfo("CuNi: 50%, FeAlCr: 100%, Ni4Cr: 150%, TPV: 200%, etc.") + .addInfo("EU/t is not affected by Coil tier") + .addPollutionAmount(getPollutionPerSecond(null)) + .addSeparator() + .beginStructureBlock(5, 4, 5, true) + .addController("Front center") + .addCasingInfoRange("Pyrolyse Oven Casing", 60, 80, false) + .addOtherStructurePart("Heating Coils", "Center 3x1x3 of the bottom layer") + .addEnergyHatch("Any bottom layer casing", 1) + .addMaintenanceHatch("Any bottom layer casing", 1) + .addMufflerHatch("Center 3x1x3 area in top layer", 2) + .addInputBus("Center 3x1x3 area in top layer", 2) + .addInputHatch("Center 3x1x3 area in top layer", 2) + .addOutputBus("Any bottom layer casing", 1) + .addOutputHatch("Any bottom layer casing", 1) + .toolTipFinisher("Gregtech"); return tt; } @@ -112,13 +139,26 @@ public class GT_MetaTileEntity_PyrolyseOven extends public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - if (aActive) return new ITexture[] { BlockIcons.casingTexturePages[8][66], - TextureFactory.builder().addIcon(OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE_GLOW).extFacing().glow() - .build() }; - return new ITexture[] { BlockIcons.casingTexturePages[8][66], - TextureFactory.builder().addIcon(OVERLAY_FRONT_PYROLYSE_OVEN).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_PYROLYSE_OVEN_GLOW).extFacing().glow().build() }; + if (aActive) return new ITexture[] { BlockIcons.casingTexturePages[8][66], TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { BlockIcons.casingTexturePages[8][66], TextureFactory.builder() + .addIcon( + OVERLAY_FRONT_PYROLYSE_OVEN) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_PYROLYSE_OVEN_GLOW) + .extFacing() + .glow() + .build() }; } return new ITexture[] { Textures.BlockIcons.casingTexturePages[8][66] }; } @@ -155,7 +195,8 @@ public class GT_MetaTileEntity_PyrolyseOven extends if (mLockedToSingleRecipe) { // We're locked to a single recipe, but haven't built the recipe checker yet. // Build the checker on next successful recipe. - tSingleRecipeCheckBuilder = GT_Single_Recipe_Check.builder(this).setBefore(); + tSingleRecipeCheckBuilder = GT_Single_Recipe_Check.builder(this) + .setBefore(); } tRecipe = GT_Recipe.GT_Recipe_Map.sPyrolyseRecipes.findRecipe( @@ -168,7 +209,9 @@ public class GT_MetaTileEntity_PyrolyseOven extends if (tRecipe == null || !tRecipe.isRecipeInputEqual(true, tFluids, tInputs)) return false; if (mLockedToSingleRecipe) { - mSingleRecipeCheck = tSingleRecipeCheckBuilder.setAfter().setRecipe(tRecipe).build(); + mSingleRecipeCheck = tSingleRecipeCheckBuilder.setAfter() + .setRecipe(tRecipe) + .build(); } } @@ -253,7 +296,8 @@ public class GT_MetaTileEntity_PyrolyseOven extends for (int zPos = tZ - 1; zPos <= tZ + 1; zPos++) { if (aBaseMetaTileEntity.getBlock(xPos, tY, zPos) == GregTech_API.sBlockCasings1 && aBaseMetaTileEntity.getMetaID(xPos, tY, zPos) == 13) { - aBaseMetaTileEntity.getWorld().setBlock(xPos, tY, zPos, GregTech_API.sBlockCasings5, 1, 3); + aBaseMetaTileEntity.getWorld() + .setBlock(xPos, tY, zPos, GregTech_API.sBlockCasings5, 1, 3); } } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_TranscendentPlasmaMixer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_TranscendentPlasmaMixer.java index 16c417e8de..e60e999e0c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_TranscendentPlasmaMixer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_TranscendentPlasmaMixer.java @@ -43,15 +43,36 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer { " CAC ", " ABA ", " ABA ", " ABA ", " ABA ", " ABA ", " CAC " } }; private static final String STRUCTURE_PIECE_MAIN = "MAIN"; - private static final IStructureDefinition<GT_MetaTileEntity_TranscendentPlasmaMixer> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_TranscendentPlasmaMixer>builder().addShape(STRUCTURE_PIECE_MAIN, structure) - .addElement( - 'B', - buildHatchAdder(GT_MetaTileEntity_TranscendentPlasmaMixer.class) - .atLeast(InputHatch, OutputHatch, InputBus, Maintenance).casingIndex(DIM_INJECTION_CASING) - .dot(1).buildAndChain(GregTech_API.sBlockCasings1, DIM_INJECTION_CASING)) - .addElement('A', ofBlock(GregTech_API.sBlockCasings1, DIM_TRANS_CASING)) - .addElement('C', ofBlock(GregTech_API.sBlockCasings1, DIM_BRIDGE_CASING)).build(); + private static final IStructureDefinition<GT_MetaTileEntity_TranscendentPlasmaMixer> STRUCTURE_DEFINITION = StructureDefinition.<GT_MetaTileEntity_TranscendentPlasmaMixer>builder() + .addShape( + STRUCTURE_PIECE_MAIN, + structure) + .addElement( + 'B', + buildHatchAdder( + GT_MetaTileEntity_TranscendentPlasmaMixer.class).atLeast( + InputHatch, + OutputHatch, + InputBus, + Maintenance) + .casingIndex( + DIM_INJECTION_CASING) + .dot( + 1) + .buildAndChain( + GregTech_API.sBlockCasings1, + DIM_INJECTION_CASING)) + .addElement( + 'A', + ofBlock( + GregTech_API.sBlockCasings1, + DIM_TRANS_CASING)) + .addElement( + 'C', + ofBlock( + GregTech_API.sBlockCasings1, + DIM_BRIDGE_CASING)) + .build(); private String ownerUUID; @@ -71,15 +92,20 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Transcendent Mixer").addInfo("Assisting in all your DTPF needs.") - .addInfo("This multiblock will run in parallel according to the circuit provided to the") - .addInfo("controller slot. E.g. 3x Circuit #16 = 48x parallel. All inputs will scale,") - .addInfo("except time. All EU is deducted from wireless EU networks only.").addInfo(AuthorColen) - .addInfo("Controller slot and circuit slot are separate.").addSeparator() - .beginStructureBlock(5, 7, 5, false).addStructureInfo(GOLD + "1+ " + GRAY + "Input Hatch") - .addStructureInfo(GOLD + "1+ " + GRAY + "Output Hatch") - .addStructureInfo(GOLD + "1+ " + GRAY + "Input Bus") - .addStructureInfo(GOLD + "1 " + GRAY + "Maintenance Hatch").toolTipFinisher("Gregtech"); + tt.addMachineType("Transcendent Mixer") + .addInfo("Assisting in all your DTPF needs.") + .addInfo("This multiblock will run in parallel according to the circuit provided to the") + .addInfo("controller slot. E.g. 3x Circuit #16 = 48x parallel. All inputs will scale,") + .addInfo("except time. All EU is deducted from wireless EU networks only.") + .addInfo(AuthorColen) + .addInfo("Controller slot and circuit slot are separate.") + .addSeparator() + .beginStructureBlock(5, 7, 5, false) + .addStructureInfo(GOLD + "1+ " + GRAY + "Input Hatch") + .addStructureInfo(GOLD + "1+ " + GRAY + "Output Hatch") + .addStructureInfo(GOLD + "1+ " + GRAY + "Input Bus") + .addStructureInfo(GOLD + "1 " + GRAY + "Maintenance Hatch") + .toolTipFinisher("Gregtech"); return tt; } @@ -92,11 +118,20 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - if (aActive) return new ITexture[] { casingTexturePages[0][DIM_TRANS_CASING], - TextureFactory.builder().addIcon(OVERLAY_DTPF_ON).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FUSION1_GLOW).extFacing().glow().build() }; - return new ITexture[] { casingTexturePages[0][DIM_TRANS_CASING], - TextureFactory.builder().addIcon(OVERLAY_DTPF_OFF).extFacing().build() }; + if (aActive) return new ITexture[] { casingTexturePages[0][DIM_TRANS_CASING], TextureFactory.builder() + .addIcon( + OVERLAY_DTPF_ON) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FUSION1_GLOW) + .extFacing() + .glow() + .build() }; + return new ITexture[] { casingTexturePages[0][DIM_TRANS_CASING], TextureFactory.builder() + .addIcon(OVERLAY_DTPF_OFF) + .extFacing() + .build() }; } return new ITexture[] { casingTexturePages[0][DIM_TRANS_CASING] }; @@ -121,8 +156,12 @@ public class GT_MetaTileEntity_TranscendentPlasmaMixer boolean processRecipe(ItemStack[] items, FluidStack[] fluids) { - GT_Recipe originalRecipe = GT_Recipe.GT_Recipe_Map.sTranscendentPlasmaMixerRecipes - .findRecipe(getBaseMetaTileEntity(), false, Long.MAX_VALUE, fluids, items); + GT_Recipe originalRecipe = GT_Recipe.GT_Recipe_Map.sTranscendentPlasmaMixerRecipes.findRecipe( + getBaseMetaTileEntity(), + false, + Long.MAX_VALUE, + fluids, + items); if (originalRecipe == null) { return false; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java index 463e00f7cd..eabdd8ee35 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java @@ -41,12 +41,20 @@ public class GT_MetaTileEntity_VacuumFreezer @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Vacuum Freezer").addInfo("Controller Block for the Vacuum Freezer") - .addInfo("Cools hot ingots and cells").addSeparator().beginStructureBlock(3, 3, 3, true) - .addController("Front center").addCasingInfoRange("Frost Proof Machine Casing", 16, 24, 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("Gregtech"); + tt.addMachineType("Vacuum Freezer") + .addInfo("Controller Block for the Vacuum Freezer") + .addInfo("Cools hot ingots and cells") + .addSeparator() + .beginStructureBlock(3, 3, 3, true) + .addController("Front center") + .addCasingInfoRange("Frost Proof Machine Casing", 16, 24, 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("Gregtech"); return tt; } @@ -56,15 +64,27 @@ public class GT_MetaTileEntity_VacuumFreezer ITexture[] rTexture; if (aSide == aFacing) { 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/gregtech/common/tileentities/machines/multiblock/MultiBlock_CokeOven.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_CokeOven.java index b69909d9fb..4114ee5564 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_CokeOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_CokeOven.java @@ -78,9 +78,12 @@ public class MultiBlock_CokeOven extends MultiBlockController<MultiBlock_CokeOve @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Coke Oven").addInfo("Used for charcoal").beginStructureBlock(3, 3, 3, true) - .addCasingInfoExactly("Coke Oven Bricks", 25, false) - .addPollutionAmount(POLLUTION_LOGIC.getPollutionAmount()).toolTipFinisher(GT_Values.AuthorBlueWeabo); + tt.addMachineType("Coke Oven") + .addInfo("Used for charcoal") + .beginStructureBlock(3, 3, 3, true) + .addCasingInfoExactly("Coke Oven Bricks", 25, false) + .addPollutionAmount(POLLUTION_LOGIC.getPollutionAmount()) + .toolTipFinisher(GT_Values.AuthorBlueWeabo); return tt; } @@ -92,13 +95,19 @@ public class MultiBlock_CokeOven extends MultiBlockController<MultiBlock_CokeOve @Override public IStructureDefinition<MultiBlock_CokeOven> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<MultiBlock_CokeOven>builder().addShape( - MAIN, - new String[][] { { "AAA", "A~A", "AAA" }, { "AAA", "A-A", "AAA" }, { "AAA", "AAA", "AAA" } }) - .addElement( - 'A', - addMultiTileCasing("gt.multitileentity.casings", getCasingMeta(), ITEM_IN | ITEM_OUT)) - .build(); + STRUCTURE_DEFINITION = StructureDefinition.<MultiBlock_CokeOven>builder() + .addShape( + MAIN, + new String[][] { { "AAA", "A~A", "AAA" }, + { "AAA", "A-A", "AAA" }, + { "AAA", "AAA", "AAA" } }) + .addElement( + 'A', + addMultiTileCasing( + "gt.multitileentity.casings", + getCasingMeta(), + ITEM_IN | ITEM_OUT)) + .build(); } return STRUCTURE_DEFINITION; } @@ -110,8 +119,12 @@ public class MultiBlock_CokeOven extends MultiBlockController<MultiBlock_CokeOve @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget(new SlotWidget(inputInventory, 0).setPos(18, 18).setSize(18, 18)); - builder.widget(new SlotWidget(outputInventory, 0).setPos(36, 36).setSize(18, 18)); + builder.widget( + new SlotWidget(inputInventory, 0).setPos(18, 18) + .setSize(18, 18)); + builder.widget( + new SlotWidget(outputInventory, 0).setPos(36, 36) + .setSize(18, 18)); builder.widget(createButtons()); } @@ -123,8 +136,9 @@ public class MultiBlock_CokeOven extends MultiBlockController<MultiBlock_CokeOve if (NetworkUtils.isClient()) { final FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; // noinspection unchecked - final List<String> titleLines = fontRenderer - .listFormattedStringToWidth(title, getGUIWidth() - (TAB_PADDING + TITLE_PADDING) * 2); + final List<String> titleLines = fontRenderer.listFormattedStringToWidth( + title, + getGUIWidth() - (TAB_PADDING + TITLE_PADDING) * 2); titleWidth = titleLines.size() > 1 ? getGUIWidth() - (TAB_PADDING + TITLE_PADDING) * 2 : fontRenderer.getStringWidth(title); // noinspection PointlessArithmeticExpression @@ -133,17 +147,21 @@ public class MultiBlock_CokeOven extends MultiBlockController<MultiBlock_CokeOve final DrawableWidget tab = new DrawableWidget(); final TextWidget text = new TextWidget(title).setDefaultColor(getTitleColor()) - .setTextAlignment(Alignment.CenterLeft).setMaxWidth(titleWidth); + .setTextAlignment(Alignment.CenterLeft) + .setMaxWidth(titleWidth); if (GT_Mod.gregtechproxy.mTitleTabStyle == 1) { - tab.setDrawable(getGUITextureSet().getTitleTabAngular()).setPos(0, -(titleHeight + TAB_PADDING) + 1) - .setSize(getGUIWidth(), titleHeight + TAB_PADDING * 2); + tab.setDrawable(getGUITextureSet().getTitleTabAngular()) + .setPos(0, -(titleHeight + TAB_PADDING) + 1) + .setSize(getGUIWidth(), titleHeight + TAB_PADDING * 2); text.setPos(TAB_PADDING + TITLE_PADDING, -titleHeight + TAB_PADDING); } else { - tab.setDrawable(getGUITextureSet().getTitleTabDark()).setPos(0, -(titleHeight + TAB_PADDING * 2) + 1) - .setSize(titleWidth + (TAB_PADDING + TITLE_PADDING) * 2, titleHeight + TAB_PADDING * 2 - 1); + tab.setDrawable(getGUITextureSet().getTitleTabDark()) + .setPos(0, -(titleHeight + TAB_PADDING * 2) + 1) + .setSize(titleWidth + (TAB_PADDING + TITLE_PADDING) * 2, titleHeight + TAB_PADDING * 2 - 1); text.setPos(TAB_PADDING + TITLE_PADDING, -titleHeight); } - builder.widget(tab).widget(text); + builder.widget(tab) + .widget(text); } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_Macerator.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_Macerator.java index 3c0619e667..acd611ab12 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_Macerator.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/MultiBlock_Macerator.java @@ -50,33 +50,67 @@ public class MultiBlock_Macerator extends MultiBlock_Stackable<MultiBlock_Macera public IStructureDefinition<MultiBlock_Macerator> getStructureDefinition() { if (STRUCTURE_DEFINITION == null) { STRUCTURE_DEFINITION = StructureDefinition.<MultiBlock_Macerator>builder() - .addShape( - STACKABLE_TOP, - transpose(new String[][] { { " CCC ", "CCCCC", "CCCCC", "CCCCC", " CCC " }, })) - .addShape( - STACKABLE_MIDDLE, - transpose(new String[][] { { " BBB ", " B---B ", "DC---CD", " B---B ", " BBB " }, })) - .addShape( - STACKABLE_BOTTOM, - transpose(new String[][] { { " G~F ", "AAAAA", "AAAAA", "AAAAA", " AAA " }, })) - .addElement( - 'A', - ofChain(addMultiTileCasing("gt.multitileentity.casings", getCasingMeta(), ENERGY_IN))) - .addElement( - 'B', - ofChain( - addMultiTileCasing( - "gt.multitileentity.casings", - getCasingMeta(), - FLUID_IN | ITEM_IN | FLUID_OUT | ITEM_OUT))) - .addElement('C', addMultiTileCasing("gt.multitileentity.casings", getCasingMeta(), NOTHING)) - .addElement('D', addMultiTileCasing("gt.multitileentity.casings", getCasingMeta(), NOTHING)) - .addElement( - 'F', - ofChain( - addMultiTileCasing("gt.multitileentity.casings", 20001, NOTHING), - addMultiTileCasing("gt.multitileentity.casings", 20002, NOTHING))) - .addElement('G', addMultiTileCasing("gt.multitileentity.casings", 10000, NOTHING)).build(); + .addShape( + STACKABLE_TOP, + transpose( + new String[][] { { " CCC ", "CCCCC", "CCCCC", + "CCCCC", " CCC " }, })) + .addShape( + STACKABLE_MIDDLE, + transpose( + new String[][] { { " BBB ", " B---B ", + "DC---CD", " B---B ", " BBB " }, })) + .addShape( + STACKABLE_BOTTOM, + transpose( + new String[][] { { " G~F ", "AAAAA", "AAAAA", + "AAAAA", " AAA " }, })) + .addElement( + 'A', + ofChain( + addMultiTileCasing( + "gt.multitileentity.casings", + getCasingMeta(), + ENERGY_IN))) + .addElement( + 'B', + ofChain( + addMultiTileCasing( + "gt.multitileentity.casings", + getCasingMeta(), + FLUID_IN | ITEM_IN + | FLUID_OUT + | ITEM_OUT))) + .addElement( + 'C', + addMultiTileCasing( + "gt.multitileentity.casings", + getCasingMeta(), + NOTHING)) + .addElement( + 'D', + addMultiTileCasing( + "gt.multitileentity.casings", + getCasingMeta(), + NOTHING)) + .addElement( + 'F', + ofChain( + addMultiTileCasing( + "gt.multitileentity.casings", + 20001, + NOTHING), + addMultiTileCasing( + "gt.multitileentity.casings", + 20002, + NOTHING))) + .addElement( + 'G', + addMultiTileCasing( + "gt.multitileentity.casings", + 10000, + NOTHING)) + .build(); } return STRUCTURE_DEFINITION; } @@ -99,17 +133,20 @@ public class MultiBlock_Macerator extends MultiBlock_Stackable<MultiBlock_Macera @Override protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType("Macerator").addInfo("Controller for the Macerator").addSeparator() - .beginVariableStructureBlock(7, 9, 2 + getMinStacks(), 2 + getMaxStacks(), 7, 9, true) - .addController("Bottom Front Center").addCasingInfoExactly("Test Casing", 60, false) - .addEnergyHatch("Any bottom layer casing") - .addInputHatch("Any non-optional external facing casing on the stacks") - .addInputBus("Any non-optional external facing casing on the stacks") - .addOutputHatch("Any non-optional external facing casing on the stacks") - .addOutputBus("Any non-optional external facing casing on the stacks") - .addStructureInfo( - String.format("Stackable middle stacks between %d-%d time(s).", getMinStacks(), getMaxStacks())) - .toolTipFinisher("Wildcard"); + tt.addMachineType("Macerator") + .addInfo("Controller for the Macerator") + .addSeparator() + .beginVariableStructureBlock(7, 9, 2 + getMinStacks(), 2 + getMaxStacks(), 7, 9, true) + .addController("Bottom Front Center") + .addCasingInfoExactly("Test Casing", 60, false) + .addEnergyHatch("Any bottom layer casing") + .addInputHatch("Any non-optional external facing casing on the stacks") + .addInputBus("Any non-optional external facing casing on the stacks") + .addOutputHatch("Any non-optional external facing casing on the stacks") + .addOutputBus("Any non-optional external facing casing on the stacks") + .addStructureInfo( + String.format("Stackable middle stacks between %d-%d time(s).", getMinStacks(), getMaxStacks())) + .toolTipFinisher("Wildcard"); return tt; } @@ -151,17 +188,25 @@ public class MultiBlock_Macerator extends MultiBlock_Stackable<MultiBlock_Macera // Base Texture MACHINE_CASINGS[1][0], // Active - isActive() - ? TextureFactory.builder().addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE).extFacing() - .build() - : TextureFactory.builder().addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE).extFacing() - .build(), + isActive() ? TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE) + .extFacing() + .build() + : TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE) + .extFacing() + .build(), // Active Glow - isActive() - ? TextureFactory.builder().addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE_GLOW) - .extFacing().glow().build() - : TextureFactory.builder().addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_GLOW).extFacing() - .glow().build() }; + isActive() ? TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE_GLOW) + .extFacing() + .glow() + .build() + : TextureFactory.builder() + .addIcon(OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_GLOW) + .extFacing() + .glow() + .build() }; } // Base Texture return new ITexture[] { MACHINE_CASINGS[1][0] }; @@ -177,7 +222,8 @@ public class MultiBlock_Macerator extends MultiBlock_Stackable<MultiBlock_Macera } return false; } else { - ItemStack[] tItemInputs = getInventoriesForInput().getStacks().toArray(new ItemStack[0]); + ItemStack[] tItemInputs = getInventoriesForInput().getStacks() + .toArray(new ItemStack[0]); return processRecipe(tItemInputs, null); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java index 4f9677eda6..bfbe56a665 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java @@ -55,57 +55,81 @@ public class GT_MetaTileEntity_AlloySmelter_Bronze extends GT_MetaTileEntity_Bas @Override public ITexture[] getSideFacingActive(byte aColor) { - return new ITexture[] { super.getSideFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingActive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSideFacingInactive(byte aColor) { - return new ITexture[] { super.getSideFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_ALLOY_SMELTER), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_ALLOY_SMELTER_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_ALLOY_SMELTER), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_ALLOY_SMELTER_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingActive(byte aColor) { - return new ITexture[] { super.getFrontFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_ALLOY_SMELTER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_ALLOY_SMELTER_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingActive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_ALLOY_SMELTER_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_ALLOY_SMELTER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingInactive(byte aColor) { - return new ITexture[] { super.getFrontFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_ALLOY_SMELTER), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_ALLOY_SMELTER_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_ALLOY_SMELTER), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_ALLOY_SMELTER_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingActive(byte aColor) { - return new ITexture[] { super.getTopFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_TOP_STEAM_ALLOY_SMELTER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_ALLOY_SMELTER_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getTopFacingActive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_ALLOY_SMELTER_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_ALLOY_SMELTER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingInactive(byte aColor) { - return new ITexture[] { super.getTopFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_TOP_STEAM_ALLOY_SMELTER), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_ALLOY_SMELTER_GLOW).glow().build() }; + return new ITexture[] { + super.getTopFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_ALLOY_SMELTER), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_ALLOY_SMELTER_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingActive(byte aColor) { - return new ITexture[] { super.getBottomFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingActive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingInactive(byte aColor) { - return new ITexture[] { super.getBottomFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_GLOW) + .glow() + .build() }; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java index ca08d647a1..c84e6a05d5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java @@ -55,57 +55,81 @@ public class GT_MetaTileEntity_AlloySmelter_Steel extends GT_MetaTileEntity_Basi @Override public ITexture[] getSideFacingActive(byte aColor) { - return new ITexture[] { super.getSideFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingActive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSideFacingInactive(byte aColor) { - return new ITexture[] { super.getSideFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_ALLOY_SMELTER), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_ALLOY_SMELTER_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_ALLOY_SMELTER), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_ALLOY_SMELTER_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingActive(byte aColor) { - return new ITexture[] { super.getFrontFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_ALLOY_SMELTER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_ALLOY_SMELTER_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingActive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_ALLOY_SMELTER_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_ALLOY_SMELTER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingInactive(byte aColor) { - return new ITexture[] { super.getFrontFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_ALLOY_SMELTER), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_ALLOY_SMELTER_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_ALLOY_SMELTER), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_ALLOY_SMELTER_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingActive(byte aColor) { - return new ITexture[] { super.getTopFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_TOP_STEAM_ALLOY_SMELTER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_ALLOY_SMELTER_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getTopFacingActive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_ALLOY_SMELTER_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_ALLOY_SMELTER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingInactive(byte aColor) { - return new ITexture[] { super.getTopFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_TOP_STEAM_ALLOY_SMELTER), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_ALLOY_SMELTER_GLOW).glow().build() }; + return new ITexture[] { + super.getTopFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_ALLOY_SMELTER), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_ALLOY_SMELTER_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingActive(byte aColor) { - return new ITexture[] { super.getBottomFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingActive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingInactive(byte aColor) { - return new ITexture[] { super.getBottomFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_GLOW) + .glow() + .build() }; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java index 3f7eed2c99..26a8e1056c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java @@ -50,56 +50,80 @@ public class GT_MetaTileEntity_Compressor_Bronze extends GT_MetaTileEntity_Basic @Override public ITexture[] getSideFacingActive(byte aColor) { - return new ITexture[] { super.getSideFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingActive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSideFacingInactive(byte aColor) { - return new ITexture[] { super.getSideFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_COMPRESSOR), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_COMPRESSOR_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_COMPRESSOR), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_COMPRESSOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingActive(byte aColor) { - return new ITexture[] { super.getFrontFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingActive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingInactive(byte aColor) { - return new ITexture[] { super.getFrontFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_COMPRESSOR), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_COMPRESSOR_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_COMPRESSOR), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_COMPRESSOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingActive(byte aColor) { - return new ITexture[] { super.getTopFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_TOP_STEAM_COMPRESSOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_COMPRESSOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getTopFacingActive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_COMPRESSOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_COMPRESSOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingInactive(byte aColor) { return new ITexture[] { super.getTopFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_COMPRESSOR), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_COMPRESSOR_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_COMPRESSOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingActive(byte aColor) { - return new ITexture[] { super.getBottomFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_COMPRESSOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_COMPRESSOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingActive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_COMPRESSOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_COMPRESSOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingInactive(byte aColor) { - return new ITexture[] { super.getBottomFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_COMPRESSOR), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_COMPRESSOR_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_COMPRESSOR), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_COMPRESSOR_GLOW) + .glow() + .build() }; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java index 3f6e318284..060826b966 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java @@ -50,56 +50,80 @@ public class GT_MetaTileEntity_Compressor_Steel extends GT_MetaTileEntity_BasicM @Override public ITexture[] getSideFacingActive(byte aColor) { - return new ITexture[] { super.getSideFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingActive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSideFacingInactive(byte aColor) { - return new ITexture[] { super.getSideFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_COMPRESSOR), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_COMPRESSOR_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_COMPRESSOR), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_COMPRESSOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingActive(byte aColor) { - return new ITexture[] { super.getFrontFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingActive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingInactive(byte aColor) { - return new ITexture[] { super.getFrontFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_COMPRESSOR), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_COMPRESSOR_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_COMPRESSOR), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_COMPRESSOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingActive(byte aColor) { - return new ITexture[] { super.getTopFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_TOP_STEAM_COMPRESSOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_COMPRESSOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getTopFacingActive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_COMPRESSOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_COMPRESSOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingInactive(byte aColor) { return new ITexture[] { super.getTopFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_COMPRESSOR), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_COMPRESSOR_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_COMPRESSOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingActive(byte aColor) { - return new ITexture[] { super.getBottomFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_COMPRESSOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_COMPRESSOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingActive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_COMPRESSOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_COMPRESSOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingInactive(byte aColor) { - return new ITexture[] { super.getBottomFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_COMPRESSOR), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_COMPRESSOR_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_COMPRESSOR), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_COMPRESSOR_GLOW) + .glow() + .build() }; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java index d9597663da..1f03faca48 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java @@ -50,55 +50,79 @@ public class GT_MetaTileEntity_Extractor_Bronze extends GT_MetaTileEntity_BasicM @Override public ITexture[] getSideFacingActive(byte aColor) { - return new ITexture[] { super.getSideFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingActive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSideFacingInactive(byte aColor) { return new ITexture[] { super.getSideFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_EXTRACTOR), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_EXTRACTOR_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_EXTRACTOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingActive(byte aColor) { - return new ITexture[] { super.getFrontFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingActive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingInactive(byte aColor) { - return new ITexture[] { super.getFrontFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_EXTRACTOR), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_EXTRACTOR_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_EXTRACTOR), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_EXTRACTOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingActive(byte aColor) { - return new ITexture[] { super.getTopFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_TOP_STEAM_EXTRACTOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_EXTRACTOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getTopFacingActive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_EXTRACTOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_EXTRACTOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingInactive(byte aColor) { return new ITexture[] { super.getTopFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_EXTRACTOR), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_EXTRACTOR_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_EXTRACTOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingActive(byte aColor) { - return new ITexture[] { super.getBottomFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingActive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingInactive(byte aColor) { - return new ITexture[] { super.getBottomFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_EXTRACTOR), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_EXTRACTOR_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_EXTRACTOR), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_EXTRACTOR_GLOW) + .glow() + .build() }; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java index f90e0044bd..83f2899259 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java @@ -50,55 +50,79 @@ public class GT_MetaTileEntity_Extractor_Steel extends GT_MetaTileEntity_BasicMa @Override public ITexture[] getSideFacingActive(byte aColor) { - return new ITexture[] { super.getSideFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingActive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSideFacingInactive(byte aColor) { return new ITexture[] { super.getSideFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_EXTRACTOR), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_EXTRACTOR_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_EXTRACTOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingActive(byte aColor) { - return new ITexture[] { super.getFrontFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingActive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingInactive(byte aColor) { - return new ITexture[] { super.getFrontFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_EXTRACTOR), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_EXTRACTOR_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_EXTRACTOR), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_EXTRACTOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingActive(byte aColor) { - return new ITexture[] { super.getTopFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_TOP_STEAM_EXTRACTOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_EXTRACTOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getTopFacingActive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_EXTRACTOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_EXTRACTOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingInactive(byte aColor) { return new ITexture[] { super.getTopFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_EXTRACTOR), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_EXTRACTOR_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_EXTRACTOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingActive(byte aColor) { - return new ITexture[] { super.getBottomFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingActive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingInactive(byte aColor) { - return new ITexture[] { super.getBottomFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_EXTRACTOR), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_EXTRACTOR_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_EXTRACTOR), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_EXTRACTOR_GLOW) + .glow() + .build() }; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java index 3f25499dd8..d648c6a41d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java @@ -58,54 +58,77 @@ public class GT_MetaTileEntity_ForgeHammer_Bronze extends GT_MetaTileEntity_Basi @Override public ITexture[] getSideFacingActive(byte aColor) { - return new ITexture[] { super.getSideFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_HAMMER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_HAMMER_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingActive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_HAMMER_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_HAMMER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSideFacingInactive(byte aColor) { return new ITexture[] { super.getSideFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_HAMMER), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_HAMMER_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_HAMMER_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingActive(byte aColor) { - return new ITexture[] { super.getFrontFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_HAMMER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_HAMMER_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingActive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_HAMMER_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_HAMMER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingInactive(byte aColor) { return new ITexture[] { super.getFrontFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_HAMMER), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_HAMMER_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_HAMMER_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingActive(byte aColor) { return new ITexture[] { super.getTopFacingActive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_HAMMER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_HAMMER_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_HAMMER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingInactive(byte aColor) { return new ITexture[] { super.getTopFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_HAMMER), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_HAMMER_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_HAMMER_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingActive(byte aColor) { - return new ITexture[] { super.getBottomFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingActive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingInactive(byte aColor) { return new ITexture[] { super.getBottomFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_HAMMER), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_HAMMER_GLOW).glow().build() }; + TextureFactory.of(OVERLAY_BOTTOM_STEAM_HAMMER), TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_HAMMER_GLOW) + .glow() + .build() }; } /** @@ -159,8 +182,11 @@ public class GT_MetaTileEntity_ForgeHammer_Bronze extends GT_MetaTileEntity_Basi } ParticleEventBuilder particleEventBuilder = (new ParticleEventBuilder()).setMotion(mX, 0, mZ) - .setPosition(x, y, z).setWorld(getBaseMetaTileEntity().getWorld()); - particleEventBuilder.setIdentifier(ParticleFX.LAVA).run(); + .setPosition(x, y, z) + .setWorld( + getBaseMetaTileEntity().getWorld()); + particleEventBuilder.setIdentifier(ParticleFX.LAVA) + .run(); } } } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java index acfd8e6b28..22292c814b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java @@ -58,54 +58,77 @@ public class GT_MetaTileEntity_ForgeHammer_Steel extends GT_MetaTileEntity_Basic @Override public ITexture[] getSideFacingActive(byte aColor) { - return new ITexture[] { super.getSideFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_HAMMER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_HAMMER_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingActive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_HAMMER_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_HAMMER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSideFacingInactive(byte aColor) { return new ITexture[] { super.getSideFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_HAMMER), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_HAMMER_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_HAMMER_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingActive(byte aColor) { - return new ITexture[] { super.getFrontFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_HAMMER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_HAMMER_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingActive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_HAMMER_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_HAMMER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingInactive(byte aColor) { return new ITexture[] { super.getFrontFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_HAMMER), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_HAMMER_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_HAMMER_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingActive(byte aColor) { return new ITexture[] { super.getTopFacingActive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_HAMMER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_HAMMER_ACTIVE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_HAMMER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingInactive(byte aColor) { return new ITexture[] { super.getTopFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_HAMMER), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_HAMMER_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_HAMMER_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingActive(byte aColor) { - return new ITexture[] { super.getBottomFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingActive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingInactive(byte aColor) { return new ITexture[] { super.getBottomFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_HAMMER), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_HAMMER_GLOW).glow().build() }; + TextureFactory.of(OVERLAY_BOTTOM_STEAM_HAMMER), TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_HAMMER_GLOW) + .glow() + .build() }; } /** @@ -159,8 +182,11 @@ public class GT_MetaTileEntity_ForgeHammer_Steel extends GT_MetaTileEntity_Basic } ParticleEventBuilder particleEventBuilder = (new ParticleEventBuilder()).setMotion(mX, 0, mZ) - .setPosition(x, y, z).setWorld(getBaseMetaTileEntity().getWorld()); - particleEventBuilder.setIdentifier(ParticleFX.LAVA).run(); + .setPosition(x, y, z) + .setWorld( + getBaseMetaTileEntity().getWorld()); + particleEventBuilder.setIdentifier(ParticleFX.LAVA) + .run(); } } } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java index e102d797e8..deb0d6c2d8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java @@ -75,48 +75,69 @@ public class GT_MetaTileEntity_Furnace_Bronze extends GT_MetaTileEntity_BasicMac @Override public ITexture[] getSideFacingActive(byte aColor) { - return new ITexture[] { super.getSideFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_FURNACE_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_FURNACE_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingActive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_FURNACE_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_FURNACE_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSideFacingInactive(byte aColor) { return new ITexture[] { super.getSideFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_FURNACE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_FURNACE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_FURNACE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingActive(byte aColor) { - return new ITexture[] { super.getFrontFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_FURNACE_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_FURNACE_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingActive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_FURNACE_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_FURNACE_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingInactive(byte aColor) { return new ITexture[] { super.getFrontFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_FURNACE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_FURNACE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_FURNACE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingActive(byte aColor) { - return new ITexture[] { super.getTopFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_TOP_STEAM_FURNACE_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getTopFacingActive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_FURNACE_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingInactive(byte aColor) { return new ITexture[] { super.getTopFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_FURNACE), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_FURNACE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_FURNACE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingActive(byte aColor) { - return new ITexture[] { super.getBottomFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingActive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE_GLOW) + .glow() + .build() }; } @Override @@ -124,6 +145,9 @@ public class GT_MetaTileEntity_Furnace_Bronze extends GT_MetaTileEntity_BasicMac return new ITexture[] { super.getBottomFacingInactive(aColor)[0], TextureFactory.of( TextureFactory.of(OVERLAY_BOTTOM_STEAM_FURNACE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_GLOW).glow().build()) }; + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_GLOW) + .glow() + .build()) }; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java index 8d0414103e..285e85943f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java @@ -75,54 +75,78 @@ public class GT_MetaTileEntity_Furnace_Steel extends GT_MetaTileEntity_BasicMach @Override public ITexture[] getSideFacingActive(byte aColor) { - return new ITexture[] { super.getSideFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_FURNACE_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_FURNACE_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingActive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_FURNACE_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_FURNACE_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSideFacingInactive(byte aColor) { return new ITexture[] { super.getSideFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_FURNACE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_FURNACE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_FURNACE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingActive(byte aColor) { - return new ITexture[] { super.getFrontFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_FURNACE_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_FURNACE_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingActive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_FURNACE_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_FURNACE_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingInactive(byte aColor) { return new ITexture[] { super.getFrontFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_FURNACE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_FURNACE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_FURNACE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingActive(byte aColor) { - return new ITexture[] { super.getTopFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_TOP_STEAM_FURNACE_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getTopFacingActive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_FURNACE_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingInactive(byte aColor) { return new ITexture[] { super.getTopFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_FURNACE), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_FURNACE_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_FURNACE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingActive(byte aColor) { - return new ITexture[] { super.getBottomFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingActive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingInactive(byte aColor) { - return new ITexture[] { super.getBottomFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_FURNACE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_FURNACE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_FURNACE_GLOW) + .glow() + .build() }; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java index def8af9fe3..936b75bc8c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java @@ -50,12 +50,17 @@ public class GT_MetaTileEntity_Macerator_Bronze extends GT_MetaTileEntity_BasicM && aBaseMetaTileEntity.getCoverIDAtSide(topFacing) == 0 && !aBaseMetaTileEntity.getOpacityAtSide(topFacing)) { - new ParticleEventBuilder().setMotion(0.0D, 0.0D, 0.0D).setIdentifier(ParticleFX.SMOKE) - .setPosition( - aBaseMetaTileEntity.getXCoord() + 0.8F - XSTR_INSTANCE.nextFloat() * 0.6F, - aBaseMetaTileEntity.getYCoord() + 0.9F + XSTR_INSTANCE.nextFloat() * 0.2F, - aBaseMetaTileEntity.getZCoord() + 0.8F - XSTR_INSTANCE.nextFloat() * 0.6F) - .setWorld(getBaseMetaTileEntity().getWorld()).run(); + new ParticleEventBuilder().setMotion(0.0D, 0.0D, 0.0D) + .setIdentifier(ParticleFX.SMOKE) + .setPosition( + aBaseMetaTileEntity.getXCoord() + 0.8F + - XSTR_INSTANCE.nextFloat() * 0.6F, + aBaseMetaTileEntity.getYCoord() + 0.9F + + XSTR_INSTANCE.nextFloat() * 0.2F, + aBaseMetaTileEntity.getZCoord() + 0.8F + - XSTR_INSTANCE.nextFloat() * 0.6F) + .setWorld(getBaseMetaTileEntity().getWorld()) + .run(); } } } @@ -67,8 +72,14 @@ public class GT_MetaTileEntity_Macerator_Bronze extends GT_MetaTileEntity_BasicM @Override public int checkRecipe() { - GT_Recipe tRecipe = getRecipeList() - .findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, V[mTier], null, null, getAllInputs()); + GT_Recipe tRecipe = getRecipeList().findRecipe( + getBaseMetaTileEntity(), + mLastRecipe, + false, + V[mTier], + null, + null, + getAllInputs()); if (tRecipe == null) return DID_NOT_FIND_RECIPE; if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe; if (!canOutput(tRecipe)) { @@ -105,55 +116,79 @@ public class GT_MetaTileEntity_Macerator_Bronze extends GT_MetaTileEntity_BasicM @Override public ITexture[] getSideFacingActive(byte aColor) { - return new ITexture[] { super.getSideFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingActive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSideFacingInactive(byte aColor) { return new ITexture[] { super.getSideFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_MACERATOR), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_MACERATOR_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_MACERATOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingActive(byte aColor) { - return new ITexture[] { super.getFrontFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingActive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingInactive(byte aColor) { - return new ITexture[] { super.getFrontFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_MACERATOR), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_MACERATOR_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_MACERATOR), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_MACERATOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingActive(byte aColor) { - return new ITexture[] { super.getTopFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_TOP_STEAM_MACERATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_MACERATOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getTopFacingActive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_MACERATOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_MACERATOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingInactive(byte aColor) { return new ITexture[] { super.getTopFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_MACERATOR), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_MACERATOR_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_MACERATOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingActive(byte aColor) { - return new ITexture[] { super.getBottomFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingActive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingInactive(byte aColor) { - return new ITexture[] { super.getBottomFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_MACERATOR), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_MACERATOR_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_MACERATOR), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_MACERATOR_GLOW) + .glow() + .build() }; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java index 81027ca069..64b44a5510 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java @@ -51,12 +51,16 @@ public class GT_MetaTileEntity_Macerator_Steel extends GT_MetaTileEntity_BasicMa && !aBaseMetaTileEntity.getOpacityAtSide(topFacing)) { new WorldSpawnedEventBuilder.ParticleEventBuilder().setMotion(0.0D, 0.0D, 0.0D) - .setIdentifier(ParticleFX.SMOKE) - .setPosition( - aBaseMetaTileEntity.getXCoord() + 0.8F - XSTR_INSTANCE.nextFloat() * 0.6F, - aBaseMetaTileEntity.getYCoord() + 0.9F + XSTR_INSTANCE.nextFloat() * 0.2F, - aBaseMetaTileEntity.getZCoord() + 0.8F - XSTR_INSTANCE.nextFloat() * 0.6F) - .setWorld(getBaseMetaTileEntity().getWorld()).run(); + .setIdentifier(ParticleFX.SMOKE) + .setPosition( + aBaseMetaTileEntity.getXCoord() + 0.8F + - XSTR_INSTANCE.nextFloat() * 0.6F, + aBaseMetaTileEntity.getYCoord() + 0.9F + + XSTR_INSTANCE.nextFloat() * 0.2F, + aBaseMetaTileEntity.getZCoord() + 0.8F + - XSTR_INSTANCE.nextFloat() * 0.6F) + .setWorld(getBaseMetaTileEntity().getWorld()) + .run(); } } } @@ -68,8 +72,14 @@ public class GT_MetaTileEntity_Macerator_Steel extends GT_MetaTileEntity_BasicMa @Override public int checkRecipe() { - GT_Recipe tRecipe = getRecipeList() - .findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, V[mTier], null, null, getAllInputs()); + GT_Recipe tRecipe = getRecipeList().findRecipe( + getBaseMetaTileEntity(), + mLastRecipe, + false, + V[mTier], + null, + null, + getAllInputs()); if (tRecipe == null) return DID_NOT_FIND_RECIPE; if (tRecipe.mCanBeBuffered) mLastRecipe = tRecipe; if (!canOutput(tRecipe)) { @@ -106,55 +116,79 @@ public class GT_MetaTileEntity_Macerator_Steel extends GT_MetaTileEntity_BasicMa @Override public ITexture[] getSideFacingActive(byte aColor) { - return new ITexture[] { super.getSideFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getSideFacingActive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getSideFacingInactive(byte aColor) { return new ITexture[] { super.getSideFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_SIDE_STEAM_MACERATOR), - TextureFactory.builder().addIcon(OVERLAY_SIDE_STEAM_MACERATOR_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_SIDE_STEAM_MACERATOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingActive(byte aColor) { - return new ITexture[] { super.getFrontFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingActive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getFrontFacingInactive(byte aColor) { - return new ITexture[] { super.getFrontFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_FRONT_STEAM_MACERATOR), - TextureFactory.builder().addIcon(OVERLAY_FRONT_STEAM_MACERATOR_GLOW).glow().build() }; + return new ITexture[] { + super.getFrontFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_FRONT_STEAM_MACERATOR), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_STEAM_MACERATOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingActive(byte aColor) { - return new ITexture[] { super.getTopFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_TOP_STEAM_MACERATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_MACERATOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getTopFacingActive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_MACERATOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_MACERATOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getTopFacingInactive(byte aColor) { return new ITexture[] { super.getTopFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_TOP_STEAM_MACERATOR), - TextureFactory.builder().addIcon(OVERLAY_TOP_STEAM_MACERATOR_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_TOP_STEAM_MACERATOR_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingActive(byte aColor) { - return new ITexture[] { super.getBottomFacingActive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingActive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE_GLOW) + .glow() + .build() }; } @Override public ITexture[] getBottomFacingInactive(byte aColor) { - return new ITexture[] { super.getBottomFacingInactive(aColor)[0], - TextureFactory.of(OVERLAY_BOTTOM_STEAM_MACERATOR), - TextureFactory.builder().addIcon(OVERLAY_BOTTOM_STEAM_MACERATOR_GLOW).glow().build() }; + return new ITexture[] { + super.getBottomFacingInactive(aColor)[0], TextureFactory.of(OVERLAY_BOTTOM_STEAM_MACERATOR), + TextureFactory.builder() + .addIcon(OVERLAY_BOTTOM_STEAM_MACERATOR_GLOW) + .glow() + .build() }; } } diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java index ce434bc371..cee78c3fa4 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java @@ -95,8 +95,10 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti } public static void registerAEIntegration() { - appeng.api.AEApi.instance().registries().externalStorage() - .addExternalStorageInterface(new AE2DigitalChestHandler()); + appeng.api.AEApi.instance() + .registries() + .externalStorage() + .addExternalStorageInterface(new AE2DigitalChestHandler()); } @Override @@ -417,8 +419,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti private boolean hasActiveMEConnection() { if (listeners == null || listeners.isEmpty()) return false; - for (Map.Entry<appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack>, Object> e : listeners - .entrySet()) { + for (Map.Entry<appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack>, Object> e : listeners.entrySet()) { if ((e.getKey() instanceof appeng.api.parts.IPart)) { appeng.api.networking.IGridNode n = ((appeng.api.parts.IPart) e.getKey()).getGridNode(); if (n != null && n.isActive()) return true; @@ -467,7 +468,10 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti boolean aActive, boolean aRedstone) { if (aSide != aFacing) return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1] }; return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], TextureFactory.of(OVERLAY_SCHEST), - TextureFactory.builder().addIcon(OVERLAY_SCHEST_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_SCHEST_GLOW) + .glow() + .build() }; } @Override @@ -478,7 +482,8 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti if (tag.hasKey("itemType", Constants.NBT.TAG_COMPOUND)) { currenttip.add("Item Count: " + GT_Utility.parseNumberToString(tag.getInteger("itemCount"))); currenttip.add( - "Item Type: " + ItemStack.loadItemStackFromNBT(tag.getCompoundTag("itemType")).getDisplayName()); + "Item Type: " + ItemStack.loadItemStackFromNBT(tag.getCompoundTag("itemType")) + .getDisplayName()); } else { currenttip.add("Chest Empty"); } @@ -505,26 +510,36 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(7, 16).setSize(71, 45)) - .widget( - new SlotWidget(inventoryHandler, 0) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN) - .setPos(79, 16)) - .widget( - new SlotWidget(inventoryHandler, 1).setAccess(true, false) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT) - .setPos(79, 52)) - .widget( - SlotWidget.phantom(inventoryHandler, 2).disableInteraction() - .setBackground(GT_UITextures.TRANSPARENT).setPos(59, 42)) - .widget( - new TextWidget("Item Amount").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 20)) - .widget( - TextWidget.dynamicString( - () -> GT_Utility.parseNumberToString( - this instanceof GT_MetaTileEntity_QuantumChest - ? ((GT_MetaTileEntity_QuantumChest) this).mItemCount - : 0)) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 30)); + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + .setPos(7, 16) + .setSize(71, 45)) + .widget( + new SlotWidget(inventoryHandler, 0) + .setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_IN) + .setPos(79, 16)) + .widget( + new SlotWidget(inventoryHandler, 1).setAccess(true, false) + .setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_OUT) + .setPos(79, 52)) + .widget( + SlotWidget.phantom(inventoryHandler, 2) + .disableInteraction() + .setBackground(GT_UITextures.TRANSPARENT) + .setPos(59, 42)) + .widget( + new TextWidget("Item Amount").setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(10, 20)) + .widget( + TextWidget.dynamicString( + () -> GT_Utility.parseNumberToString( + this instanceof GT_MetaTileEntity_QuantumChest + ? ((GT_MetaTileEntity_QuantumChest) this).mItemCount + : 0)) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(10, 30)); } } diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java index 9a4727941f..e374658871 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java @@ -171,7 +171,10 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit @Override public boolean isFluidInputAllowed(FluidStack aFluid) { - return !mLockFluid || lockedFluidName == null || lockedFluidName.equals(aFluid.getFluid().getName()); + return !mLockFluid || lockedFluidName == null + || lockedFluidName.equals( + aFluid.getFluid() + .getName()); } @Override @@ -182,7 +185,8 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit @Override public void onEmptyingContainerWhenEmpty() { if (this.lockedFluidName == null && this.mFluid != null) { - this.lockedFluidName = this.mFluid.getFluid().getName(); + this.lockedFluidName = this.mFluid.getFluid() + .getName(); } } @@ -266,7 +270,10 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit } else return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1] }; } return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], TextureFactory.of(OVERLAY_QTANK), - TextureFactory.builder().addIcon(OVERLAY_QTANK_GLOW).glow().build() }; + TextureFactory.builder() + .addIcon(OVERLAY_QTANK_GLOW) + .glow() + .build() }; } @Override @@ -343,8 +350,9 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit getOutputSlot(), GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true), 1)) { - getFillableStack().amount += Math - .min(tFluid.amount, getRealCapacity() - getFillableStack().amount); + getFillableStack().amount += Math.min( + tFluid.amount, + getRealCapacity() - getFillableStack().amount); aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1); } } @@ -354,8 +362,11 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit } if (doesFillContainers()) { - ItemStack tOutput = GT_Utility - .fillFluidContainer(getDrainableStack(), mInventory[getInputSlot()], false, true); + ItemStack tOutput = GT_Utility.fillFluidContainer( + getDrainableStack(), + mInventory[getInputSlot()], + false, + true); if (tOutput != null && aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tOutput, 1)) { FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true); aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1); @@ -368,10 +379,9 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit @Override public int fill(FluidStack aFluid, boolean doFill) { - if (aFluid == null || aFluid.getFluid().getID() <= 0 - || aFluid.amount <= 0 - || !canTankBeFilled() - || !isFluidInputAllowed(aFluid)) + if (aFluid == null || aFluid.getFluid() + .getID() + <= 0 || aFluid.amount <= 0 || !canTankBeFilled() || !isFluidInputAllowed(aFluid)) return 0; if (getFillableStack() != null && !getFillableStack().isFluidEqual(aFluid)) { return 0; @@ -483,8 +493,9 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit FluidStack fluid = tag.hasKey("mFluid") ? FluidStack.loadFluidStackFromNBT(tag.getCompoundTag("mFluid")) : null; if (fluid != null && fluid.amount > 0) { currenttip.remove(0); - currenttip - .add(0, String.format("%d / %d mB %s", fluid.amount, getRealCapacity(), fluid.getLocalizedName())); + currenttip.add( + 0, + String.format("%d / %d mB %s", fluid.amount, getRealCapacity(), fluid.getLocalizedName())); } else { currenttip.add(0, "Tank Empty"); } @@ -507,116 +518,161 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK).setPos(7, 16).setSize(71, 45)) - .widget( - new SlotWidget(inventoryHandler, getInputSlot()) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN) - .setPos(79, 16)) - .widget( - new SlotWidget(inventoryHandler, getOutputSlot()).setAccess(true, false) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT) - .setPos(79, 43)) - .widget( - new FluidDisplaySlotWidget(inventoryHandler, getStackDisplaySlot()) - .setFluidAccessConstructor(() -> constructFluidAccess(false)).setIHasFluidDisplay(this) - .setCanDrain(true).setCanFill(!isDrainableStackSeparate()) - .setActionRealClick(FluidDisplaySlotWidget.Action.TRANSFER) - .setActionDragAndDrop(FluidDisplaySlotWidget.Action.LOCK) - .setBeforeRealClick((clickData, widget) -> { - if (NetworkUtils.isClient()) { - // propagate display item content to actual fluid stored in this tank - setDrainableStack( - GT_Utility.getFluidFromDisplayStack(widget.getMcSlot().getStack())); - } - return true; - }).setBackground(GT_UITextures.TRANSPARENT).setPos(58, 41)) - .widget(new TextWidget("Liquid Amount").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 20)) - .widget( - TextWidget - .dynamicString(() -> GT_Utility.parseNumberToString(mFluid != null ? mFluid.amount : 0)) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 30)) - .widget(new CycleButtonWidget().setToggle(() -> mOutputFluid, val -> { - mOutputFluid = val; - if (!mOutputFluid) { - GT_Utility.sendChatToPlayer( - buildContext.getPlayer(), - GT_Utility.trans("262", "Fluid Auto Output Disabled")); - } else { - GT_Utility.sendChatToPlayer( - buildContext.getPlayer(), - GT_Utility.trans("263", "Fluid Auto Output Enabled")); - } - }).setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID) - .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.autooutput.tooltip")) - .setTooltipShowUpDelay(TOOLTIP_DELAY).setPos(7, 63).setSize(18, 18)) - .widget(new CycleButtonWidget().setToggle(() -> mLockFluid, val -> { - mLockFluid = val; - - String inBrackets; - if (mLockFluid) { - if (mFluid == null) { - setLockedFluidName(null); - inBrackets = GT_Utility - .trans("264", "currently none, will be locked to the next that is put in"); - } else { - setLockedFluidName(getDrainableStack().getFluid().getName()); - inBrackets = getDrainableStack().getLocalizedName(); - } - GT_Utility.sendChatToPlayer( - buildContext.getPlayer(), - String.format("%s (%s)", GT_Utility.trans("265", "1 specific Fluid"), inBrackets)); - } else { - setLockedFluidName(null); - GT_Utility.sendChatToPlayer( - buildContext.getPlayer(), - GT_Utility.trans("266", "Lock Fluid Mode Disabled")); - } - }).setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_LOCK) - .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.lockfluid.tooltip")) - .setTooltipShowUpDelay(TOOLTIP_DELAY).setPos(25, 63).setSize(18, 18)) - .widget(new CycleButtonWidget().setToggle(() -> mAllowInputFromOutputSide, val -> { - mAllowInputFromOutputSide = val; - if (!mAllowInputFromOutputSide) { - GT_Utility.sendChatToPlayer(buildContext.getPlayer(), GT_Utility.getTrans("096")); - } else { - GT_Utility.sendChatToPlayer(buildContext.getPlayer(), GT_Utility.getTrans("095")); - } - }).setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_INPUT_FROM_OUTPUT_SIDE) - .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.inputfromoutput.tooltip")) - .setTooltipShowUpDelay(TOOLTIP_DELAY).setPos(43, 63).setSize(18, 18)) - .widget(new CycleButtonWidget().setToggle(() -> mVoidFluidPart, val -> { - mVoidFluidPart = val; - if (!mVoidFluidPart) { - GT_Utility.sendChatToPlayer( - buildContext.getPlayer(), - GT_Utility.trans("267", "Overflow Voiding Mode Disabled")); - } else { - GT_Utility.sendChatToPlayer( - buildContext.getPlayer(), - GT_Utility.trans("268", "Overflow Voiding Mode Enabled")); - } - }).setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS) - .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.voidoverflow.tooltip")) - .setTooltipShowUpDelay(TOOLTIP_DELAY).setPos(151, 7).setSize(18, 18)) - .widget(new CycleButtonWidget().setToggle(() -> mVoidFluidFull, val -> { - mVoidFluidFull = val; - if (!mVoidFluidFull) { - GT_Utility.sendChatToPlayer( - buildContext.getPlayer(), - GT_Utility.trans("269", "Void Full Mode Disabled")); - } else { - GT_Utility.sendChatToPlayer( - buildContext.getPlayer(), - GT_Utility.trans("270", "Void Full Mode Enabled")); - } - }).setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_VOID_ALL) - .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.voidfull.tooltip")) - .setTooltipShowUpDelay(TOOLTIP_DELAY).setPos(151, 25).setSize(18, 18)); + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + .setPos(7, 16) + .setSize(71, 45)) + .widget( + new SlotWidget(inventoryHandler, getInputSlot()) + .setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_IN) + .setPos(79, 16)) + .widget( + new SlotWidget(inventoryHandler, getOutputSlot()).setAccess(true, false) + .setBackground( + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_OUT) + .setPos(79, 43)) + .widget( + new FluidDisplaySlotWidget( + inventoryHandler, + getStackDisplaySlot()).setFluidAccessConstructor(() -> constructFluidAccess(false)) + .setIHasFluidDisplay(this) + .setCanDrain(true) + .setCanFill(!isDrainableStackSeparate()) + .setActionRealClick(FluidDisplaySlotWidget.Action.TRANSFER) + .setActionDragAndDrop(FluidDisplaySlotWidget.Action.LOCK) + .setBeforeRealClick((clickData, widget) -> { + if (NetworkUtils.isClient()) { + // propagate display item content to actual fluid stored in + // this tank + setDrainableStack( + GT_Utility.getFluidFromDisplayStack( + widget.getMcSlot() + .getStack())); + } + return true; + }) + .setBackground(GT_UITextures.TRANSPARENT) + .setPos(58, 41)) + .widget( + new TextWidget("Liquid Amount").setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(10, 20)) + .widget( + TextWidget.dynamicString( + () -> GT_Utility.parseNumberToString(mFluid != null ? mFluid.amount : 0)) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setPos(10, 30)) + .widget(new CycleButtonWidget().setToggle(() -> mOutputFluid, val -> { + mOutputFluid = val; + if (!mOutputFluid) { + GT_Utility.sendChatToPlayer( + buildContext.getPlayer(), + GT_Utility.trans("262", "Fluid Auto Output Disabled")); + } else { + GT_Utility.sendChatToPlayer( + buildContext.getPlayer(), + GT_Utility.trans("263", "Fluid Auto Output Enabled")); + } + }) + .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) + .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID) + .setGTTooltip( + () -> mTooltipCache.getData( + "GT5U.machines.digitaltank.autooutput.tooltip")) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setPos(7, 63) + .setSize(18, 18)) + .widget(new CycleButtonWidget().setToggle(() -> mLockFluid, val -> { + mLockFluid = val; + + String inBrackets; + if (mLockFluid) { + if (mFluid == null) { + setLockedFluidName(null); + inBrackets = GT_Utility.trans( + "264", + "currently none, will be locked to the next that is put in"); + } else { + setLockedFluidName( + getDrainableStack().getFluid() + .getName()); + inBrackets = getDrainableStack().getLocalizedName(); + } + GT_Utility.sendChatToPlayer( + buildContext.getPlayer(), + String.format("%s (%s)", GT_Utility.trans("265", "1 specific Fluid"), inBrackets)); + } else { + setLockedFluidName(null); + GT_Utility.sendChatToPlayer( + buildContext.getPlayer(), + GT_Utility.trans("266", "Lock Fluid Mode Disabled")); + } + }) + .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) + .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_LOCK) + .setGTTooltip( + () -> mTooltipCache.getData( + "GT5U.machines.digitaltank.lockfluid.tooltip")) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setPos(25, 63) + .setSize(18, 18)) + .widget(new CycleButtonWidget().setToggle(() -> mAllowInputFromOutputSide, val -> { + mAllowInputFromOutputSide = val; + if (!mAllowInputFromOutputSide) { + GT_Utility.sendChatToPlayer(buildContext.getPlayer(), GT_Utility.getTrans("096")); + } else { + GT_Utility.sendChatToPlayer(buildContext.getPlayer(), GT_Utility.getTrans("095")); + } + }) + .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) + .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_INPUT_FROM_OUTPUT_SIDE) + .setGTTooltip( + () -> mTooltipCache.getData( + "GT5U.machines.digitaltank.inputfromoutput.tooltip")) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setPos(43, 63) + .setSize(18, 18)) + .widget(new CycleButtonWidget().setToggle(() -> mVoidFluidPart, val -> { + mVoidFluidPart = val; + if (!mVoidFluidPart) { + GT_Utility.sendChatToPlayer( + buildContext.getPlayer(), + GT_Utility.trans("267", "Overflow Voiding Mode Disabled")); + } else { + GT_Utility.sendChatToPlayer( + buildContext.getPlayer(), + GT_Utility.trans("268", "Overflow Voiding Mode Enabled")); + } + }) + .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) + .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS) + .setGTTooltip( + () -> mTooltipCache.getData( + "GT5U.machines.digitaltank.voidoverflow.tooltip")) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setPos(151, 7) + .setSize(18, 18)) + .widget(new CycleButtonWidget().setToggle(() -> mVoidFluidFull, val -> { + mVoidFluidFull = val; + if (!mVoidFluidFull) { + GT_Utility.sendChatToPlayer( + buildContext.getPlayer(), + GT_Utility.trans("269", "Void Full Mode Disabled")); + } else { + GT_Utility.sendChatToPlayer( + buildContext.getPlayer(), + GT_Utility.trans("270", "Void Full Mode Enabled")); + } + }) + .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) + .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_VOID_ALL) + .setGTTooltip( + () -> mTooltipCache.getData( + "GT5U.machines.digitaltank.voidfull.tooltip")) + .setTooltipShowUpDelay(TOOLTIP_DELAY) + .setPos(151, 25) + .setSize(18, 18)); } @Override diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GT_Tool.java index 15bbaf976d..178005c6c5 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool.java +++ b/src/main/java/gregtech/common/tools/GT_Tool.java @@ -136,8 +136,8 @@ public abstract class GT_Tool implements IToolStats { } public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { - return new EntityDamageSource((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer) - .func_151519_b(aEntity); + return new EntityDamageSource((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer).func_151519_b( + aEntity); } @Override diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java index 94c4681aa3..bb5649a453 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java @@ -145,10 +145,10 @@ public class GT_Tool_Axe extends GT_Tool { @Override public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { return aIsToolHead - ? GT_MetaGenerated_Tool - .getPrimaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex] - : GT_MetaGenerated_Tool - .getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex]; + ? GT_MetaGenerated_Tool.getPrimaryMaterial( + aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex] + : GT_MetaGenerated_Tool.getSecondaryMaterial( + aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex]; } @Override diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java index a4ea2f701d..833f169e61 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java @@ -47,8 +47,12 @@ public class GT_Tool_BranchCutter extends GT_Tool { public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) { if (aBlock.getMaterial() == Material.leaves) { - aEvent.dropChance = Math - .min(1.0F, Math.max(aEvent.dropChance, (aStack.getItem().getHarvestLevel(aStack, "") + 1) * 0.2F)); + aEvent.dropChance = Math.min( + 1.0F, + Math.max( + aEvent.dropChance, + (aStack.getItem() + .getHarvestLevel(aStack, "") + 1) * 0.2F)); if (aBlock == Blocks.leaves) { aDrops.clear(); if (((aMetaData & 0x3) == 0) && (aPlayer.worldObj.rand.nextInt(9) <= aFortune * 2)) { diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java index 5ed7647859..56f623f771 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java @@ -112,8 +112,13 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw { if ((aBlock.getMaterial() == Material.leaves) && ((aBlock instanceof IShearable))) { aPlayer.worldObj.setBlock(aX, aY, aZ, aBlock, aMetaData, 0); if (((IShearable) aBlock).isShearable(aStack, aPlayer.worldObj, aX, aY, aZ)) { - ArrayList<ItemStack> tDrops = ((IShearable) aBlock) - .onSheared(aStack, aPlayer.worldObj, aX, aY, aZ, aFortune); + ArrayList<ItemStack> tDrops = ((IShearable) aBlock).onSheared( + aStack, + aPlayer.worldObj, + aX, + aY, + aZ, + aFortune); aDrops.clear(); } aPlayer.worldObj.setBlock(aX, aY, aZ, Blocks.air, 0, 0); diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java b/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java index a774ab7856..3a9bb289ad 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java @@ -97,8 +97,8 @@ public class GT_Tool_Crowbar extends GT_Tool { } String tTool = aBlock.getHarvestTool(aMetaData); if ((tTool == null) || (tTool.equals(""))) { - for (Iterator i$ = GT_MetaGenerated_Tool_01.INSTANCE.mToolStats.values().iterator(); i$.hasNext(); i$ - .next()) { + for (Iterator i$ = GT_MetaGenerated_Tool_01.INSTANCE.mToolStats.values() + .iterator(); i$.hasNext(); i$.next()) { if (((i$ instanceof GT_Tool_Crowbar)) && (!((IToolStats) i$).isMinableBlock(aBlock, aMetaData))) { return false; } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java index c8ebcf14f2..ac1ea88cc9 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java @@ -28,13 +28,15 @@ import gregtech.common.items.behaviors.Behaviour_Prospecting; public class GT_Tool_HardHammer extends GT_Tool { - public static final List<String> mEffectiveList = Arrays - .asList(EntityIronGolem.class.getName(), "EntityTowerGuardian"); + public static final List<String> mEffectiveList = Arrays.asList( + EntityIronGolem.class.getName(), + "EntityTowerGuardian"); @Override public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) { - String tName = aEntity.getClass().getName(); + String tName = aEntity.getClass() + .getName(); tName = tName.substring(tName.lastIndexOf('.') + 1); return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage; } @@ -122,8 +124,12 @@ public class GT_Tool_HardHammer extends GT_Tool { @Override public boolean isMinableBlock(Block aBlock, byte aMetaData) { return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "hammer", "pickaxe") - || GT_ToolHarvestHelper - .isAppropriateMaterial(aBlock, Material.rock, Material.glass, Material.ice, Material.packedIce) + || GT_ToolHarvestHelper.isAppropriateMaterial( + aBlock, + Material.rock, + Material.glass, + Material.ice, + Material.packedIce) || GT_Recipe.GT_Recipe_Map.sHammerRecipes.containsInput(new ItemStack(aBlock, 1, aMetaData)); } @@ -131,12 +137,20 @@ public class GT_Tool_HardHammer extends GT_Tool { public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) { int rConversions = 0; - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes - .findRecipe(null, true, MAX_IC2, null, new ItemStack(aBlock, 1, aMetaData)); + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe( + null, + true, + MAX_IC2, + null, + new ItemStack(aBlock, 1, aMetaData)); if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) { for (ItemStack tDrop : aDrops) { - tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes - .findRecipe(null, true, MAX_IC2, null, GT_Utility.copyAmount(1L, tDrop)); + tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe( + null, + true, + MAX_IC2, + null, + GT_Utility.copyAmount(1L, tDrop)); if (tRecipe != null) { ItemStack tHammeringOutput = tRecipe.getOutput(0); if (tHammeringOutput != null) { diff --git a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java index aad96098fa..51b4abe4af 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java @@ -77,12 +77,20 @@ public class GT_Tool_JackHammer extends GT_Tool_Drill_LV { public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) { int rConversions = 0; - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes - .findRecipe(null, true, 2147483647L, null, new ItemStack(aBlock, 1, aMetaData)); + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe( + null, + true, + 2147483647L, + null, + new ItemStack(aBlock, 1, aMetaData)); if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) { for (ItemStack tDrop : aDrops) { - tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes - .findRecipe(null, true, 2147483647L, null, GT_Utility.copyAmount(1L, new Object[] { tDrop })); + tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe( + null, + true, + 2147483647L, + null, + GT_Utility.copyAmount(1L, new Object[] { tDrop })); if (tRecipe != null) { ItemStack tHammeringOutput = tRecipe.getOutput(0); if (tHammeringOutput != null) { diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java b/src/main/java/gregtech/common/tools/GT_Tool_Plow.java index 97b7092e36..1ffb26df59 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Plow.java @@ -49,13 +49,22 @@ public class GT_Tool_Plow extends GT_Tool { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { for (int k = -1; k < 2; k++) { - if (((i != 0) || (j != 0) || (k != 0)) - && (aStack.getItem().getDigSpeed( - aStack, - aPlayer.worldObj.getBlock(aX + i, aY + j, aZ + k), - aPlayer.worldObj.getBlockMetadata(aX + i, aY + j, aZ + k)) > 0.0F) - && (((EntityPlayerMP) aPlayer).theItemInWorldManager - .tryHarvestBlock(aX + i, aY + j, aZ + k))) { + if (((i != 0) || (j != 0) || (k != 0)) && (aStack.getItem() + .getDigSpeed( + aStack, + aPlayer.worldObj.getBlock( + aX + i, + aY + j, + aZ + k), + aPlayer.worldObj.getBlockMetadata( + aX + i, + aY + j, + aZ + k)) + > 0.0F) + && (((EntityPlayerMP) aPlayer).theItemInWorldManager.tryHarvestBlock( + aX + i, + aY + j, + aZ + k))) { rConversions++; } } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Saw.java b/src/main/java/gregtech/common/tools/GT_Tool_Saw.java index 8fa1494a7e..124127c28c 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Saw.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Saw.java @@ -83,8 +83,13 @@ public class GT_Tool_Saw extends GT_Tool { if ((aBlock.getMaterial() == Material.leaves) && ((aBlock instanceof IShearable))) { aPlayer.worldObj.setBlock(aX, aY, aZ, aBlock, aMetaData, 0); if (((IShearable) aBlock).isShearable(aStack, aPlayer.worldObj, aX, aY, aZ)) { - ArrayList<ItemStack> tDrops = ((IShearable) aBlock) - .onSheared(aStack, aPlayer.worldObj, aX, aY, aZ, aFortune); + ArrayList<ItemStack> tDrops = ((IShearable) aBlock).onSheared( + aStack, + aPlayer.worldObj, + aX, + aY, + aZ, + aFortune); aDrops.clear(); aDrops.addAll(tDrops); aEvent.dropChance = 1.0F; diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java b/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java index 42542bb75d..f300abf5aa 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java @@ -35,7 +35,8 @@ public class GT_Tool_Screwdriver extends GT_Tool { @Override public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) { - String tName = aEntity.getClass().getName(); + String tName = aEntity.getClass() + .getName(); tName = tName.substring(tName.lastIndexOf('.') + 1); return mEffectiveList.contains(tName) ? aOriginalDamage * 2.0F : aOriginalDamage; } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java b/src/main/java/gregtech/common/tools/GT_Tool_Sense.java index dd6cae9aaf..081f167bf1 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Sense.java @@ -47,13 +47,22 @@ public class GT_Tool_Sense extends GT_Tool { for (int i = -2; i < 3; i++) { for (int j = -2; j < 3; j++) { for (int k = -2; k < 3; k++) { - if (((i != 0) || (j != 0) || (k != 0)) - && (aStack.getItem().getDigSpeed( - aStack, - aPlayer.worldObj.getBlock(aX + i, aY + j, aZ + k), - aPlayer.worldObj.getBlockMetadata(aX + i, aY + j, aZ + k)) > 0.0F) - && (((EntityPlayerMP) aPlayer).theItemInWorldManager - .tryHarvestBlock(aX + i, aY + j, aZ + k))) { + if (((i != 0) || (j != 0) || (k != 0)) && (aStack.getItem() + .getDigSpeed( + aStack, + aPlayer.worldObj.getBlock( + aX + i, + aY + j, + aZ + k), + aPlayer.worldObj.getBlockMetadata( + aX + i, + aY + j, + aZ + k)) + > 0.0F) + && (((EntityPlayerMP) aPlayer).theItemInWorldManager.tryHarvestBlock( + aX + i, + aY + j, + aZ + k))) { rConversions++; } } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java b/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java index d9ffb86059..98a3820106 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java @@ -35,7 +35,8 @@ public class GT_Tool_Soldering_Iron extends GT_Tool { @Override public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) { - String tName = aEntity.getClass().getName(); + String tName = aEntity.getClass() + .getName(); tName = tName.substring(tName.lastIndexOf('.') + 1); return mEffectiveList.contains(tName) ? aOriginalDamage * 2.0F : aOriginalDamage; } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java b/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java index 955765287f..71e35372ce 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java @@ -24,13 +24,15 @@ import gregtech.common.items.behaviors.Behaviour_Wrench; public class GT_Tool_Wrench extends GT_Tool { - public static final List<String> mEffectiveList = Arrays - .asList(EntityIronGolem.class.getName(), "EntityTowerGuardian"); + public static final List<String> mEffectiveList = Arrays.asList( + EntityIronGolem.class.getName(), + "EntityTowerGuardian"); @Override public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) { - String tName = aEntity.getClass().getName(); + String tName = aEntity.getClass() + .getName(); tName = tName.substring(tName.lastIndexOf('.') + 1); return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage; } diff --git a/src/main/java/gregtech/loaders/ExtraIcons.java b/src/main/java/gregtech/loaders/ExtraIcons.java index 42d5c1ec7c..bc90879e5f 100644 --- a/src/main/java/gregtech/loaders/ExtraIcons.java +++ b/src/main/java/gregtech/loaders/ExtraIcons.java @@ -26,10 +26,10 @@ public class ExtraIcons { if (reg.getTextureType() == 1) { // are for items steelLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/steel_inner"); aluminiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/aluminium_inner"); - stainlesssteelLargeCellInner = reg - .registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/stainlesssteel_inner"); - tungstensteelLargeCellInner = reg - .registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/tungstensteel_inner"); + stainlesssteelLargeCellInner = reg.registerIcon( + RES_PATH_ITEM + "large_fluid_cell_custom/stainlesssteel_inner"); + tungstensteelLargeCellInner = reg.registerIcon( + RES_PATH_ITEM + "large_fluid_cell_custom/tungstensteel_inner"); titaniumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/titanium_inner"); chromiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/chromium_inner"); iridiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/iridium_inner"); diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index 470924053f..9a9837aae9 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -19,16 +19,36 @@ public class GT_FuelLoader implements Runnable { @Override public void run() { GT_Log.out.println("GT_Mod: Initializing various Fuels."); - ItemList.sBlueVitriol = GT_Mod.gregtechproxy - .addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295); - ItemList.sNickelSulfate = GT_Mod.gregtechproxy - .addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295); - ItemList.sGreenVitriol = GT_Mod.gregtechproxy - .addFluid("solution.greenvitriol", "Green Vitriol water solution", null, 1, 295); - ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy - .addFluid("indiumconcentrate", "Indium Concentrate", null, 1, 295); // TODO CHECK NEW x3 - ItemList.sLeadZincSolution = GT_Mod.gregtechproxy - .addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295); + ItemList.sBlueVitriol = GT_Mod.gregtechproxy.addFluid( + "solution.bluevitriol", + "Blue Vitriol water solution", + null, + 1, + 295); + ItemList.sNickelSulfate = GT_Mod.gregtechproxy.addFluid( + "solution.nickelsulfate", + "Nickel sulfate water solution", + null, + 1, + 295); + ItemList.sGreenVitriol = GT_Mod.gregtechproxy.addFluid( + "solution.greenvitriol", + "Green Vitriol water solution", + null, + 1, + 295); + ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy.addFluid( + "indiumconcentrate", + "Indium Concentrate", + null, + 1, + 295); // TODO CHECK NEW x3 + ItemList.sLeadZincSolution = GT_Mod.gregtechproxy.addFluid( + "leadzincsolution", + "Lead-Zinc solution", + null, + 1, + 295); ItemList.sRocketFuel = GT_Mod.gregtechproxy.addFluid("rocket_fuel", "Rocket Fuel", null, 1, 295); new GT_Recipe( new ItemStack(Items.lava_bucket), diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java index e894acf4be..8e6130eccb 100644 --- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java @@ -298,122 +298,215 @@ public class GT_ItemIterator implements Runnable { GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Lignite, new ItemStack(tItem, 1, 0)); } if ((tName.equals("tile.extrabiomes.redrock")) || (tName.equals("tile.bop.redRocks"))) { - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Redrock, + new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Redrock, + new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Redrock, + new ItemStack(tItem, 1, 2)); } if (tName.equals("tile.rpstone")) { - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 3)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 4)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 6)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Marble, + new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Basalt, + new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Marble, + new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Basalt, + new ItemStack(tItem, 1, 3)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Basalt, + new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Basalt, + new ItemStack(tItem, 1, 5)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Basalt, + new ItemStack(tItem, 1, 6)); } if ( /** (tName.equals("tile.sedimentaryStone")) || **/ ((tName.equals("tile.igneousStone")) || (tName.equals("tile.igneousStoneBrick")) || (tName.equals("tile.igneousCobblestone")))) { - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 2)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 3)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 4)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 6)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 7)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.GraniteRed, + new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.GraniteBlack, + new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Rhyolite, + new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Andesite, + new ItemStack(tItem, 1, 3)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Gabbro, + new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Basalt, + new ItemStack(tItem, 1, 5)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Komatiite, + new ItemStack(tItem, 1, 6)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Dacite, + new ItemStack(tItem, 1, 7)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 8)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 9)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 10)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 11)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 12)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 13)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 14)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 15)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.GraniteRed, + new ItemStack(tItem, 1, 8)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.GraniteBlack, + new ItemStack(tItem, 1, 9)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Rhyolite, + new ItemStack(tItem, 1, 10)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Andesite, + new ItemStack(tItem, 1, 11)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Gabbro, + new ItemStack(tItem, 1, 12)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Basalt, + new ItemStack(tItem, 1, 13)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Komatiite, + new ItemStack(tItem, 1, 14)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Dacite, + new ItemStack(tItem, 1, 15)); } if ((tName.equals("tile.metamorphicStone")) || (tName.equals("tile.metamorphicStoneBrick")) || (tName.equals("tile.metamorphicCobblestone"))) { - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 3)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 4)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 5)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 6)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 7)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Gneiss, + new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Eclogite, + new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Marble, + new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Quartzite, + new ItemStack(tItem, 1, 3)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Blueschist, + new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Greenschist, + new ItemStack(tItem, 1, 5)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Soapstone, + new ItemStack(tItem, 1, 6)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Migmatite, + new ItemStack(tItem, 1, 7)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 8)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 9)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 10)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 11)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 12)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 13)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 14)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 15)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Gneiss, + new ItemStack(tItem, 1, 8)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Eclogite, + new ItemStack(tItem, 1, 9)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Marble, + new ItemStack(tItem, 1, 10)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Quartzite, + new ItemStack(tItem, 1, 11)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Blueschist, + new ItemStack(tItem, 1, 12)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Greenschist, + new ItemStack(tItem, 1, 13)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Soapstone, + new ItemStack(tItem, 1, 14)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Migmatite, + new ItemStack(tItem, 1, 15)); } if (tName.equals("tile.blockCosmeticSolid")) { - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator - .registerOre(OrePrefixes.block, Materials.Thaumium, new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Obsidian, + new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Obsidian, + new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator.registerOre( + OrePrefixes.block, + Materials.Thaumium, + new ItemStack(tItem, 1, 4)); } if (tName.equals("tile.enderchest")) { GT_OreDictUnificator.registerOre(OreDictNames.enderChest, new ItemStack(tItem, 1, 32767)); } if (tName.equals("tile.autoWorkbenchBlock")) { - GT_OreDictUnificator - .registerOre(OreDictNames.craftingWorkBench, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingWorkBench, + new ItemStack(tItem, 1, 0)); } if (tName.equals("tile.pumpBlock")) { GT_OreDictUnificator.registerOre(OreDictNames.craftingPump, new ItemStack(tItem, 1, 0)); - if (GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "BCPump", false)) { + if (GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, + "BCPump", + false)) { GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 0)); } } @@ -421,8 +514,9 @@ public class GT_ItemIterator implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.craftingTank, new ItemStack(tItem, 1, 0)); } if (tName.equals("item.drawplateDiamond")) { - GT_OreDictUnificator - .registerOre(ToolDictNames.craftingToolDrawplate, new ItemStack(tItem, 1, 32767)); + GT_OreDictUnificator.registerOre( + ToolDictNames.craftingToolDrawplate, + new ItemStack(tItem, 1, 32767)); } } } diff --git a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java index ce66b80a55..115e95a6d3 100644 --- a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java @@ -112,8 +112,8 @@ public class GT_SonictronLoader implements Runnable { GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.glass_bottle, 1)); GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BURP.toString()); GT_Mod.gregtechproxy.mSoundCounts.add(1); - GT_Mod.gregtechproxy.mSoundItems - .add(new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1)); + GT_Mod.gregtechproxy.mSoundItems.add( + new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1)); GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_CHESTOPEN.toString()); GT_Mod.gregtechproxy.mSoundCounts.add(1); GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.chest, 1)); diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 59abc0566a..7970dd695f 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -68,8 +68,12 @@ public class GT_Achievements { "tools", 0, 4, - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, Materials.Iron, Materials.Wood, null), + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.HARDHAMMER, + 1, + Materials.Iron, + Materials.Wood, + null), "flintpick", false); registerAchievement( @@ -387,9 +391,12 @@ public class GT_Achievements { new AchievementPage( "GregTech 5", (Achievement[]) this.achievementList.values() - .toArray(new Achievement[this.achievementList.size()]))); + .toArray( + new Achievement[this.achievementList.size()]))); MinecraftForge.EVENT_BUS.register(this); - FMLCommonHandler.instance().bus().register(this); + FMLCommonHandler.instance() + .bus() + .register(this); } } @@ -448,14 +455,19 @@ public class GT_Achievements { return null; } if (recipe.getOutput(0) == null) { - GT_Mod.GT_FML_LOGGER - .error("Invalid achievement registration attempt for recipe with null output", new Exception()); + GT_Mod.GT_FML_LOGGER.error( + "Invalid achievement registration attempt for recipe with null output", + new Exception()); return null; } - if (this.achievementList.get(recipe.getOutput(0).getUnlocalizedName()) == null) { + if (this.achievementList.get( + recipe.getOutput(0) + .getUnlocalizedName()) + == null) { assReg++; return registerAchievement( - recipe.getOutput(0).getUnlocalizedName(), + recipe.getOutput(0) + .getUnlocalizedName(), -(11 + assReg % 5), ((assReg) / 5) - 8, recipe.getOutput(0), @@ -508,7 +520,8 @@ public class GT_Achievements { issueAchievement(player, "finalpreparations"); } } - if (stack.getUnlocalizedName().equals("ic2.itemPartIndustrialDiamond")) { + if (stack.getUnlocalizedName() + .equals("ic2.itemPartIndustrialDiamond")) { issueAchievement(player, "artificaldia"); issueAchievement(player, "buildCoalDiamond"); } @@ -518,7 +531,8 @@ public class GT_Achievements { if (player == null || fluid == null) { return; } - switch (fluid.getFluid().getUnlocalizedName()) { + switch (fluid.getFluid() + .getUnlocalizedName()) { case "fluid.plasma.helium": issueAchievement(player, "fusion"); break; @@ -553,7 +567,8 @@ public class GT_Achievements { issueAchievement(player, "bronze"); } } - if (stack.getUnlocalizedName().startsWith("gt.metaitem.")) { + if (stack.getUnlocalizedName() + .startsWith("gt.metaitem.")) { switch (stack.getUnlocalizedName()) { case "gt.metaitem.01.2300": issueAchievement(player, "bronze"); @@ -584,118 +599,277 @@ public class GT_Achievements { issueAchievement(player, "hightech"); break; } - } else if (stack.getUnlocalizedName().equals("ic2.blockCrop")) { - issueAchievement(player, "crops"); - } else if (stack.getUnlocalizedName().equals("ic2.itemPartCircuit")) { - issueAchievement(player, "gtbasiccircuit"); - } else if (stack.getUnlocalizedName().equals("ic2.itemPartCircuitAdv")) { - issueAchievement(player, "stepforward"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.")) { - if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.arcfurnace.tier.")) { - issueAchievement(player, "recycling"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.disassembler.tier.")) { - issueAchievement(player, "repair"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.boiler.solar")) { - issueAchievement(player, "simplyeco"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.boiler.bronze")) { - issueAchievement(player, "firststeam"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.boiler.steel")) { - issueAchievement(player, "highpressure"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.macerator")) { - issueAchievement(player, "macerator"); - issueAchievement(player, "buildMacerator"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.alloysmelter")) { - issueAchievement(player, "alloysmelter"); - issueAchievement(player, "buildElecFurnace"); - if (stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.alloysmelter.tier.3")) { - issueAchievement(player, "buildIndFurnace"); - } - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.bronzemachine.extractor")) { - issueAchievement(player, "extract"); - issueAchievement(player, "buildCompressor"); - issueAchievement(player, "buildExtractor"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.automation.superbuffer.tier.")) { - issueAchievement(player, "superbuffer"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.quantum.tank.tier.")) { - issueAchievement(player, "whereistheocean"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.quantum.chest.tier.")) { - issueAchievement(player, "newstorage"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.hammer.tier.")) { - issueAchievement(player, "cheapermac"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.automation.chestbuffer.tier.")) { - issueAchievement(player, "buffer"); - issueAchievement(player, "buildBatBox"); - if (stack.getUnlocalizedName().startsWith("gt.blockmachines.automation.chestbuffer.tier.3")) { - issueAchievement(player, "buildMFE"); - } - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicgenerator.steamturbine.tier.")) { - issueAchievement(player, "steampower"); - issueAchievement(player, "buildGenerator"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.basicmachine.pump.tier.03")) { - issueAchievement(player, "slurp"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.assembler.tier.")) { - issueAchievement(player, "avengers"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.blastfurnace")) { - issueAchievement(player, "ebf"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.batterybuffer.")) { - issueAchievement(player, "batterys"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.hatch.energy.tier.02")) { - issueAchievement(player, "upgradeebf"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.multifurnace")) { - issueAchievement(player, "highpowersmelt"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.hatch.energy.tier.01")) { - issueAchievement(player, "energyhatch"); - } else if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.processingarray")) { - issueAchievement(player, "factory"); - } else - if (stack.getUnlocalizedName().equals("gt.blockmachines.basicgenerator.magicenergyconverter.tier.01")) { - issueAchievement(player, "magic"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockmachines.basicgenerator.magicenergyabsorber.tier.03")) { - issueAchievement(player, "highmage"); + } else if (stack.getUnlocalizedName() + .equals("ic2.blockCrop")) { + issueAchievement(player, "crops"); } else - if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.amplifab.tier.")) { - issueAchievement(player, "amplifier"); - } else if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine.massfab.tier.")) { - issueAchievement(player, "universal"); - issueAchievement(player, "buildMassFab"); - } else - if (stack.getUnlocalizedName().startsWith("gt.blockmachines.basicgenerator.naquadah.tier.")) { - issueAchievement(player, "alienpower"); - } else if (stack.getUnlocalizedName() - .startsWith("gt.blockmachines.basicmachine.replicator.tier.")) { - issueAchievement(player, "replication"); - } else + if (stack.getUnlocalizedName() + .equals("ic2.itemPartCircuit")) { + issueAchievement(player, "gtbasiccircuit"); + } else + if (stack.getUnlocalizedName() + .equals("ic2.itemPartCircuitAdv")) { + issueAchievement(player, "stepforward"); + } else + if (stack.getUnlocalizedName() + .startsWith("gt.blockmachines.")) { + if (stack.getUnlocalizedName() + .startsWith("gt.blockmachines.basicmachine.arcfurnace.tier.")) { + issueAchievement(player, "recycling"); + } else if (stack.getUnlocalizedName() + .startsWith("gt.blockmachines.basicmachine.disassembler.tier.")) { + issueAchievement(player, "repair"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockmachines.boiler.solar")) { + issueAchievement(player, "simplyeco"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockmachines.boiler.bronze")) { + issueAchievement(player, "firststeam"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockmachines.boiler.steel")) { + issueAchievement(player, "highpressure"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockmachines.bronzemachine.macerator")) { + issueAchievement(player, "macerator"); + issueAchievement(player, "buildMacerator"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockmachines.bronzemachine.alloysmelter")) { + issueAchievement(player, "alloysmelter"); + issueAchievement(player, "buildElecFurnace"); + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.bronzemachine.alloysmelter.tier.3")) { + issueAchievement(player, "buildIndFurnace"); + } + } else + if (stack.getUnlocalizedName() + .equals("gt.blockmachines.bronzemachine.extractor")) { + issueAchievement(player, "extract"); + issueAchievement(player, "buildCompressor"); + issueAchievement(player, "buildExtractor"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.automation.superbuffer.tier.")) { + issueAchievement( + player, + "superbuffer"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.quantum.tank.tier.")) { + issueAchievement( + player, + "whereistheocean"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.quantum.chest.tier.")) { + issueAchievement( + player, + "newstorage"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.basicmachine.hammer.tier.")) { + issueAchievement( + player, + "cheapermac"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.automation.chestbuffer.tier.")) { + issueAchievement( + player, + "buffer"); + issueAchievement( + player, + "buildBatBox"); + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.automation.chestbuffer.tier.3")) { + issueAchievement( + player, + "buildMFE"); + } + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.basicgenerator.steamturbine.tier.")) { + issueAchievement( + player, + "steampower"); + issueAchievement( + player, + "buildGenerator"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.basicmachine.pump.tier.03")) { + issueAchievement( + player, + "slurp"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.basicmachine.assembler.tier.")) { + issueAchievement( + player, + "avengers"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.multimachine.blastfurnace")) { + issueAchievement( + player, + "ebf"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.batterybuffer.")) { + issueAchievement( + player, + "batterys"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.hatch.energy.tier.02")) { + issueAchievement( + player, + "upgradeebf"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.multimachine.multifurnace")) { + issueAchievement( + player, + "highpowersmelt"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.hatch.energy.tier.01")) { + issueAchievement( + player, + "energyhatch"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.multimachine.processingarray")) { + issueAchievement( + player, + "factory"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.basicgenerator.magicenergyconverter.tier.01")) { + issueAchievement( + player, + "magic"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.basicgenerator.magicenergyabsorber.tier.03")) { + issueAchievement( + player, + "highmage"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.basicmachine.amplifab.tier.")) { + issueAchievement( + player, + "amplifier"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.basicmachine.massfab.tier.")) { + issueAchievement( + player, + "universal"); + issueAchievement( + player, + "buildMassFab"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.basicgenerator.naquadah.tier.")) { + issueAchievement( + player, + "alienpower"); + } else + if (stack.getUnlocalizedName() + .startsWith( + "gt.blockmachines.basicmachine.replicator.tier.")) { + issueAchievement( + player, + "replication"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.basicgenerator.plasmagenerator.tier.07")) { + issueAchievement( + player, + "fullefficiency"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.multimachine.largeturbine")) { + issueAchievement( + player, + "muchsteam"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.multimachine.largehpturbine")) { + issueAchievement( + player, + "efficientsteam"); + } else + if (stack.getUnlocalizedName() + .equals( + "gt.blockmachines.multimachine.cleanroom")) { + issueAchievement( + player, + "gtcleanroom"); + } + } else + if (stack.getUnlocalizedName() + .equals("gt.neutronreflector")) { + issueAchievement(player, "reflect"); + } else if (stack.getUnlocalizedName() - .equals("gt.blockmachines.basicgenerator.plasmagenerator.tier.07")) { - issueAchievement(player, "fullefficiency"); - } else - if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.largeturbine")) { - issueAchievement(player, "muchsteam"); - } else if (stack.getUnlocalizedName() - .equals("gt.blockmachines.multimachine.largehpturbine")) { - issueAchievement(player, "efficientsteam"); - } else - if (stack.getUnlocalizedName().equals("gt.blockmachines.multimachine.cleanroom")) { - issueAchievement(player, "gtcleanroom"); - } - } else if (stack.getUnlocalizedName().equals("gt.neutronreflector")) { - issueAchievement(player, "reflect"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.1")) { - issueAchievement(player, "upgrade"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.2")) { - issueAchievement(player, "upgrade2"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.3")) { - issueAchievement(player, "upgrade3"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.4")) { - issueAchievement(player, "upgrade4"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.5")) { - issueAchievement(player, "upgrade5"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.6")) { - issueAchievement(player, "over9000"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings.15")) { - issueAchievement(player, "conducting"); - } + .equals("gt.blockcasings5.1")) { + issueAchievement(player, "upgrade"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockcasings5.2")) { + issueAchievement(player, "upgrade2"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockcasings5.3")) { + issueAchievement(player, "upgrade3"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockcasings5.4")) { + issueAchievement(player, "upgrade4"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockcasings5.5")) { + issueAchievement(player, "upgrade5"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockcasings5.6")) { + issueAchievement(player, "over9000"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockcasings.15")) { + issueAchievement(player, "conducting"); + } } @SubscribeEvent @@ -726,38 +900,48 @@ public class GT_Achievements { if (data.mMaterial.mMaterial != Materials.Gunpowder) { issueAchievement(player, "cleandust"); } - } else if (data.mPrefix.name().startsWith("ore")) { - int data_getAllMaterialStacks_sS = data.getAllMaterialStacks().size(); - for (int i = 0; i < data_getAllMaterialStacks_sS; i++) { - issueAchievement(player, data.getAllMaterialStacks().get(i).mMaterial.mName); - if (data.getAllMaterialStacks().get(i).mMaterial == Materials.AnyIron) { - issueAchievement(player, "iron"); - } - if (data.getAllMaterialStacks().get(i).mMaterial == Materials.Copper - || data.getAllMaterialStacks().get(i).mMaterial == Materials.Tin) { - issueAchievement(event.entityPlayer, "mineOre"); - } + } else if (data.mPrefix.name() + .startsWith("ore")) { + int data_getAllMaterialStacks_sS = data.getAllMaterialStacks() + .size(); + for (int i = 0; i < data_getAllMaterialStacks_sS; i++) { + issueAchievement( + player, + data.getAllMaterialStacks() + .get(i).mMaterial.mName); + if (data.getAllMaterialStacks() + .get(i).mMaterial == Materials.AnyIron) { + issueAchievement(player, "iron"); + } + if (data.getAllMaterialStacks() + .get(i).mMaterial == Materials.Copper + || data.getAllMaterialStacks() + .get(i).mMaterial == Materials.Tin) { + issueAchievement(event.entityPlayer, "mineOre"); + } + } + } else + if (data.mPrefix == OrePrefixes.crushed) { + issueAchievement(player, "crushed"); + } else if (data.mPrefix == OrePrefixes.crushedPurified) { + issueAchievement(player, "washing"); + } else if (data.mPrefix == OrePrefixes.crushedCentrifuged) { + issueAchievement(player, "spinit"); + } else if (data.mMaterial.mMaterial == Materials.Steel) { + if (data.mPrefix == OrePrefixes.ingot && stack.stackSize == stack.getMaxStackSize()) { + issueAchievement(player, "steel"); + } else if (data.mPrefix == OrePrefixes.nugget && Thaumcraft.isModLoaded() + && ThaumcraftApiHelper.isResearchComplete(player.getDisplayName(), "GT_IRON_TO_STEEL")) { + issueAchievement(player, "steel"); + } + // } else if (data.mPrefix == OrePrefixes.circuit && data.mMaterial.mMaterial == + // Materials.Advanced) { + // issueAchievement(player, "stepforward"); } - } else if (data.mPrefix == OrePrefixes.crushed) { - issueAchievement(player, "crushed"); - } else if (data.mPrefix == OrePrefixes.crushedPurified) { - issueAchievement(player, "washing"); - } else if (data.mPrefix == OrePrefixes.crushedCentrifuged) { - issueAchievement(player, "spinit"); - } else if (data.mMaterial.mMaterial == Materials.Steel) { - if (data.mPrefix == OrePrefixes.ingot && stack.stackSize == stack.getMaxStackSize()) { - issueAchievement(player, "steel"); - } else if (data.mPrefix == OrePrefixes.nugget && Thaumcraft.isModLoaded() - && ThaumcraftApiHelper.isResearchComplete(player.getDisplayName(), "GT_IRON_TO_STEEL")) { - issueAchievement(player, "steel"); - } - // } else if (data.mPrefix == OrePrefixes.circuit && data.mMaterial.mMaterial == - // Materials.Advanced) { - // issueAchievement(player, "stepforward"); - } } // GT_FML_LOGGER.info(stack.getUnlocalizedName()); - if (stack.getUnlocalizedName().startsWith("gt.metaitem.")) { + if (stack.getUnlocalizedName() + .startsWith("gt.metaitem.")) { switch (stack.getUnlocalizedName()) { case "gt.metaitem.02.32500": issueAchievement(player, "havestlead"); @@ -841,46 +1025,72 @@ public class GT_Achievements { issueAchievement(player, "gtwetmain"); break; } - } else if (stack.getUnlocalizedName().equals("gt.Thoriumcell")) { - issueAchievement(player, "newfuel"); - } else if ((stack.getItem() == Ic2Items.quantumBodyarmor.getItem()) - || (stack.getItem() == Ic2Items.quantumBoots.getItem()) - || (stack.getItem() == Ic2Items.quantumHelmet.getItem()) - || (stack.getItem() == Ic2Items.quantumLeggings.getItem())) { - issueAchievement(player, "buildQArmor"); - } else - if (stack.getUnlocalizedName().equals("ic2.itemPartCircuitAdv")) { - issueAchievement(player, "stepforward"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.1")) { - issueAchievement(player, "upgrade"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.2")) { - issueAchievement(player, "upgrade2"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.3")) { - issueAchievement(player, "upgrade3"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.4")) { - issueAchievement(player, "upgrade4"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.5")) { - issueAchievement(player, "upgrade5"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings5.6")) { - issueAchievement(player, "over9000"); - } else if (stack.getUnlocalizedName().equals("gt.blockcasings.15")) { - issueAchievement(player, "conducting"); - } - if (player.capabilities.isCreativeMode && stack.getUnlocalizedName().equals("gt.metaitem.01.32761")) { // Debug - // Scanner - // pickup - // shows - // all - // assline - // recipes. + } else if (stack.getUnlocalizedName() + .equals("gt.Thoriumcell")) { + issueAchievement(player, "newfuel"); + } else + if ((stack.getItem() == Ic2Items.quantumBodyarmor.getItem()) + || (stack.getItem() == Ic2Items.quantumBoots.getItem()) + || (stack.getItem() == Ic2Items.quantumHelmet.getItem()) + || (stack.getItem() == Ic2Items.quantumLeggings.getItem())) { + issueAchievement(player, "buildQArmor"); + } else + if (stack.getUnlocalizedName() + .equals("ic2.itemPartCircuitAdv")) { + issueAchievement(player, "stepforward"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockcasings5.1")) { + issueAchievement(player, "upgrade"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockcasings5.2")) { + issueAchievement(player, "upgrade2"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockcasings5.3")) { + issueAchievement(player, "upgrade3"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockcasings5.4")) { + issueAchievement(player, "upgrade4"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockcasings5.5")) { + issueAchievement(player, "upgrade5"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockcasings5.6")) { + issueAchievement(player, "over9000"); + } else + if (stack.getUnlocalizedName() + .equals("gt.blockcasings.15")) { + issueAchievement(player, "conducting"); + } + if (player.capabilities.isCreativeMode && stack.getUnlocalizedName() + .equals("gt.metaitem.01.32761")) { // Debug + // Scanner + // pickup + // shows + // all + // assline + // recipes. for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList) { - issueAchievement(player, recipe.getOutput(0).getUnlocalizedName()); + issueAchievement( + player, + recipe.getOutput(0) + .getUnlocalizedName()); recipe.mHidden = false; } } for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList) { - if (recipe.getOutput(0).getUnlocalizedName().equals(stack.getUnlocalizedName())) { - issueAchievement(player, recipe.getOutput(0).getUnlocalizedName()); + if (recipe.getOutput(0) + .getUnlocalizedName() + .equals(stack.getUnlocalizedName())) { + issueAchievement( + player, + recipe.getOutput(0) + .getUnlocalizedName()); recipe.mHidden = false; } } diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index fc5d79572f..c6ac61d95c 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -72,8 +72,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.VANILLA); }, dis -> { - IBeeMutationCustom tMutation = dis - .registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Diligent"), 10); + IBeeMutationCustom tMutation = dis.registerMutation( + getSpecies(FORESTRY, "Industrious"), + getSpecies(FORESTRY, "Diligent"), + 10); tMutation.requireResource(Blocks.clay, 0); // blockStainedHardenedClay }), SLIMEBALL(GT_BranchDefinition.ORGANIC, "SlimeBall", true, new Color(0x4E9E55), new Color(0x00FF15), beeSpecies -> { @@ -264,8 +266,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { - IBeeMutationCustom tMutation = dis - .registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Demonic"), 10); + IBeeMutationCustom tMutation = dis.registerMutation( + getSpecies(FORESTRY, "Industrious"), + getSpecies(FORESTRY, "Demonic"), + 10); tMutation.requireResource("blockRedstone"); }), LAPIS(GT_BranchDefinition.GEM, "Lapis", true, new Color(0x1947D1), new Color(0x476CDA), beeSpecies -> { @@ -274,8 +278,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); }, template -> AlleleHelper.instance.set(template, SPEED, Speed.SLOWER), dis -> { - IBeeMutationCustom tMutation = dis - .registerMutation(getSpecies(FORESTRY, "Demonic"), getSpecies(FORESTRY, "Imperial"), 10); + IBeeMutationCustom tMutation = dis.registerMutation( + getSpecies(FORESTRY, "Demonic"), + getSpecies(FORESTRY, "Imperial"), + 10); tMutation.requireResource("blockLapis"); }), CERTUS(GT_BranchDefinition.GEM, "CertusQuartz", true, new Color(0x57CFFB), new Color(0xBBEEFF), beeSpecies -> { @@ -669,10 +675,14 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.SNOW); AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectGlacial); }, dis -> { - IBeeMutationCustom tMutation = dis - .registerMutation(getSpecies(FORESTRY, "Icy"), getSpecies(FORESTRY, "Glacial"), 10); + IBeeMutationCustom tMutation = dis.registerMutation( + getSpecies(FORESTRY, "Icy"), + getSpecies(FORESTRY, "Glacial"), + 10); tMutation.requireResource( - Block.getBlockFromItem(GT_ModHandler.getModItem("IC2", "fluidCoolant", 1).getItem()), + Block.getBlockFromItem( + GT_ModHandler.getModItem("IC2", "fluidCoolant", 1) + .getItem()), 0); tMutation.restrictTemperature(ICY); }), @@ -691,10 +701,14 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.NETHER); AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); }, dis -> { - IBeeMutationCustom tMutation = dis - .registerMutation(getSpecies(FORESTRY, "Demonic"), getSpecies(EXTRABEES, "volcanic"), 10); + IBeeMutationCustom tMutation = dis.registerMutation( + getSpecies(FORESTRY, "Demonic"), + getSpecies(EXTRABEES, "volcanic"), + 10); tMutation.requireResource( - Block.getBlockFromItem(GT_ModHandler.getModItem("IC2", "fluidHotCoolant", 1).getItem()), + Block.getBlockFromItem( + GT_ModHandler.getModItem("IC2", "fluidHotCoolant", 1) + .getItem()), 0); tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(128, "Boneyard Biome")); // Boneyard Biome }), @@ -837,8 +851,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); AlleleHelper.instance.set(template, FLOWERING, Flowering.FAST); }, dis -> { - IBeeMutationCustom tMutation = dis - .registerMutation(ENERGETICALLOY, getSpecies(FORESTRY, "Phantasmal"), 6); + IBeeMutationCustom tMutation = dis.registerMutation( + ENERGETICALLOY, + getSpecies(FORESTRY, "Phantasmal"), + 6); tMutation.requireResource("blockVibrantAlloy"); tMutation.restrictTemperature(HOT, HELLISH); }), @@ -941,8 +957,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.UP_1); AlleleHelper.instance.set(template, FLOWER_PROVIDER, Flowers.JUNGLE); }, dis -> { - IBeeMutationCustom tMutation = dis - .registerMutation(getSpecies(MAGICBEES, "TCFire"), getSpecies(FORESTRY, "Edenic"), 10); + IBeeMutationCustom tMutation = dis.registerMutation( + getSpecies(MAGICBEES, "TCFire"), + getSpecies(FORESTRY, "Edenic"), + 10); tMutation.requireResource("blockThaumium"); tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(192, "Magical Forest")); // magical // forest @@ -1105,8 +1123,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); AlleleHelper.instance.set(template, NOCTURNAL, true); }, dis -> { - IBeeMutationCustom tMutation = dis - .registerMutation(getSpecies(MAGICBEES, "TCChaos"), getSpecies(MAGICBEES, "TCVoid"), 6); + IBeeMutationCustom tMutation = dis.registerMutation( + getSpecies(MAGICBEES, "TCChaos"), + getSpecies(MAGICBEES, "TCVoid"), + 6); if (TaintedMagic.isModLoaded()) { tMutation.requireResource("blockShadow"); } @@ -1155,8 +1175,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectAggressive); AlleleHelper.instance.set(template, FLOWERING, Flowering.AVERAGE); }, dis -> { - IBeeMutationCustom tMutation = dis - .registerMutation(getSpecies(MAGICBEES, "Withering"), getSpecies(MAGICBEES, "Draconic"), 1); + IBeeMutationCustom tMutation = dis.registerMutation( + getSpecies(MAGICBEES, "Withering"), + getSpecies(MAGICBEES, "Draconic"), + 1); tMutation.requireResource(GregTech_API.sBlockGem3, 3); tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(9, "END Biome")); // sky end biome }), @@ -1260,7 +1282,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); }, dis -> { - IMutationCustom tMutation = dis.registerMutation(COAL, URANIUM, 3).setIsSecret(); + IMutationCustom tMutation = dis.registerMutation(COAL, URANIUM, 3) + .setIsSecret(); tMutation.requireResource(GregTech_API.sBlockMetal7, 5); }), LUTETIUM(GT_BranchDefinition.RADIOACTIVE, "Lutetium", false, new Color(0xE6FFE6), new Color(0xFFFFFF), @@ -1275,7 +1298,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); }, dis -> { IMutationCustom tMutation = dis.registerMutation(THORIUM, getSpecies(EXTRABEES, "rotten"), 1) - .setIsSecret(); + .setIsSecret(); tMutation.requireResource(GregTech_API.sBlockMetal4, 3); }), AMERICIUM(GT_BranchDefinition.RADIOACTIVE, "Americium", false, new Color(0xE6E6FF), new Color(0xC8C8C8), @@ -1291,7 +1314,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); }, dis -> { - IMutationCustom tMutation = dis.registerMutation(LUTETIUM, CHROME, 5, 4).setIsSecret(); + IMutationCustom tMutation = dis.registerMutation(LUTETIUM, CHROME, 5, 4) + .setIsSecret(); tMutation.requireResource(GregTech_API.sBlockMetal1, 2); }), NEUTRONIUM(GT_BranchDefinition.RADIOACTIVE, "Neutronium", false, new Color(0xFFF0F0), new Color(0xFAFAFA), @@ -1305,7 +1329,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, LIFESPAN, Lifespan.LONGEST); AlleleHelper.instance.set(template, NOCTURNAL, true); }, dis -> { - IMutationCustom tMutation = dis.registerMutation(NAQUADRIA, AMERICIUM, 2, 2).setIsSecret(); + IMutationCustom tMutation = dis.registerMutation(NAQUADRIA, AMERICIUM, 2, 2) + .setIsSecret(); tMutation.requireResource(GregTech_API.sBlockMetal5, 2); }), // Twilight @@ -1319,8 +1344,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, SPEED, Speed.FAST); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); }, dis -> { - IBeeMutationCustom tMutation = dis - .registerMutation(getSpecies(MAGICBEES, "Eldritch"), getSpecies(FORESTRY, "Imperial"), 8); + IBeeMutationCustom tMutation = dis.registerMutation( + getSpecies(MAGICBEES, "Eldritch"), + getSpecies(FORESTRY, "Imperial"), + 8); tMutation.restrictHumidity(DAMP); }), LICH(GT_BranchDefinition.TWILIGHT, "Lich", true, new Color(0xC5C5C5), new Color(0x5C605E), beeSpecies -> { @@ -1455,8 +1482,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, dis -> { IBeeMutationCustom tMutation = dis.registerMutation(THAUMIUMSHARD, ENDDUST, 5); tMutation.restrictHumidity(ARID); - if (HardcoreEnderExpansion.isModLoaded()) tMutation - .requireResource(GameRegistry.findBlock(HardcoreEnderExpansion.modID, "laboratory_floor"), 0); + if (HardcoreEnderExpansion.isModLoaded()) tMutation.requireResource( + GameRegistry.findBlock(HardcoreEnderExpansion.modID, "laboratory_floor"), + 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End")); // End Dim }), DRAGONESSENCE(GT_BranchDefinition.HEE, "Dragonessence", true, new Color(0xFFA12B), new Color(0x911ECE), @@ -1545,7 +1573,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, TEMPERATURE_TOLERANCE, Tolerance.NONE); AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.NONE); }, dis -> { - IMutationCustom tMutation = dis.registerMutation(DRAGONESSENCE, STARDUST, 2).setIsSecret(); + IMutationCustom tMutation = dis.registerMutation(DRAGONESSENCE, STARDUST, 2) + .setIsSecret(); tMutation.restrictHumidity(ARID); if (EnderStorage.isModLoaded()) tMutation.requireResource(GameRegistry.findBlock(EnderStorage.modID, "enderChest"), 0); @@ -1564,8 +1593,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); AlleleHelper.instance.set(template, NOCTURNAL, true); }, dis -> { - IBeeMutationCustom tMutation = dis - .registerMutation(getSpecies(MAGICBEES, "Watery"), getSpecies(MAGICBEES, "Catty"), 45, 2); + IBeeMutationCustom tMutation = dis.registerMutation( + getSpecies(MAGICBEES, "Watery"), + getSpecies(MAGICBEES, "Catty"), + 45, + 2); if (ExtraCells2.isModLoaded()) { tMutation.requireResource(GameRegistry.findBlock(ExtraCells2.modID, "walrus"), 0); } @@ -1577,8 +1609,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); }, template -> {}, dis -> { - IBeeMutationCustom tMutation = dis - .registerMutation(getSpecies(FORESTRY, "Industrious"), getSpecies(FORESTRY, "Heroic"), 10); + IBeeMutationCustom tMutation = dis.registerMutation( + getSpecies(FORESTRY, "Industrious"), + getSpecies(FORESTRY, "Heroic"), + 10); tMutation.restrictTemperature(ICY); }), METEORICIRON(GT_BranchDefinition.SPACE, "MeteoricIron", true, new Color(0x321928), new Color(0x643250), @@ -1754,8 +1788,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { // Planet Line MOON(GT_BranchDefinition.PLANET, "Moon", false, new Color(0x373735), new Color(0x7E7E78), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MOON), 0.35f); - if (NewHorizonsCoreMod.isModLoaded()) beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MoonStoneDust", 1, 0), 0.10f); + if (NewHorizonsCoreMod.isModLoaded()) beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MoonStoneDust", 1, 0), + 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); beeSpecies.setNocturnal(); @@ -1783,8 +1818,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), PHOBOS(GT_BranchDefinition.PLANET, "Phobos", true, new Color(0x220D05), new Color(0x7a5706), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.25f); - if (NewHorizonsCoreMod.isModLoaded()) beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.PhobosStoneDust", 1, 0), 0.10f); + if (NewHorizonsCoreMod.isModLoaded()) beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.PhobosStoneDust", 1, 0), + 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); @@ -1796,8 +1832,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), DEIMOS(GT_BranchDefinition.PLANET, "Deimos", true, new Color(0x220D05), new Color(0x7a3206), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.25f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.DeimosStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.DeimosStoneDust", 1, 0), + 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); @@ -1824,11 +1861,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty( GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoStoneDust", 1, 0), 0.05f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoIceDust", 1, 0), 0.05f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoIceDust", 1, 0), + 0.05f); beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.IoStoneDust", 1, 0), 0.05f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaStoneDust", 1, 0), + 0.05f); beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaIceDust", 1, 0), 0.05f); beeSpecies.addSpecialty( GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.GanymedeStoneDust", 1, 0), @@ -1857,8 +1896,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), EUROPA(GT_BranchDefinition.PLANET, "Europa", true, new Color(0x5982ea), new Color(0x0b36a3), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaStoneDust", 1, 0), + 0.10f); beeSpecies.addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EuropaIceDust", 1, 0), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(ICY); @@ -1888,8 +1928,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty( GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoStoneDust", 1, 0), 0.10f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoIceDust", 1, 0), 0.10f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CallistoIceDust", 1, 0), + 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); @@ -1905,8 +1946,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty( GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusStoneDust", 1, 0), 0.05f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusIceDust", 1, 0), 0.05f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusIceDust", 1, 0), + 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); beeSpecies.setHasEffect(); @@ -1921,8 +1963,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty( GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusStoneDust", 1, 0), 0.10f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusIceDust", 1, 0), 0.10f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.EnceladusIceDust", 1, 0), + 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(ICY); beeSpecies.setHasEffect(); @@ -1945,10 +1988,12 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), URANUS(GT_BranchDefinition.PLANET, "Uranus", false, new Color(0x75C0C9), new Color(0x84D8EC), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.35f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MirandaStoneDust", 1, 0), 0.05f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.OberonStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MirandaStoneDust", 1, 0), + 0.05f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.OberonStoneDust", 1, 0), + 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(ICY); beeSpecies.setHasEffect(); @@ -1960,8 +2005,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), MIRANDA(GT_BranchDefinition.PLANET, "Miranda", true, new Color(0x75C0C9), new Color(0x0d211c), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.25f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MirandaStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.MirandaStoneDust", 1, 0), + 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); @@ -1973,8 +2019,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), OBERON(GT_BranchDefinition.PLANET, "Oberon", true, new Color(0x4A4033), new Color(0xB5A288), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.25f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.OberonStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.OberonStoneDust", 1, 0), + 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { @@ -1985,10 +2032,12 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), NEPTUNE(GT_BranchDefinition.PLANET, "Neptune", false, new Color(0x334CFF), new Color(0x576DFF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.35f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ProteusStoneDust", 1, 0), 0.05f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TritonStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ProteusStoneDust", 1, 0), + 0.05f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TritonStoneDust", 1, 0), + 0.05f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(COLD); beeSpecies.setNocturnal(); @@ -2001,8 +2050,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), PROTEUS(GT_BranchDefinition.PLANET, "Proteus", true, new Color(0x334CFF), new Color(0x592610), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.25f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ProteusStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ProteusStoneDust", 1, 0), + 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); beeSpecies.setNocturnal(); @@ -2014,8 +2064,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), TRITON(GT_BranchDefinition.PLANET, "Triton", true, new Color(0x334CFF), new Color(0x421118), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.25f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TritonStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TritonStoneDust", 1, 0), + 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); @@ -2041,8 +2092,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), HAUMEA(GT_BranchDefinition.PLANET, "Haumea", false, new Color(0x1C1413), new Color(0x392B28), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.HAUMEA), 0.35f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.HaumeaStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.HaumeaStoneDust", 1, 0), + 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { @@ -2097,8 +2149,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), TCETI(GT_BranchDefinition.PLANET, "tCeti", false, new Color(0x46241A), new Color(0x7B412F), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TCETI), 0.35f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1, 0), 0.05f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1, 0), + 0.05f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setNocturnal(); @@ -2111,8 +2164,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), TCETIE(GT_BranchDefinition.PLANET, "tCetiE", false, new Color(0x2d561b), new Color(0x0c0f60), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TCETI), 0.25f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1, 0), 0.10f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1, 0), + 0.10f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); @@ -2125,8 +2179,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { // Parents: TCETI and TCETIE, 25% combchance, needs Damp Humidity and Normal temperature. Is Mycophilic SEAWEED(GT_BranchDefinition.PLANET, "SeaWeed", true, new Color(0xCBCBCB), new Color(0x83FF83), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SEAWEED), 0.25f); - beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1, 0), 0.15f); + beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TCetiEStoneDust", 1, 0), + 0.15f); beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setHasEffect(); @@ -2216,8 +2271,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { }), VEGAB(GT_BranchDefinition.PLANET, "VegaB", false, new Color(0x1A2036), new Color(0x81e261), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VEGA), 0.35f); - if (NewHorizonsCoreMod.isModLoaded()) beeSpecies - .addSpecialty(GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.VegaBStoneDust", 1, 0), 0.10f); + if (NewHorizonsCoreMod.isModLoaded()) beeSpecies.addSpecialty( + GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.VegaBStoneDust", 1, 0), + 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(COLD); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { @@ -2278,7 +2334,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST); AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "blindness")); }, dis -> { - IMutationCustom tMutation = dis.registerMutation(DOB, COSMICNEUTRONIUM, 3, 10).setIsSecret(); + IMutationCustom tMutation = dis.registerMutation(DOB, COSMICNEUTRONIUM, 3, 10) + .setIsSecret(); if (Avaritia.isModLoaded()) { tMutation.requireResource(GameRegistry.findBlock(Avaritia.modID, "Resource_Block"), 1); } @@ -2425,8 +2482,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHumidity(DAMP); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { - IBeeMutationCustom tMutation = dis - .registerMutation(getSpecies(MAGICBEES, "Supernatural"), getSpecies(MAGICBEES, "Windy"), 15); + IBeeMutationCustom tMutation = dis.registerMutation( + getSpecies(MAGICBEES, "Supernatural"), + getSpecies(MAGICBEES, "Windy"), + 15); tMutation.restrictTemperature(HOT); if (Thaumcraft.isModLoaded()) tMutation.requireResource(GameRegistry.findBlock(Thaumcraft.modID, "blockCrystal"), 0); @@ -2539,7 +2598,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { this.mAlleles = aAlleles; this.mMutations = aMutations; this.mSpeciesProperties = aSpeciesProperties; - String lowercaseName = this.toString().toLowerCase(Locale.ENGLISH); + String lowercaseName = this.toString() + .toLowerCase(Locale.ENGLISH); String species = WordUtils.capitalize(lowercaseName); String uid = "gregtech.bee.species" + species; diff --git a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java index ff44ae8591..e7895837d0 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java @@ -147,7 +147,10 @@ public enum GT_BranchDefinition { private final Consumer<IAllele[]> mBranchProperties; GT_BranchDefinition(String scientific, Consumer<IAllele[]> aBranchProperties) { - this.branch = BeeManager.beeFactory.createBranch(this.name().toLowerCase(), scientific); + this.branch = BeeManager.beeFactory.createBranch( + this.name() + .toLowerCase(), + scientific); this.mBranchProperties = aBranchProperties; } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java index bdd1109a93..39b33b2d5f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingAll.java @@ -15,8 +15,10 @@ public class ProcessingAll implements gregtech.api.interfaces.IOreRecipeRegistra @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - if (((aStack.getItem() instanceof net.minecraft.item.ItemBlock)) - && (aPrefix.mDefaultStackSize < aStack.getItem().getItemStackLimit(aStack))) - aStack.getItem().setMaxStackSize(aPrefix.mDefaultStackSize); + if (((aStack.getItem() instanceof net.minecraft.item.ItemBlock)) && (aPrefix.mDefaultStackSize + < aStack.getItem() + .getItemStackLimit(aStack))) + aStack.getItem() + .setMaxStackSize(aPrefix.mDefaultStackSize); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java index 6c1d1896b1..9eb2fe13e0 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingArrows.java @@ -89,9 +89,9 @@ public class ProcessingArrows implements gregtech.api.interfaces.IOreRecipeRegis GT_Utility.ItemNBT.addEnchantment( tOutput, gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE, - EnchantmentHelper - .getEnchantmentLevel(gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, tOutput) - + 1); + EnchantmentHelper.getEnchantmentLevel( + gregtech.api.enchants.Enchantment_EnderDamage.INSTANCE.effectId, + tOutput) + 1); GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), Materials.Mercury.getFluid(25L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index 4043ea02aa..c9345964f1 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -38,10 +38,26 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1L, aStack)); - if (tStack1 != null) GT_ModHandler - .removeRecipeDelayed(tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1, tStack1); - if (tStack2 != null) GT_ModHandler - .removeRecipeDelayed(tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2, tStack2); + if (tStack1 != null) GT_ModHandler.removeRecipeDelayed( + tStack1, + tStack1, + tStack1, + tStack1, + tStack1, + tStack1, + tStack1, + tStack1, + tStack1); + if (tStack2 != null) GT_ModHandler.removeRecipeDelayed( + tStack2, + tStack2, + tStack2, + tStack2, + tStack2, + tStack2, + tStack2, + tStack2, + tStack2); if (tStack3 != null) { GT_ModHandler.removeRecipeDelayed( tStack3, @@ -69,7 +85,8 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist } if (GregTech_API.sRecipeFile.get( ConfigCategories.Recipes.storageblockcrafting, - OrePrefixes.block.get(aMaterial).toString(), + OrePrefixes.block.get(aMaterial) + .toString(), false)) { if ((tStack1 == null) && (tStack2 == null) && (tStack3 != null)) GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L), @@ -90,7 +107,8 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist if (GregTech_API.sRecipeFile.get( ConfigCategories.Recipes.storageblockdecrafting, - OrePrefixes.block.get(aMaterial).toString(), + OrePrefixes.block.get(aMaterial) + .toString(), tStack2 != null)) { if (tStack3 != null) GT_ModHandler.addShapelessCraftingRecipe(tStack3, new Object[] { OrePrefixes.block.get(aMaterial) }); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java index aa478a5560..e088330204 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -60,8 +60,10 @@ public class ProcessingCell implements IOreRecipeRegistrator { } else { tStack = GT_OreDictUnificator.get(OrePrefixes.dust, tMat.mMaterial, tMat.mAmount); if (tStack == null) { - tStack = GT_OreDictUnificator - .get(OrePrefixes.cell, tMat.mMaterial, tMat.mAmount); + tStack = GT_OreDictUnificator.get( + OrePrefixes.cell, + tMat.mMaterial, + tMat.mAmount); } } if (tItemAmount + tMat.mAmount * 3628800L @@ -81,8 +83,8 @@ public class ProcessingCell implements IOreRecipeRegistrator { tList.add(GT_Utility.copyAmount(64L, tStack)); tStack.stackSize -= 64; } - int tThisCapsuleCount = GT_ModHandler - .getCapsuleCellContainerCountMultipliedWithStackSize(tStack); + int tThisCapsuleCount = GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( + tStack); if (tStack.stackSize > 0 && tCapsuleCount + tThisCapsuleCount <= 64L) { if (tCapsuleCount + tThisCapsuleCount < 0L ? tList.size() < 5 : tList.size() < 6) { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java index 9062533d93..2a6678c485 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java @@ -26,7 +26,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.addBrewingRecipe(aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.tea"), false); GT_Values.RA.addBrewingRecipe( aStack, - GT_ModHandler.getDistilledWater(1L).getFluid(), + GT_ModHandler.getDistilledWater(1L) + .getFluid(), FluidRegistry.getFluid("potion.tea"), false); break; @@ -38,7 +39,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr false); GT_Values.RA.addBrewingRecipe( aStack, - GT_ModHandler.getDistilledWater(1L).getFluid(), + GT_ModHandler.getDistilledWater(1L) + .getFluid(), FluidRegistry.getFluid("potion.grapejuice"), false); break; @@ -72,7 +74,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr true); GT_Values.RA.addBrewingRecipe( aStack, - GT_ModHandler.getDistilledWater(1L).getFluid(), + GT_ModHandler.getDistilledWater(1L) + .getFluid(), FluidRegistry.getFluid("potion.potatojuice"), true); break; @@ -90,7 +93,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr false); GT_Values.RA.addBrewingRecipe( aStack, - GT_ModHandler.getDistilledWater(1L).getFluid(), + GT_ModHandler.getDistilledWater(1L) + .getFluid(), FluidRegistry.getFluid("potion.lemonjuice"), false); GT_Values.RA.addBrewingRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 75ba5cc4af..8df5270399 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -33,8 +33,11 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr ItemStack aStack) { switch (aPrefix) { case dust: - if (aMaterial.mFuelPower > 0) GT_Values.RA - .addFuel(GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); + if (aMaterial.mFuelPower > 0) GT_Values.RA.addFuel( + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower, + aMaterial.mFuelType); if (GT_Utility.getFluidForFilledItem(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), true) == null) GT_Values.RA.addCannerRecipe( @@ -69,8 +72,11 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr null, null, aMaterial.mBlastFurnaceTemp > 1750 - ? GT_OreDictUnificator - .get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) + ? GT_OreDictUnificator.get( + OrePrefixes.ingotHot, + aMaterial.mSmeltInto, + tDustStack, + 1L) : GT_Utility.copyAmount(1L, tDustStack), null, (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, @@ -134,11 +140,11 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } if ((tDustStack.stackSize > 0) && (tList.size() < 6) && (tCapsuleCount - + GT_ModHandler - .getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack) + + GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( + tDustStack) <= 64L)) { - tCapsuleCount += GT_ModHandler - .getCapsuleCellContainerCountMultipliedWithStackSize(tDustStack); + tCapsuleCount += GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( + tDustStack); tList.add(tDustStack); } } @@ -154,8 +160,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr && ((tFluid = GT_Utility.getFluidForFilledItem((ItemStack) tList.get(i), true)) != null)) { tFluid.amount *= tList.get(i).stackSize; - tCapsuleCount -= GT_ModHandler - .getCapsuleCellContainerCountMultipliedWithStackSize((ItemStack) tList.get(i)); + tCapsuleCount -= GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( + (ItemStack) tList.get(i)); tList.remove(i); break; } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java index 42b5571b2b..f8b1519b8a 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java @@ -46,7 +46,10 @@ public class ProcessingDye implements IOreRecipeRegistrator { null, null, Materials.Water.getFluid(216L), - FluidRegistry.getFluidStack("dye.watermixed." + aDye.name().toLowerCase(Locale.ENGLISH), 192), + FluidRegistry.getFluidStack( + "dye.watermixed." + aDye.name() + .toLowerCase(Locale.ENGLISH), + 192), null, 16, 4); @@ -56,7 +59,10 @@ public class ProcessingDye implements IOreRecipeRegistrator { null, null, GT_ModHandler.getDistilledWater(288L), - FluidRegistry.getFluidStack("dye.watermixed." + aDye.name().toLowerCase(Locale.ENGLISH), 216), + FluidRegistry.getFluidStack( + "dye.watermixed." + aDye.name() + .toLowerCase(Locale.ENGLISH), + 216), null, 16, 4); @@ -64,7 +70,10 @@ public class ProcessingDye implements IOreRecipeRegistrator { GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 2), Materials.SulfuricAcid.getFluid(432), - FluidRegistry.getFluidStack("dye.chemical." + aDye.name().toLowerCase(Locale.ENGLISH), 288), + FluidRegistry.getFluidStack( + "dye.chemical." + aDye.name() + .toLowerCase(Locale.ENGLISH), + 288), GT_Values.NI, 600, 48); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java index bfd85af1a4..27a11896f6 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java @@ -31,8 +31,11 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr break; case "foodDough": GT_ModHandler.removeFurnaceSmelting(aStack); - GT_Values.RA - .addBenderRecipe(GT_Utility.copyAmount(1L, aStack), ItemList.Food_Flat_Dough.get(1L), 16, 4); + GT_Values.RA.addBenderRecipe( + GT_Utility.copyAmount(1L, aStack), + ItemList.Food_Flat_Dough.get(1L), + 16, + 4); GT_Values.RA.addMixerRecipe( aStack, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 0a3315a259..5bc183a1da 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -232,8 +232,11 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 16); break; case gemFlawed: - if (aFuelPower) GT_Values.RA - .addFuel(GT_Utility.copyAmount(1L, aStack), null, aMaterial.mFuelPower, aMaterial.mFuelType); + if (aFuelPower) GT_Values.RA.addFuel( + GT_Utility.copyAmount(1L, aStack), + null, + aMaterial.mFuelPower, + aMaterial.mFuelType); if (!aNoWorking) { GT_Values.RA.addLatheRecipe( GT_Utility.copyAmount(1L, aStack), @@ -305,8 +308,11 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra new Object[] { "X", "m", 'X', OrePrefixes.gemFlawless.get(aMaterial) }); } } - GT_Values.RA - .addForgeHammerRecipe(aStack, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), 64, 16); + GT_Values.RA.addForgeHammerRecipe( + aStack, + GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 2L), + 64, + 16); for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver // Recipe // adder diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java index bc2534204a..fbc0766f81 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java @@ -52,8 +52,14 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist } } GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); - GT_RecipeRegistrator - .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); + GT_RecipeRegistrator.registerReverseMacerating( + aStack, + aMaterial, + aPrefix.mMaterialAmount, + null, + null, + null, + false); if (aMaterial.mSmeltInto.mArcSmeltInto != aMaterial) { GT_RecipeRegistrator.registerReverseArcSmelting( GT_Utility.copyAmount(1L, aStack), @@ -141,8 +147,10 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // Enable crafting with hammer if tier is < IV. if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq && GregTech_API.sRecipeFile - .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile.get( + ConfigCategories.Tools.hammermultiingot, + aMaterial.toString(), + true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotDouble, aMaterial, 1L), GT_Proxy.tBits, @@ -164,8 +172,10 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist (int) Math.max(aMaterialMass * 3L, 1L), calculateRecipeEU(aMaterial, 96)); if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq && GregTech_API.sRecipeFile - .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile.get( + ConfigCategories.Tools.hammermultiingot, + aMaterial.toString(), + true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotTriple, aMaterial, 1L), GT_Proxy.tBits, @@ -185,8 +195,10 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist // If tier < IV add manual crafting. if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq && GregTech_API.sRecipeFile - .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile.get( + ConfigCategories.Tools.hammermultiingot, + aMaterial.toString(), + true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotQuadruple, aMaterial, 1L), GT_Proxy.tBits, @@ -205,8 +217,10 @@ public class ProcessingIngot implements gregtech.api.interfaces.IOreRecipeRegist calculateRecipeEU(aMaterial, 96)); if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { - if (aSpecialRecipeReq && GregTech_API.sRecipeFile - .get(ConfigCategories.Tools.hammermultiingot, aMaterial.toString(), true)) { + if (aSpecialRecipeReq && GregTech_API.sRecipeFile.get( + ConfigCategories.Tools.hammermultiingot, + aMaterial.toString(), + true)) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.ingotQuintuple, aMaterial, 1L), GT_Proxy.tBits, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java index 6e3a8eac00..31c75fbcbb 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java @@ -56,8 +56,10 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 2L), 2400, 30); - final ITexture lensCoverTexture = TextureFactory - .of(Textures.BlockIcons.OVERLAY_LENS, aMaterial.mRGBa, false); + final ITexture lensCoverTexture = TextureFactory.of( + Textures.BlockIcons.OVERLAY_LENS, + aMaterial.mRGBa, + false); GregTech_API.registerCover( aStack, TextureFactory.of(Textures.BlockIcons.MACHINE_CASINGS[2][0], lensCoverTexture), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java index 43b4e8b98f..4bb3dd2072 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java @@ -112,8 +112,10 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { + if (GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, + "wood2charcoalsmelting", + true)) { GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); } } @@ -122,8 +124,10 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { + if (GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, + "wood2charcoalsmelting", + true)) { GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); } } @@ -155,14 +159,12 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra tPlanks, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)); GT_ModHandler.removeRecipeDelayed(new ItemStack(aStack.getItem(), 1, i)); - GT_ModHandler - .addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize - : tStack.stackSize * 5 / 4, - tStack), - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) }); + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, + tStack), + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) }); GT_ModHandler.addShapelessCraftingRecipe( GT_Utility.copyAmount( tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), @@ -176,8 +178,10 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { addPyrolyeOvenRecipes(aStack); - if (GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "wood2charcoalsmelting", true)) { + if (GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, + "wood2charcoalsmelting", + true)) { GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); } } @@ -205,16 +209,15 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra tPlanks, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)); GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1L, aStack)); - GT_ModHandler - .addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize - : tStack.stackSize * 5 / 4, - tStack), - new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) }); + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5 / 4, + tStack), + new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) }); GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility - .copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), + GT_Utility.copyAmount( + tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), + tStack), new Object[] { GT_Utility.copyAmount(1L, aStack) }); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java index d62da2e857..af95ed62fd 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingNugget.java @@ -42,8 +42,14 @@ public class ProcessingNugget implements gregtech.api.interfaces.IOreRecipeRegis } GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); - GT_RecipeRegistrator - .registerReverseMacerating(aStack, aMaterial, aPrefix.mMaterialAmount, null, null, null, false); + GT_RecipeRegistrator.registerReverseMacerating( + aStack, + aMaterial, + aPrefix.mMaterialAmount, + null, + null, + null, + false); if (!aMaterial.contains(SubTag.NO_SMELTING)) { GT_Values.RA.addAlloySmelterRecipe( GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index 0bc88296da..ca585feab6 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -18,12 +18,13 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra private ArrayList<Materials> mAlreadyListedOres = new ArrayList(1000); public ProcessingOre() { - for (OrePrefixes tPrefix : OrePrefixes.values()) - if ((tPrefix.name().startsWith("ore")) && (tPrefix != OrePrefixes.orePoor) - && (tPrefix != OrePrefixes.oreSmall) - && (tPrefix != OrePrefixes.oreRich) - && (tPrefix != OrePrefixes.oreNormal)) - tPrefix.add(this); + for (OrePrefixes tPrefix : OrePrefixes.values()) if ((tPrefix.name() + .startsWith("ore")) + && (tPrefix != OrePrefixes.orePoor) + && (tPrefix != OrePrefixes.oreSmall) + && (tPrefix != OrePrefixes.oreRich) + && (tPrefix != OrePrefixes.oreNormal)) + tPrefix.add(this); } @Override @@ -80,28 +81,29 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra ItemStack tIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L); - ItemStack tSmeltInto = tIngot - == null ? null - : aMaterial.contains(SubTag.SMELTING_TO_GEM) - ? GT_OreDictUnificator.get( - OrePrefixes.gem, + ItemStack tSmeltInto = tIngot == null ? null + : aMaterial.contains(SubTag.SMELTING_TO_GEM) + ? GT_OreDictUnificator.get( + OrePrefixes.gem, + tMaterial.mDirectSmelting, + GT_OreDictUnificator.get( + OrePrefixes.crystal, tMaterial.mDirectSmelting, GT_OreDictUnificator.get( - OrePrefixes.crystal, - tMaterial.mDirectSmelting, - GT_OreDictUnificator.get( - OrePrefixes.gem, - tMaterial, - GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), - 1L), + OrePrefixes.gem, + tMaterial, + GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), 1L), - 1L) - : tIngot; + 1L), + 1L) + : tIngot; ItemStack tDust = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L); ItemStack tCleaned = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L); - ItemStack tCrushed = GT_OreDictUnificator - .get(OrePrefixes.crushed, tMaterial, aMaterial.mOreMultiplier * aMultiplier); + ItemStack tCrushed = GT_OreDictUnificator.get( + OrePrefixes.crushed, + tMaterial, + aMaterial.mOreMultiplier * aMultiplier); ItemStack tPrimaryByProduct = null; if (tCrushed == null) { @@ -120,12 +122,18 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra if (tPrimaryByProduct == null) { tPrimaryByMaterial = tMat; tPrimaryByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator - .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); + if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator.get( + OrePrefixes.dustTiny, + tMat, + GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), + 2L); } GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator - .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); + if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator.get( + OrePrefixes.dustTiny, + tMat, + GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), + 2L); } if ((!tByProductStacks.isEmpty()) && (!this.mAlreadyListedOres.contains(aMaterial))) { this.mAlreadyListedOres.add(aMaterial); @@ -163,8 +171,9 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra null, null, GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag - .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + ItemList.TE_Slag.get( + 1L, + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), tSmeltInto.stackSize * 500, 120, 1500); @@ -174,8 +183,9 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra null, null, GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag - .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + ItemList.TE_Slag.get( + 1L, + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), tSmeltInto.stackSize * 500, 120, 1500); @@ -188,8 +198,9 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra null, null, GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag - .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + ItemList.TE_Slag.get( + 1L, + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), tSmeltInto.stackSize * 500, 120, 1500); @@ -199,8 +210,9 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra null, null, GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), - ItemList.TE_Slag - .get(1L, GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), + ItemList.TE_Slag.get( + 1L, + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)), tSmeltInto.stackSize * 500, 120, 1500); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java index 55f1e6265a..128a8d1368 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java @@ -32,11 +32,13 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe ItemList.Circuit_Integrated.getWithDamage(0L, 1L), null, null, - aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get( - OrePrefixes.ingotHot, - aMaterial, - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - 1L) : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + aMaterial.mBlastFurnaceTemp > 1750 + ? GT_OreDictUnificator.get( + OrePrefixes.ingotHot, + aMaterial, + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + 1L) + : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), null, (int) Math.max(aMaterial.getMass() / 4L, 1L) * aMaterial.mBlastFurnaceTemp, 120, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java index 45ecc36230..c9c7b25419 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java @@ -119,8 +119,13 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr GT_ModHandler.addCraftingRecipe( GT_Utility.copyAmount(1, aStack), GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "PPP", "PPP", "PPP", 'P', GT_OreDictUnificator - .get(aOreDictName.replaceFirst("Nonuple", "Small"), null, 1L, false, true) }); + new Object[] { "PPP", "PPP", "PPP", 'P', + GT_OreDictUnificator.get( + aOreDictName.replaceFirst("Nonuple", "Small"), + null, + 1L, + false, + true) }); } RA.addAssemblerRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index 73410bb80b..0fa3ac1082 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -190,7 +190,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (GregTech_API.sRecipeFile.get( gregtech.api.enums.ConfigCategories.Tools.hammerdoubleplate, - OrePrefixes.plate.get(aMaterial).toString(), + OrePrefixes.plate.get(aMaterial) + .toString(), true)) { Object aPlateStack = OrePrefixes.plate.get(aMaterial); @@ -247,7 +248,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (GregTech_API.sRecipeFile.get( gregtech.api.enums.ConfigCategories.Tools.hammertripleplate, - OrePrefixes.plate.get(aMaterial).toString(), + OrePrefixes.plate.get(aMaterial) + .toString(), true)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -309,7 +311,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (GregTech_API.sRecipeFile.get( gregtech.api.enums.ConfigCategories.Tools.hammerquadrupleplate, - OrePrefixes.plate.get(aMaterial).toString(), + OrePrefixes.plate.get(aMaterial) + .toString(), true)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -358,7 +361,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist if (GregTech_API.sRecipeFile.get( gregtech.api.enums.ConfigCategories.Tools.hammerquintupleplate, - OrePrefixes.plate.get(aMaterial).toString(), + OrePrefixes.plate.get(aMaterial) + .toString(), true)) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -547,8 +551,11 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist // If there is an ItemStack of Block for Materials tStack == NI ? // Use Materials mRGBa dyed blocs/materialicons/MATERIALSET/block1 icons - TextureFactory.builder().addIcon(aMaterial.mIconSet.mTextures[TextureSet.INDEX_block1]) - .setRGBA(aMaterial.mRGBa).stdOrient().build() + TextureFactory.builder() + .addIcon(aMaterial.mIconSet.mTextures[TextureSet.INDEX_block1]) + .setRGBA(aMaterial.mRGBa) + .stdOrient() + .build() : // or copy Block texture TextureFactory.of(Block.getBlockFromItem(tStack.getItem()), tStack.getItemDamage()), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java index fd9ab7dbad..c470801b7e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRound.java @@ -41,8 +41,9 @@ public class ProcessingRound implements gregtech.api.interfaces.IOreRecipeRegist } } if (GT_Mod.gregtechproxy.mAE2Integration) { - Api.INSTANCE.registries().matterCannon() - .registerAmmo(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass()); + Api.INSTANCE.registries() + .matterCannon() + .registerAmmo(GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), aMaterial.getMass()); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index 3afc8201c6..011bdf3bc8 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -32,9 +32,10 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi if (aMaterial.contains(SubTag.NO_SMASHING)) { tVoltageMultiplier /= 4; - } else if (aPrefix.name().startsWith(OrePrefixes.dust.name())) { - return; - } + } else if (aPrefix.name() + .startsWith(OrePrefixes.dust.name())) { + return; + } if (!OrePrefixes.block.isIgnored(aMaterial.mSmeltInto)) { GT_Values.RA.addExtruderRecipe( diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java index 59a9e6a479..9925e013bf 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolOther.java @@ -19,8 +19,12 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { if (aMaterial != Materials.Rubber) { GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.PLUNGER, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.PLUNGER, + 1, + aMaterial, + aMaterial, + null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "xRR", " SR", "S f", 'S', OrePrefixes.stick.get(aMaterial), 'R', OrePrefixes.plate.get(Materials.AnyRubber) }); @@ -28,13 +32,21 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) && (!aMaterial.contains(SubTag.NO_SMASHING))) { GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.WRENCH, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WRENCH, + 1, + aMaterial, + aMaterial, + null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "IhI", "III", " I ", 'I', OrePrefixes.ingot.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.CROWBAR, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.CROWBAR, + 1, + aMaterial, + aMaterial, + null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "hDS", "DSD", "SDf", 'S', OrePrefixes.stick.get(aMaterial), 'D', Dyes.dyeBlue }); GT_ModHandler.addCraftingRecipe( @@ -48,26 +60,42 @@ public class ProcessingToolOther implements gregtech.api.interfaces.IOreRecipeRe new Object[] { " fS", " Sh", "W ", 'S', OrePrefixes.stick.get(aMaterial), 'W', OrePrefixes.stick.get(aMaterial.mHandleMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.WIRECUTTER, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.WIRECUTTER, + 1, + aMaterial, + aMaterial, + null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PfP", "hPd", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SCOOP, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.SCOOP, + 1, + aMaterial, + aMaterial, + null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "SWS", "SSS", "xSh", 'S', OrePrefixes.stick.get(aMaterial), 'W', new ItemStack(Blocks.wool, 1, 32767) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.BRANCHCUTTER, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.BRANCHCUTTER, + 1, + aMaterial, + aMaterial, + null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PfP", "PdP", "STS", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'T', OrePrefixes.screw.get(aMaterial) }); GT_ModHandler.addCraftingRecipe( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.KNIFE, 1, aMaterial, aMaterial, null), + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + GT_MetaGenerated_Tool_01.KNIFE, + 1, + aMaterial, + aMaterial, + null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "fPh", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial) }); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java index 1d0fa1c3bb..4d37fc2eb1 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingTransforming.java @@ -26,8 +26,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "Wood": GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.SeedOil - .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true)), + Materials.SeedOil.getFluid( + GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 120L, true)), GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), GT_Values.NI, GT_Values.NI, @@ -36,8 +36,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { 8); GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.SeedOilLin - .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), + Materials.SeedOilLin.getFluid( + GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), GT_Values.NI, GT_Values.NI, @@ -46,8 +46,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { 8); GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.SeedOilHemp - .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), + Materials.SeedOilHemp.getFluid( + GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 80L, true)), GT_OreDictUnificator.get(aPrefix, Materials.WoodSealed, 1L), GT_Values.NI, GT_Values.NI, @@ -58,8 +58,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "Iron": GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.FierySteel - .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true)), + Materials.FierySteel.getFluid( + GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 250L, true)), GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), GT_Values.NI, GT_Values.NI, @@ -75,8 +75,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "WroughtIron": GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.FierySteel - .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true)), + Materials.FierySteel.getFluid( + GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 225L, true)), GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), GT_Values.NI, GT_Values.NI, @@ -92,8 +92,8 @@ public class ProcessingTransforming implements IOreRecipeRegistrator { case "Steel": GT_Values.RA.addChemicalBathRecipe( GT_Utility.copyAmount(1L, aStack), - Materials.FierySteel - .getFluid(GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true)), + Materials.FierySteel.getFluid( + GT_Utility.translateMaterialToAmount(aPrefix.mMaterialAmount, 200L, true)), GT_OreDictUnificator.get(aPrefix, Materials.FierySteel, 1L), GT_Values.NI, GT_Values.NI, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index 11333e2e2c..c991fdd149 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -377,8 +377,10 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { aStack, - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.PolyphenyleneSulfide, + costMultiplier), GT_Utility.getIntegratedCircuit(24) }, Materials.Silicone.getMolten(costMultiplier * 72), GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), @@ -386,16 +388,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr calculateRecipeEU(aMaterial, 8)); for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { - GT_Values.RA - .addAssemblerRecipe( - new ItemStack[] { GT_Utility.copyAmount(4, aStack), - dielectric.getDust(costMultiplier), - GT_OreDictUnificator - .get(OrePrefixes.foil, aMaterial, costMultiplier * 4) }, - syntheticRubber.getMolten(costMultiplier * 144), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), - 400, - calculateRecipeEU(aMaterial, 8)); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { GT_Utility.copyAmount(4, aStack), + dielectric.getDust(costMultiplier), + GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier * 4) }, + syntheticRubber.getMolten(costMultiplier * 144), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), + 400, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(4, aStack), dielectric.getDust(costMultiplier), @@ -407,15 +407,13 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(correspondingCable, aMaterial, 4L), 400, calculateRecipeEU(aMaterial, 8)); - GT_Values.RA - .addAssemblerRecipe( - new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier), - GT_OreDictUnificator - .get(OrePrefixes.foil, aMaterial, costMultiplier) }, - syntheticRubber.getMolten(costMultiplier * 36), - GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), - 100, - calculateRecipeEU(aMaterial, 8)); + GT_Values.RA.addAssemblerRecipe( + new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier), + GT_OreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier) }, + syntheticRubber.getMolten(costMultiplier * 36), + GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), + 100, + calculateRecipeEU(aMaterial, 8)); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { aStack, dielectric.getDustSmall(costMultiplier), GT_OreDictUnificator.get( @@ -453,13 +451,18 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } private void AE2addNewAttunement(ItemStack aStack) { - Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, (TunnelType) tt); + Api.INSTANCE.registries() + .p2pTunnel() + .addNewAttunement(aStack, (TunnelType) tt); } private void AE2AddNetAttunementCable(ItemStack aStack, OrePrefixes correspondingCable, Materials aMaterial) { - Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, (TunnelType) tt); - Api.INSTANCE.registries().p2pTunnel() - .addNewAttunement(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), (TunnelType) tt); + Api.INSTANCE.registries() + .p2pTunnel() + .addNewAttunement(aStack, (TunnelType) tt); + Api.INSTANCE.registries() + .p2pTunnel() + .addNewAttunement(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), (TunnelType) tt); } // end region } diff --git a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java index d661fb4452..0e4051c798 100644 --- a/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_BookAndLootLoader.java @@ -49,11 +49,13 @@ public class GT_BookAndLootLoader implements Runnable { tChest.setMax(tChest.getMax() + 16); tChest.setMin(tChest.getMin() + 8); } - ChestGenHooks - .addItem("bonusChest", new WeightedRandomChestContent(ItemList.Bottle_Purple_Drink.get(1L), 8, 16, 2)); + ChestGenHooks.addItem( + "bonusChest", + new WeightedRandomChestContent(ItemList.Bottle_Purple_Drink.get(1L), 8, 16, 2)); - ChestGenHooks - .addItem("dungeonChest", new WeightedRandomChestContent(ItemList.Bottle_Holy_Water.get(1L), 4, 8, 20)); + ChestGenHooks.addItem( + "dungeonChest", + new WeightedRandomChestContent(ItemList.Bottle_Holy_Water.get(1L), 4, 8, 20)); ChestGenHooks.addItem( "dungeonChest", new WeightedRandomChestContent(ItemList.Bottle_Purple_Drink.get(1L), 8, 16, 80)); @@ -370,8 +372,9 @@ public class GT_BookAndLootLoader implements Runnable { 4, 1)); - ChestGenHooks - .addItem("villageBlacksmith", new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 1)); + ChestGenHooks.addItem( + "villageBlacksmith", + new WeightedRandomChestContent(ItemList.McGuffium_239.get(1L), 1, 1, 1)); ChestGenHooks.addItem( "villageBlacksmith", new WeightedRandomChestContent( diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index c05002a14d..464b84d11b 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -88,8 +88,16 @@ public class GT_CraftingRecipeLoader implements Runnable { } if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.recipereplacements, "Iron.Hopper", true)) { ItemStack tStack; - if (null != (tStack = GT_ModHandler - .removeRecipe(tMat, null, tMat, tMat, new ItemStack(Blocks.chest, 1, 0), tMat, null, tMat, null))) { + if (null != (tStack = GT_ModHandler.removeRecipe( + tMat, + null, + tMat, + tMat, + new ItemStack(Blocks.chest, 1, 0), + tMat, + null, + tMat, + null))) { GT_ModHandler.addCraftingRecipe( tStack, bits_no_remove_buffered | GT_ModHandler.RecipeBits.DELETE_ALL_OTHER_RECIPES, @@ -157,17 +165,18 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "engine", 1L, 2)); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getModItem("Forestry", "engine", 1L, 4)); - ItemStack tStack = GT_ModHandler - .removeRecipe(new ItemStack(Blocks.planks, 1, 0), null, null, new ItemStack(Blocks.planks, 1, 0)); + ItemStack tStack = GT_ModHandler.removeRecipe( + new ItemStack(Blocks.planks, 1, 0), + null, + null, + new ItemStack(Blocks.planks, 1, 0)); if (tStack != null) { - GT_ModHandler - .addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize - : tStack.stackSize * 5L / 4, - tStack), - bits_no_remove_buffered, - new Object[] { "s", "P", "P", 'P', OrePrefixes.plank.get(Materials.Wood) }); + GT_ModHandler.addCraftingRecipe( + GT_Utility.copyAmount( + GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize : tStack.stackSize * 5L / 4, + tStack), + bits_no_remove_buffered, + new Object[] { "s", "P", "P", 'P', OrePrefixes.plank.get(Materials.Wood) }); GT_ModHandler.addCraftingRecipe( GT_Utility.copyAmount( GT_Mod.gregtechproxy.mNerfedWoodPlank ? tStack.stackSize / 2 : tStack.stackSize, @@ -739,9 +748,10 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_OreDictUnificator.get( OrePrefixes.ingot, Materials.Bronze, - GregTech_API.sRecipeFile - .get(ConfigCategories.Recipes.disabledrecipes, "bronzeingotcrafting", true) ? 1L - : 2L))) { + GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, + "bronzeingotcrafting", + true) ? 1L : 2L))) { GT_Log.out.println("GT_Mod: Changed Forestrys Bronze Recipe"); } if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "enchantmenttable", false)) { @@ -1600,13 +1610,13 @@ public class GT_CraftingRecipeLoader implements Runnable { if (GT_Mod.gregtechproxy.mDisableIC2Cables) { - List<ItemStack> iToRemoveAndHide = Arrays - .stream( - new String[] { "copperCableItem", "insulatedCopperCableItem", "goldCableItem", - "insulatedGoldCableItem", "insulatedIronCableItem", "glassFiberCableItem", - "tinCableItem", "ironCableItem", "insulatedTinCableItem", "detectorCableItem", - "splitterCableItem", "electrolyzer", "cutter" }) - .map(x -> GT_ModHandler.getIC2Item(x, 1L)).collect(Collectors.toList()); + List<ItemStack> iToRemoveAndHide = Arrays.stream( + new String[] { "copperCableItem", "insulatedCopperCableItem", "goldCableItem", + "insulatedGoldCableItem", "insulatedIronCableItem", "glassFiberCableItem", "tinCableItem", + "ironCableItem", "insulatedTinCableItem", "detectorCableItem", "splitterCableItem", + "electrolyzer", "cutter" }) + .map(x -> GT_ModHandler.getIC2Item(x, 1L)) + .collect(Collectors.toList()); if (NotEnoughItems.isModLoaded()) { iToRemoveAndHide.forEach(item -> { @@ -1622,7 +1632,8 @@ public class GT_CraftingRecipeLoader implements Runnable { "ovScanner", "solarHelmet", "staticBoots", "ecMeter", "obscurator", "overclockerUpgrade", "transformerUpgrade", "energyStorageUpgrade", "ejectorUpgrade", "suBattery", "frequencyTransmitter", "pullingUpgrade" }) - .map(x -> GT_ModHandler.getIC2Item(x, 1L)).forEach(GT_ModHandler::removeRecipeByOutputDelayed); + .map(x -> GT_ModHandler.getIC2Item(x, 1L)) + .forEach(GT_ModHandler::removeRecipeByOutputDelayed); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("batBox", 1L), @@ -1817,28 +1828,44 @@ public class GT_CraftingRecipeLoader implements Runnable { new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', OrePrefixes.gemExquisite.get(Materials.Diamond), 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), - 'B', new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) }); + 'B', new ItemStack( + Ic2Items.chargingEnergyCrystal.copy() + .getItem(), + 1, + GT_Values.W) }); GT_ModHandler.addCraftingRecipe( Ic2Items.miningLaser.copy(), GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', OrePrefixes.gemExquisite.get(Materials.Ruby), 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), - 'B', new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) }); + 'B', new ItemStack( + Ic2Items.chargingEnergyCrystal.copy() + .getItem(), + 1, + GT_Values.W) }); GT_ModHandler.addCraftingRecipe( Ic2Items.miningLaser.copy(), GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', OrePrefixes.gemExquisite.get(Materials.Jasper), 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), - 'B', new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) }); + 'B', new ItemStack( + Ic2Items.chargingEnergyCrystal.copy() + .getItem(), + 1, + GT_Values.W) }); GT_ModHandler.addCraftingRecipe( Ic2Items.miningLaser.copy(), GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', OrePrefixes.gemExquisite.get(Materials.GarnetRed), 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), - 'B', new ItemStack(Ic2Items.chargingEnergyCrystal.copy().getItem(), 1, GT_Values.W) }); + 'B', new ItemStack( + Ic2Items.chargingEnergyCrystal.copy() + .getItem(), + 1, + GT_Values.W) }); } GT_ModHandler.removeRecipeDelayed(GT_ModHandler.getIC2Item("miningPipe", 8)); GT_ModHandler.addCraftingRecipe( diff --git a/src/main/java/gregtech/loaders/postload/GT_ItemMaxStacksizeLoader.java b/src/main/java/gregtech/loaders/postload/GT_ItemMaxStacksizeLoader.java index 655d1a06fd..c310a3501f 100644 --- a/src/main/java/gregtech/loaders/postload/GT_ItemMaxStacksizeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_ItemMaxStacksizeLoader.java @@ -15,7 +15,8 @@ public class GT_ItemMaxStacksizeLoader implements Runnable { public void run() { GT_Log.out.println("GT_Mod: Changing maximum Stacksizes if configured."); - ItemList.Upgrade_Overclocker.getItem().setMaxStackSize(GT_Mod.gregtechproxy.mUpgradeCount); + ItemList.Upgrade_Overclocker.getItem() + .setMaxStackSize(GT_Mod.gregtechproxy.mUpgradeCount); Items.cake.setMaxStackSize(64); Items.wooden_door.setMaxStackSize(8); Items.iron_door.setMaxStackSize(8); @@ -24,61 +25,114 @@ public class GT_ItemMaxStacksizeLoader implements Runnable { Items.snowball.setMaxStackSize(64); Items.mushroom_stew.setMaxStackSize(64); if (OrePrefixes.plank.mDefaultStackSize < 64) { - Item.getItemFromBlock(Blocks.wooden_slab).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); - Item.getItemFromBlock(Blocks.double_wooden_slab).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); - Item.getItemFromBlock(Blocks.oak_stairs).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); - Item.getItemFromBlock(Blocks.jungle_stairs).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); - Item.getItemFromBlock(Blocks.birch_stairs).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); - Item.getItemFromBlock(Blocks.spruce_stairs).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); - Item.getItemFromBlock(Blocks.acacia_stairs).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); - Item.getItemFromBlock(Blocks.dark_oak_stairs).setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.wooden_slab) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.double_wooden_slab) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.oak_stairs) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.jungle_stairs) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.birch_stairs) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.spruce_stairs) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.acacia_stairs) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); + Item.getItemFromBlock(Blocks.dark_oak_stairs) + .setMaxStackSize(OrePrefixes.plank.mDefaultStackSize); } if (OrePrefixes.block.mDefaultStackSize < 64) { - Item.getItemFromBlock(Blocks.stone_slab).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.double_stone_slab).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.brick_stairs).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.nether_brick_stairs).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.sandstone_stairs).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.stone_stairs).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.stone_brick_stairs).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.packed_ice).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.ice).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.soul_sand).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.glowstone).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.snow).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.snow).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.iron_block).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.gold_block).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.emerald_block).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.lapis_block).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.diamond_block).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.clay).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.redstone_lamp).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.dirt).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.grass).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.mycelium).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.gravel).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.sand).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.brick_block).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.wool).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.melon_block).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.pumpkin).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.lit_pumpkin).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.dispenser).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.obsidian).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.piston).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.sticky_piston).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.crafting_table).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.glass).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.jukebox).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.anvil).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.chest).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.trapped_chest).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.noteblock).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.mob_spawner).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.bookshelf).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.furnace).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); - Item.getItemFromBlock(Blocks.lit_furnace).setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.stone_slab) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.double_stone_slab) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.brick_stairs) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.nether_brick_stairs) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.sandstone_stairs) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.stone_stairs) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.stone_brick_stairs) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.packed_ice) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.ice) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.soul_sand) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.glowstone) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.snow) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.snow) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.iron_block) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.gold_block) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.emerald_block) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.lapis_block) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.diamond_block) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.clay) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.redstone_lamp) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.dirt) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.grass) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.mycelium) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.gravel) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.sand) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.brick_block) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.wool) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.melon_block) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.pumpkin) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.lit_pumpkin) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.dispenser) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.obsidian) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.piston) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.sticky_piston) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.crafting_table) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.glass) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.jukebox) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.anvil) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.chest) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.trapped_chest) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.noteblock) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.mob_spawner) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.bookshelf) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.furnace) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); + Item.getItemFromBlock(Blocks.lit_furnace) + .setMaxStackSize(OrePrefixes.block.mDefaultStackSize); } } } diff --git a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java index 70da4835d2..32470a7e7a 100644 --- a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java +++ b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java @@ -54,8 +54,8 @@ public class GT_PostLoad { GT_Mod.gregtechproxy.activateOreDictHandler(); // noinspection UnstableApiUsage// Stable enough for this project - GT_Mod.GT_FML_LOGGER - .info("Congratulations, you have been waiting long enough (" + stopwatch.stop() + "). Have a Cake."); + GT_Mod.GT_FML_LOGGER.info( + "Congratulations, you have been waiting long enough (" + stopwatch.stop() + "). Have a Cake."); GT_Log.out.println( "GT_Mod: List of Lists of Tool Recipes: " + GT_ModHandler.sSingleNonBlockDamagableRecipeList_list.toString()); @@ -75,18 +75,42 @@ public class GT_PostLoad { Stopwatch stopwatch = Stopwatch.createStarted(); // remove gemIridium exploit ItemStack iridiumOre = GT_ModHandler.getIC2Item("iridiumOre", 1); - aCompressorRecipeList.entrySet().parallelStream().filter( - e -> e.getKey().getInputs().size() == 1 && e.getKey().getInputs().get(0).isItemEqual(iridiumOre)) - .findAny().ifPresent(e -> aCompressorRecipeList.remove(e.getKey())); + aCompressorRecipeList.entrySet() + .parallelStream() + .filter( + e -> e.getKey() + .getInputs() + .size() == 1 && e.getKey() + .getInputs() + .get(0) + .isItemEqual(iridiumOre)) + .findAny() + .ifPresent(e -> aCompressorRecipeList.remove(e.getKey())); // Add default IC2 recipe to GT - GT_ModHandler - .addIC2RecipesToGT(aMaceratorRecipeList, GT_Recipe.GT_Recipe_Map.sMaceratorRecipes, true, true, true); - GT_ModHandler - .addIC2RecipesToGT(aCompressorRecipeList, GT_Recipe.GT_Recipe_Map.sCompressorRecipes, true, true, true); - GT_ModHandler - .addIC2RecipesToGT(aExtractorRecipeList, GT_Recipe.GT_Recipe_Map.sExtractorRecipes, true, true, true); - GT_ModHandler - .addIC2RecipesToGT(aOreWashingRecipeList, GT_Recipe.GT_Recipe_Map.sOreWasherRecipes, false, true, true); + GT_ModHandler.addIC2RecipesToGT( + aMaceratorRecipeList, + GT_Recipe.GT_Recipe_Map.sMaceratorRecipes, + true, + true, + true); + GT_ModHandler.addIC2RecipesToGT( + aCompressorRecipeList, + GT_Recipe.GT_Recipe_Map.sCompressorRecipes, + true, + true, + true); + GT_ModHandler.addIC2RecipesToGT( + aExtractorRecipeList, + GT_Recipe.GT_Recipe_Map.sExtractorRecipes, + true, + true, + true); + GT_ModHandler.addIC2RecipesToGT( + aOreWashingRecipeList, + GT_Recipe.GT_Recipe_Map.sOreWasherRecipes, + false, + true, + true); GT_ModHandler.addIC2RecipesToGT( aThermalCentrifugeRecipeList, GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes, @@ -101,8 +125,7 @@ public class GT_PostLoad { ItemStack iSData0 = new ItemStack(Items.potionitem, 1, 0); ItemStack iLData0 = ItemList.Bottle_Empty.get(1L); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry - .getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes.addRecipe( true, @@ -223,7 +246,7 @@ public class GT_PostLoad { false, new ItemStack[] { Objects.requireNonNull( GT_ModHandler.getModItem(GalacticraftCore.modID, "item.schematic", 1, Short.MAX_VALUE)) - .setStackDisplayName("Any Schematic") }, + .setStackDisplayName("Any Schematic") }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), null, @@ -235,7 +258,7 @@ public class GT_PostLoad { false, new ItemStack[] { Objects.requireNonNull( GT_ModHandler.getModItem(GalacticraftMars.modID, "item.schematic", 1, Short.MAX_VALUE)) - .setStackDisplayName("Any Schematic") }, + .setStackDisplayName("Any Schematic") }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), null, @@ -248,7 +271,7 @@ public class GT_PostLoad { GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( false, new ItemStack[] { GT_ModHandler.getModItem("GalaxySpace", "item.SchematicTier" + i, 1) - .setStackDisplayName("Any Schematic") }, + .setStackDisplayName("Any Schematic") }, new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Scanned Schematic") }, ItemList.Tool_DataStick.getWithName(1L, "Stick to save it to"), null, @@ -259,64 +282,66 @@ public class GT_PostLoad { } } } - Materials.getMaterialsMap().values().forEach(tMaterial -> { - if ((tMaterial.mElement != null) && (!tMaterial.mElement.mIsIsotope) - && (tMaterial != Materials.Magic) - && (tMaterial.getMass() > 0L)) { - ItemStack tOutput = ItemList.Tool_DataOrb.get(1L); - Behaviour_DataOrb.setDataTitle(tOutput, "Elemental-Scan"); - Behaviour_DataOrb.setDataName(tOutput, tMaterial.mElement.name()); - ItemStack tInput = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, 1L); - ItemStack[] iSMat0 = new ItemStack[] { tInput }; - ItemStack[] iSMat1 = new ItemStack[] { tOutput }; - if (tInput != null) { - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( - false, - iSMat0, - iSMat1, - ItemList.Tool_DataOrb.get(1L), - null, - null, - (int) (tMaterial.getMass() * 8192L), - 30, - 0); - GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe( - false, - null, - iSMat0, - iSMat1, - new FluidStack[] { Materials.UUMatter.getFluid(tMaterial.getMass()) }, - null, - (int) (tMaterial.getMass() * 512L), - (int) VP[1], - 0); - } - tInput = GT_OreDictUnificator.get(OrePrefixes.cell, tMaterial, 1L); - iSMat0 = new ItemStack[] { tInput }; - if (tInput != null) { - GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( - false, - iSMat0, - iSMat1, - ItemList.Tool_DataOrb.get(1L), - null, - null, - (int) (tMaterial.getMass() * 8192L), - 30, - 0); - GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe( - false, - null, - iSMat0, - iSMat1, - new FluidStack[] { Materials.UUMatter.getFluid(tMaterial.getMass()) }, - null, - (int) (tMaterial.getMass() * 512L), - (int) VP[1], - 0); - } - } - }); + Materials.getMaterialsMap() + .values() + .forEach(tMaterial -> { + if ((tMaterial.mElement != null) && (!tMaterial.mElement.mIsIsotope) + && (tMaterial != Materials.Magic) + && (tMaterial.getMass() > 0L)) { + ItemStack tOutput = ItemList.Tool_DataOrb.get(1L); + Behaviour_DataOrb.setDataTitle(tOutput, "Elemental-Scan"); + Behaviour_DataOrb.setDataName(tOutput, tMaterial.mElement.name()); + ItemStack tInput = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, 1L); + ItemStack[] iSMat0 = new ItemStack[] { tInput }; + ItemStack[] iSMat1 = new ItemStack[] { tOutput }; + if (tInput != null) { + GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( + false, + iSMat0, + iSMat1, + ItemList.Tool_DataOrb.get(1L), + null, + null, + (int) (tMaterial.getMass() * 8192L), + 30, + 0); + GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe( + false, + null, + iSMat0, + iSMat1, + new FluidStack[] { Materials.UUMatter.getFluid(tMaterial.getMass()) }, + null, + (int) (tMaterial.getMass() * 512L), + (int) VP[1], + 0); + } + tInput = GT_OreDictUnificator.get(OrePrefixes.cell, tMaterial, 1L); + iSMat0 = new ItemStack[] { tInput }; + if (tInput != null) { + GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe( + false, + iSMat0, + iSMat1, + ItemList.Tool_DataOrb.get(1L), + null, + null, + (int) (tMaterial.getMass() * 8192L), + 30, + 0); + GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes.addFakeRecipe( + false, + null, + iSMat0, + iSMat1, + new FluidStack[] { Materials.UUMatter.getFluid(tMaterial.getMass()) }, + null, + (int) (tMaterial.getMass() * 512L), + (int) VP[1], + 0); + } + } + }); if (!GT_MetaTileEntity_Massfabricator.sRequiresUUA) GT_Recipe.GT_Recipe_Map.sMassFabFakeRecipes.addFakeRecipe( false, @@ -410,13 +435,16 @@ public class GT_PostLoad { @SuppressWarnings("UnstableApiUsage") // Stable enough for this project Stopwatch stopwatch = Stopwatch.createStarted(); GT_Mod.GT_FML_LOGGER.info("Replacing Vanilla Materials in recipes, please wait."); - Set<Materials> replaceVanillaItemsSet = GT_Mod.gregtechproxy.mUseGreatlyShrukenReplacementList ? Arrays - .stream(Materials.values()).filter(GT_RecipeRegistrator::hasVanillaRecipes).collect(Collectors.toSet()) + Set<Materials> replaceVanillaItemsSet = GT_Mod.gregtechproxy.mUseGreatlyShrukenReplacementList + ? Arrays.stream(Materials.values()) + .filter(GT_RecipeRegistrator::hasVanillaRecipes) + .collect(Collectors.toSet()) : new HashSet<>(Arrays.asList(Materials.values())); @SuppressWarnings("deprecation") // stable API for MC 1.7.10 - ProgressManager.ProgressBar progressBar = ProgressManager - .push("Register materials", replaceVanillaItemsSet.size()); + ProgressManager.ProgressBar progressBar = ProgressManager.push( + "Register materials", + replaceVanillaItemsSet.size()); if (GT_Values.cls_enabled) { try { GT_CLS_Compat.doActualRegistrationCLS(progressBar, replaceVanillaItemsSet); @@ -437,7 +465,8 @@ public class GT_PostLoad { } public static void doActualRegistration(Materials m) { - String plateName = OrePrefixes.plate.get(m).toString(); + String plateName = OrePrefixes.plate.get(m) + .toString(); boolean noSmash = !m.contains(SubTag.NO_SMASHING); if ((m.mTypes & 2) != 0) GT_RecipeRegistrator.registerUsagesForMaterials(plateName, noSmash, m.getIngots(1)); if ((m.mTypes & 4) != 0) GT_RecipeRegistrator.registerUsagesForMaterials(plateName, noSmash, m.getGems(1)); @@ -464,28 +493,52 @@ public class GT_PostLoad { public void displayAllReleventItems(List aList) { for (int i = 0; i < 32766; i += 2) { - if (GT_MetaGenerated_Tool_01.INSTANCE - .getToolStats(new ItemStack(GT_MetaGenerated_Tool_01.INSTANCE, 1, i)) != null) { + if (GT_MetaGenerated_Tool_01.INSTANCE.getToolStats( + new ItemStack(GT_MetaGenerated_Tool_01.INSTANCE, 1, i)) != null) { ItemStack tStack = new ItemStack(GT_MetaGenerated_Tool_01.INSTANCE, 1, i); GT_MetaGenerated_Tool_01.INSTANCE.isItemStackUsable(tStack); aList.add( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(i, 1, Materials.Lead, Materials.Lead, null)); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + i, + 1, + Materials.Lead, + Materials.Lead, + null)); aList.add( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(i, 1, Materials.Nickel, Materials.Nickel, null)); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + i, + 1, + Materials.Nickel, + Materials.Nickel, + null)); aList.add( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(i, 1, Materials.Cobalt, Materials.Cobalt, null)); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + i, + 1, + Materials.Cobalt, + Materials.Cobalt, + null)); aList.add( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(i, 1, Materials.Osmium, Materials.Osmium, null)); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + i, + 1, + Materials.Osmium, + Materials.Osmium, + null)); aList.add( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(i, 1, Materials.Adamantium, Materials.Adamantium, null)); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + i, + 1, + Materials.Adamantium, + Materials.Adamantium, + null)); aList.add( - GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(i, 1, Materials.Neutronium, Materials.Neutronium, null)); + GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( + i, + 1, + Materials.Neutronium, + Materials.Neutronium, + null)); } } super.displayAllReleventItems(aList); @@ -519,8 +572,8 @@ public class GT_PostLoad { GT_OreDictUnificator.get(ItemList.Block_MSSFUEL.get(1)), GT_OreDictUnificator.get(OrePrefixes.rod, Materials.Blaze, 1)); if (Thaumcraft.isModLoaded()) { - GT_Recipe.GT_Recipe_Map.sLargeBoilerFakeFuels - .addSolidRecipe(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1)); + GT_Recipe.GT_Recipe_Map.sLargeBoilerFakeFuels.addSolidRecipe( + GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1)); } } @@ -528,9 +581,15 @@ public class GT_PostLoad { final String[] steamCandidates = { "steam", "ic2steam" }; final String[] superHeatedSteamCandidates = { "ic2superheatedsteam" }; - GT_ModHandler.sAnySteamFluidIDs = Arrays.stream(steamCandidates).map(FluidRegistry::getFluid) - .filter(Objects::nonNull).map(FluidRegistry::getFluidID).collect(Collectors.toList()); - GT_ModHandler.sSuperHeatedSteamFluidIDs = Arrays.stream(superHeatedSteamCandidates).map(FluidRegistry::getFluid) - .filter(Objects::nonNull).map(FluidRegistry::getFluidID).collect(Collectors.toList()); + GT_ModHandler.sAnySteamFluidIDs = Arrays.stream(steamCandidates) + .map(FluidRegistry::getFluid) + .filter(Objects::nonNull) + .map(FluidRegistry::getFluidID) + .collect(Collectors.toList()); + GT_ModHandler.sSuperHeatedSteamFluidIDs = Arrays.stream(superHeatedSteamCandidates) + .map(FluidRegistry::getFluid) + .filter(Objects::nonNull) + .map(FluidRegistry::getFluidID) + .collect(Collectors.toList()); } } diff --git a/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java index b018e6bbf8..080330c7dd 100644 --- a/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_ProcessingArrayRecipeLoader.java @@ -10,12 +10,14 @@ public class GT_ProcessingArrayRecipeLoader { // Alloy Smelter GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.alloysmelter", GT_Recipe_Map.sAlloySmelterRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.alloysmelter", SoundResource.IC2_MACHINES_INDUCTION_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.alloysmelter", + SoundResource.IC2_MACHINES_INDUCTION_LOOP); // Arc Furnace GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.arcfurnace", GT_Recipe_Map.sArcFurnaceRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.arcfurnace", SoundResource.IC2_MACHINES_INDUCTION_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.arcfurnace", + SoundResource.IC2_MACHINES_INDUCTION_LOOP); // Assembler GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.assembler", GT_Recipe_Map.sAssemblerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.assembler", SoundResource.NONE); @@ -24,8 +26,9 @@ public class GT_ProcessingArrayRecipeLoader { GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.autoclave", SoundResource.NONE); // Bender GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.bender", GT_Recipe_Map.sBenderRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.bender", SoundResource.IC2_MACHINES_COMPRESSOR_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.bender", + SoundResource.IC2_MACHINES_COMPRESSOR_OP); // Boxinator GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.boxinator", GT_Recipe_Map.sBoxinatorRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.boxinator", SoundResource.NONE); @@ -36,63 +39,77 @@ public class GT_ProcessingArrayRecipeLoader { GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.canner", GT_Recipe_Map.sCannerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.canner", SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Centrifuge - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.centrifuge", GT_Recipe_Map.sMultiblockCentrifugeRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.centrifuge", + GT_Recipe_Map.sMultiblockCentrifugeRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.centrifuge", SoundResource.NONE); // Chemical Bath GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.chemicalbath", GT_Recipe_Map.sChemicalBathRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.chemicalbath", SoundResource.NONE); // Chemical Reactor - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.chemicalreactor", GT_Recipe_Map.sMultiblockChemicalRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.chemicalreactor", SoundResource.IC2_MACHINES_EXTRACTOR_OP); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.chemicalreactor", + GT_Recipe_Map.sMultiblockChemicalRecipes); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.chemicalreactor", + SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Circuit Assembler - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.circuitassembler", GT_Recipe_Map.sCircuitAssemblerRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.circuitassembler", + GT_Recipe_Map.sCircuitAssemblerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.circuitassembler", SoundResource.NONE); // Compressor GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.compressor", GT_Recipe_Map.sCompressorRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.compressor", SoundResource.IC2_MACHINES_COMPRESSOR_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.compressor", + SoundResource.IC2_MACHINES_COMPRESSOR_OP); // Cutting Machine GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.cutter", GT_Recipe_Map.sCutterRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.cutter", SoundResource.NONE); // Distillery GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.distillery", GT_Recipe_Map.sDistilleryRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.distillery", SoundResource.GT_MACHINES_DISTILLERY_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.distillery", + SoundResource.GT_MACHINES_DISTILLERY_LOOP); // Electrolyzer - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.electrolyzer", GT_Recipe_Map.sMultiblockElectrolyzerRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.electrolyzer", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.electrolyzer", + GT_Recipe_Map.sMultiblockElectrolyzerRecipes); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.electrolyzer", + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Extractor GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.extractor", GT_Recipe_Map.sExtractorRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.extractor", SoundResource.IC2_MACHINES_EXTRACTOR_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.extractor", + SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Extruder GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.extruder", GT_Recipe_Map.sExtruderRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.extruder", SoundResource.IC2_MACHINES_INDUCTION_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.extruder", + SoundResource.IC2_MACHINES_INDUCTION_LOOP); // Fermenter GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fermenter", GT_Recipe_Map.sFermentingRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.fermenter", SoundResource.NONE); // Fluid Canner GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidcanner", GT_Recipe_Map.sFluidCannerRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.fluidcanner", SoundResource.IC2_MACHINES_EXTRACTOR_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.fluidcanner", + SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Fluid Extractor - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.fluidextractor", GT_Recipe_Map.sFluidExtractionRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.fluidextractor", SoundResource.IC2_MACHINES_EXTRACTOR_OP); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.fluidextractor", + GT_Recipe_Map.sFluidExtractionRecipes); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.fluidextractor", + SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Fluid Heater GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.fluidheater", GT_Recipe_Map.sFluidHeaterRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.fluidheater", SoundResource.NONE); // Fluid Solidifier - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.fluidsolidifier", GT_Recipe_Map.sFluidSolidficationRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.fluidsolidifier", + GT_Recipe_Map.sFluidSolidficationRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.fluidsolidifier", SoundResource.NONE); // Forge Hammer GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.hammer", GT_Recipe_Map.sHammerRecipes); @@ -102,15 +119,17 @@ public class GT_ProcessingArrayRecipeLoader { GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.press", SoundResource.IC2_MACHINES_COMPRESSOR_OP); // Laser Engraver GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.laserengraver", GT_Recipe_Map.sLaserEngraverRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.laserengraver", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.laserengraver", + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Lathe GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.lathe", GT_Recipe_Map.sLatheRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.lathe", SoundResource.NONE); // Macerator GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.macerator", GT_Recipe_Map.sMaceratorRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.macerator", SoundResource.IC2_MACHINES_MACERATOR_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.macerator", + SoundResource.IC2_MACHINES_MACERATOR_OP); // Magnetic Separator GT_ProcessingArray_Manager.addRecipeMapToPA( "basicmachine.electromagneticseparator", @@ -120,12 +139,14 @@ public class GT_ProcessingArrayRecipeLoader { SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Matter Amplifier GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.amplifab", GT_Recipe_Map.sAmplifiers); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.amplifab", SoundResource.IC2_MACHINES_EXTRACTOR_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.amplifab", + SoundResource.IC2_MACHINES_EXTRACTOR_OP); // Microwave GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.microwave", GT_Recipe_Map.sMicrowaveRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.microwave", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.microwave", + SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP); // Mixer GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.mixer", GT_Recipe_Map.sMultiblockMixerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.mixer", SoundResource.NONE); @@ -133,26 +154,32 @@ public class GT_ProcessingArrayRecipeLoader { GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.orewasher", GT_Recipe_Map.sOreWasherRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.orewasher", SoundResource.NONE); // Plasma Arc Furnace - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.plasmaarcfurnace", GT_Recipe_Map.sPlasmaArcFurnaceRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.plasmaarcfurnace", SoundResource.IC2_MACHINES_INDUCTION_LOOP); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.plasmaarcfurnace", + GT_Recipe_Map.sPlasmaArcFurnaceRecipes); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.plasmaarcfurnace", + SoundResource.IC2_MACHINES_INDUCTION_LOOP); // Polarizer GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.polarizer", GT_Recipe_Map.sPolarizerRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.polarizer", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.polarizer", + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Printer GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.printer", GT_Recipe_Map.sPrinterRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.printer", SoundResource.IC2_MACHINES_COMPRESSOR_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.printer", + SoundResource.IC2_MACHINES_COMPRESSOR_OP); // Recycler GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.recycler", GT_Recipe_Map.sRecyclerRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.recycler", SoundResource.IC2_MACHINES_RECYCLER_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.recycler", + SoundResource.IC2_MACHINES_RECYCLER_OP); // Scanner GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.scanner", GT_Recipe_Map.sScannerFakeRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.scanner", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.scanner", + SoundResource.IC2_MACHINES_MAGNETIZER_LOOP); // Sifter GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.sifter", GT_Recipe_Map.sSifterRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.sifter", SoundResource.NONE); @@ -160,15 +187,17 @@ public class GT_ProcessingArrayRecipeLoader { GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.slicer", GT_Recipe_Map.sSlicerRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.slicer", SoundResource.NONE); // Thermal Centrifuge - GT_ProcessingArray_Manager - .addRecipeMapToPA("basicmachine.thermalcentrifuge", GT_Recipe_Map.sThermalCentrifugeRecipes); + GT_ProcessingArray_Manager.addRecipeMapToPA( + "basicmachine.thermalcentrifuge", + GT_Recipe_Map.sThermalCentrifugeRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.thermalcentrifuge", SoundResource.NONE); // Unboxinator GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.unboxinator", GT_Recipe_Map.sUnboxinatorRecipes); GT_ProcessingArray_Manager.addSoundResourceToPA("basicmachine.unboxinator", SoundResource.NONE); // Wiremill GT_ProcessingArray_Manager.addRecipeMapToPA("basicmachine.wiremill", GT_Recipe_Map.sWiremillRecipes); - GT_ProcessingArray_Manager - .addSoundResourceToPA("basicmachine.wiremill", SoundResource.IC2_MACHINES_RECYCLER_OP); + GT_ProcessingArray_Manager.addSoundResourceToPA( + "basicmachine.wiremill", + SoundResource.IC2_MACHINES_RECYCLER_OP); } } diff --git a/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java b/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java index 7c72cf43f3..aab5f0ac55 100644 --- a/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java @@ -30,8 +30,16 @@ public class GT_RecyclerBlacklistLoader implements Runnable { ItemStack tStack = new ItemStack(Blocks.cobblestone, 1, 0); while (tStack != null) { GT_ModHandler.addToRecyclerBlackList(tStack); - tStack = GT_ModHandler - .getRecipeOutput(tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack, tStack); + tStack = GT_ModHandler.getRecipeOutput( + tStack, + tStack, + tStack, + tStack, + tStack, + tStack, + tStack, + tStack, + tStack); } GT_ModHandler.addToRecyclerBlackList(new ItemStack(Blocks.gravel, 1, 32767)); GT_ModHandler.addToRecyclerBlackList(new ItemStack(Items.flint, 1, 32767)); @@ -96,8 +104,9 @@ public class GT_RecyclerBlacklistLoader implements Runnable { new ItemStack(Blocks.sandstone, 1, 0))); GT_ModHandler.addToRecyclerBlackList(GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0))); GT_ModHandler.addToRecyclerBlackList( - GT_ModHandler - .getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), new ItemStack(Blocks.glass, 1, 0))); + GT_ModHandler.getRecipeOutput( + new ItemStack(Blocks.glass, 1, 0), + new ItemStack(Blocks.glass, 1, 0))); } } } diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index 3cb705cc2a..cce0da00cd 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -45,7 +45,8 @@ public class GT_PCBFactoryRecipes { (int) GT_Values.VP[8]); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), - Materials.get("Artherium-Sn").getPlates(6) }, + Materials.get("Artherium-Sn") + .getPlates(6) }, null, ItemList.BasicPhotolithographicFrameworkCasing.get(1), 30 * 20, @@ -59,7 +60,8 @@ public class GT_PCBFactoryRecipes { (int) GT_Values.VP[9]); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.modID, "blockFrameGtCelestialTungsten", 1), - Materials.get("Quantum").getPlates(6) }, + Materials.get("Quantum") + .getPlates(6) }, null, ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1), 30 * 20, @@ -86,11 +88,16 @@ public class GT_PCBFactoryRecipes { aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(1), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))) }, + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.AnnealedCopper, + (long) (16 * (Math.sqrt(tier)))), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Copper, + (long) (16 * (Math.sqrt(tier)))) }, new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))), Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))) }, aBoards.toArray(new ItemStack[0]), @@ -109,11 +116,16 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(2), GT_Utility.getNaniteAsCatalyst(Materials.Silver), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))) }, + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.AnnealedCopper, + (long) (16 * (Math.sqrt(tier)))), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Copper, + (long) (16 * (Math.sqrt(tier)))) }, new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))), Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))) }, aBoards.toArray(new ItemStack[0]), @@ -132,11 +144,16 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(3), GT_Utility.getNaniteAsCatalyst(Materials.Gold), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))) }, + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.AnnealedCopper, + (long) (16 * (Math.sqrt(tier)))), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Copper, + (long) (16 * (Math.sqrt(tier)))) }, new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))), Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))) }, aBoards.toArray(new ItemStack[0]), @@ -156,11 +173,16 @@ public class GT_PCBFactoryRecipes { aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(1), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))) }, + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Gold, + (long) (16 * (Math.sqrt(tier - 1)))), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Electrum, + (long) (16 * (Math.sqrt(tier - 1)))) }, new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))), Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))) }, aBoards.toArray(new ItemStack[0]), @@ -179,11 +201,16 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(2), GT_Utility.getNaniteAsCatalyst(Materials.Silver), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))) }, + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Gold, + (long) (16 * (Math.sqrt(tier - 1)))), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Electrum, + (long) (16 * (Math.sqrt(tier - 1)))) }, new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))), Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))) }, aBoards.toArray(new ItemStack[0]), @@ -202,11 +229,16 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(3), GT_Utility.getNaniteAsCatalyst(Materials.Gold), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))) }, + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Gold, + (long) (16 * (Math.sqrt(tier - 1)))), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Electrum, + (long) (16 * (Math.sqrt(tier - 1)))) }, new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))), Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))) }, aBoards.toArray(new ItemStack[0]), @@ -226,9 +258,12 @@ public class GT_PCBFactoryRecipes { aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(1), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Aluminium, + (long) (16 * (Math.sqrt(tier - 2)))), GT_OreDictUnificator.get( OrePrefixes.foil, Materials.EnergeticAlloy, @@ -251,9 +286,12 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(2), GT_Utility.getNaniteAsCatalyst(Materials.Silver), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Aluminium, + (long) (16 * (Math.sqrt(tier - 2)))), GT_OreDictUnificator.get( OrePrefixes.foil, Materials.EnergeticAlloy, @@ -276,9 +314,12 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(3), GT_Utility.getNaniteAsCatalyst(Materials.Gold), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Aluminium, + (long) (16 * (Math.sqrt(tier - 2)))), GT_OreDictUnificator.get( OrePrefixes.foil, Materials.EnergeticAlloy, @@ -302,11 +343,16 @@ public class GT_PCBFactoryRecipes { aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(1), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))) }, + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Palladium, + (long) (16 * (Math.sqrt(tier - 3)))), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Platinum, + (long) (16 * (Math.sqrt(tier - 3)))) }, new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))), Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))) }, aBoards.toArray(new ItemStack[0]), @@ -325,11 +371,16 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(2), GT_Utility.getNaniteAsCatalyst(Materials.Silver), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))) }, + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Palladium, + (long) (16 * (Math.sqrt(tier - 3)))), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Platinum, + (long) (16 * (Math.sqrt(tier - 3)))) }, new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))), Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))) }, aBoards.toArray(new ItemStack[0]), @@ -348,11 +399,16 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(3), GT_Utility.getNaniteAsCatalyst(Materials.Gold), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))) }, + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Palladium, + (long) (16 * (Math.sqrt(tier - 3)))), + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Platinum, + (long) (16 * (Math.sqrt(tier - 3)))) }, new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))), Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))) }, aBoards.toArray(new ItemStack[0]), @@ -372,7 +428,8 @@ public class GT_PCBFactoryRecipes { aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(1), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), GT_OreDictUnificator.get( OrePrefixes.foil, Materials.EnrichedHolmium, @@ -400,7 +457,8 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(2), GT_Utility.getNaniteAsCatalyst(Materials.Silver), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), GT_OreDictUnificator.get( OrePrefixes.foil, Materials.EnrichedHolmium, @@ -428,7 +486,8 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(3), GT_Utility.getNaniteAsCatalyst(Materials.Gold), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), GT_OreDictUnificator.get( OrePrefixes.foil, Materials.EnrichedHolmium, @@ -457,13 +516,16 @@ public class GT_PCBFactoryRecipes { aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(1), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), GT_OreDictUnificator.get( OrePrefixes.foil, Materials.Longasssuperconductornameforuvwire, (long) (16 * (Math.sqrt(tier - 5)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))) }, + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Neutronium, + (long) (16 * (Math.sqrt(tier - 5)))) }, new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))), Materials.IronIIIChloride.getFluid((long) (7500 * (Math.sqrt(tier - 5)))), Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))) }, @@ -483,13 +545,16 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(2), GT_Utility.getNaniteAsCatalyst(Materials.Silver), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), GT_OreDictUnificator.get( OrePrefixes.foil, Materials.Longasssuperconductornameforuvwire, (long) (16 * (Math.sqrt(tier - 5)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))) }, + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Neutronium, + (long) (16 * (Math.sqrt(tier - 5)))) }, new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))), Materials.IronIIIChloride.getFluid((long) (7500 * (Math.sqrt(tier - 5)))), Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))) }, @@ -509,13 +574,16 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(3), GT_Utility.getNaniteAsCatalyst(Materials.Gold), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), GT_OreDictUnificator.get( OrePrefixes.foil, Materials.Longasssuperconductornameforuvwire, (long) (16 * (Math.sqrt(tier - 5)))), - GT_OreDictUnificator - .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))) }, + GT_OreDictUnificator.get( + OrePrefixes.foil, + Materials.Neutronium, + (long) (16 * (Math.sqrt(tier - 5)))) }, new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))), Materials.IronIIIChloride.getFluid((long) (7500 * (Math.sqrt(tier - 5)))), Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))) }, @@ -537,7 +605,8 @@ public class GT_PCBFactoryRecipes { aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards)); GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(1), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), GT_ModHandler.getModItem( "bartworks", "gt.bwMetaGeneratedfoil", @@ -570,7 +639,8 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(2), GT_Utility.getNaniteAsCatalyst(Materials.Silver), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), GT_ModHandler.getModItem( "bartworks", "gt.bwMetaGeneratedfoil", @@ -603,7 +673,8 @@ public class GT_PCBFactoryRecipes { GT_Values.RA.addPCBFactoryRecipe( new ItemStack[] { GT_Utility.getIntegratedCircuit(3), GT_Utility.getNaniteAsCatalyst(Materials.Gold), - GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1), + GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) + .getPlates(1), GT_ModHandler.getModItem( "bartworks", "gt.bwMetaGeneratedfoil", diff --git a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java index 8a203768a1..ebe68fe1c6 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java @@ -61,48 +61,90 @@ public class AlloySmelterRecipes implements Runnable { for (MaterialStack[] materials : mAlloySmelterList) { ItemStack dust1 = GT_OreDictUnificator.get(OrePrefixes.dust, materials[0].mMaterial, materials[0].mAmount); ItemStack dust2 = GT_OreDictUnificator.get(OrePrefixes.dust, materials[1].mMaterial, materials[1].mAmount); - ItemStack ingot1 = GT_OreDictUnificator - .get(OrePrefixes.ingot, materials[0].mMaterial, materials[0].mAmount); - ItemStack ingot2 = GT_OreDictUnificator - .get(OrePrefixes.ingot, materials[1].mMaterial, materials[1].mAmount); - ItemStack outputIngot = GT_OreDictUnificator - .get(OrePrefixes.ingot, materials[2].mMaterial, materials[2].mAmount); + ItemStack ingot1 = GT_OreDictUnificator.get( + OrePrefixes.ingot, + materials[0].mMaterial, + materials[0].mAmount); + ItemStack ingot2 = GT_OreDictUnificator.get( + OrePrefixes.ingot, + materials[1].mMaterial, + materials[1].mAmount); + ItemStack outputIngot = GT_OreDictUnificator.get( + OrePrefixes.ingot, + materials[2].mMaterial, + materials[2].mAmount); if (outputIngot != GT_Values.NI) { - GT_Values.RA.stdBuilder().itemInputs(ingot1, dust2).itemOutputs(outputIngot).noFluidInputs() - .noFluidOutputs().duration((int) materials[2].mAmount * 50).eut(16).addTo(sAlloySmelterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ingot1, dust2) + .itemOutputs(outputIngot) + .noFluidInputs() + .noFluidOutputs() + .duration((int) materials[2].mAmount * 50) + .eut(16) + .addTo(sAlloySmelterRecipes); - GT_Values.RA.stdBuilder().itemInputs(ingot1, ingot2).itemOutputs(outputIngot).noFluidInputs() - .noFluidOutputs().duration((int) materials[2].mAmount * 50).eut(16).addTo(sAlloySmelterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ingot1, ingot2) + .itemOutputs(outputIngot) + .noFluidInputs() + .noFluidOutputs() + .duration((int) materials[2].mAmount * 50) + .eut(16) + .addTo(sAlloySmelterRecipes); - GT_Values.RA.stdBuilder().itemInputs(dust1, ingot2).itemOutputs(outputIngot).noFluidInputs() - .noFluidOutputs().duration((int) materials[2].mAmount * 50).eut(16).addTo(sAlloySmelterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(dust1, ingot2) + .itemOutputs(outputIngot) + .noFluidInputs() + .noFluidOutputs() + .duration((int) materials[2].mAmount * 50) + .eut(16) + .addTo(sAlloySmelterRecipes); - GT_Values.RA.stdBuilder().itemInputs(dust1, dust2).itemOutputs(outputIngot).noFluidInputs() - .noFluidOutputs().duration((int) materials[2].mAmount * 50).eut(16).addTo(sAlloySmelterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(dust1, dust2) + .itemOutputs(outputIngot) + .noFluidInputs() + .noFluidOutputs() + .duration((int) materials[2].mAmount * 50) + .eut(16) + .addTo(sAlloySmelterRecipes); } } GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lead, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2L)) - .itemOutputs(ItemList.TE_Hardened_Glass.get(2L)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(16).addTo(sAlloySmelterRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lead, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2L)) + .itemOutputs(ItemList.TE_Hardened_Glass.get(2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sAlloySmelterRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Lead, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2L)) - .itemOutputs(ItemList.TE_Hardened_Glass.get(2L)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(16).addTo(sAlloySmelterRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Lead, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2L)) + .itemOutputs(ItemList.TE_Hardened_Glass.get(2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sAlloySmelterRecipes); // We use rubber GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L)).noFluidInputs() - .noFluidOutputs().duration(10 * SECONDS).eut(8).addTo(sAlloySmelterRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(8) + .addTo(sAlloySmelterRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java index 90dc6a9678..bb2b0a89e9 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java @@ -14,299 +14,505 @@ public class ArcFurnaceRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(ItemList.Block_TungstenSteelReinforced.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Concrete, 1)) - .noFluidInputs().noFluidOutputs().duration(8 * SECONDS).eut(96).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Long_Distance_Pipeline_Fluid.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 19L)).noFluidInputs() - .noFluidOutputs().duration(9 * SECONDS).eut((int) TierEU.RECIPE_MV).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Long_Distance_Pipeline_Item.get(1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 12L), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L)) - .noFluidInputs().noFluidOutputs().duration(9 * SECONDS).eut((int) TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 2L)).noFluidInputs() - .noFluidOutputs().duration(10 * TICKS).eut((int) TierEU.RECIPE_MV).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Long_Distance_Pipeline_Item_Pipe.get(1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L)) - .noFluidInputs().noFluidOutputs().duration(10 * TICKS).eut((int) TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_Cupronickel.get(1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_Kanthal.get(1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_Nichrome.get(1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_TungstenSteel.get(1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 5)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_HSSG.get(1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 6)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_HSSS.get(1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 7)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_Naquadah.get(1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_NaquadahAlloy.get(1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 9)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_Trinium.get(1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 10)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_ElectrumFlux.get(1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 11)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_AwakenedDraconium.get(1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DraconiumAwakened, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 2L)).noFluidInputs() - .noFluidOutputs().duration(7 * SECONDS + 10 * TICKS).eut(90).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .noFluidInputs().noFluidOutputs().duration(7 * SECONDS + 10 * TICKS).eut(90).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6)) - .noFluidInputs().noFluidOutputs().duration(7 * SECONDS + 10 * TICKS).eut(90).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 2L)).noFluidInputs() - .noFluidOutputs().duration(9 * SECONDS).eut((int) TierEU.RECIPE_MV).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 14)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .noFluidInputs().noFluidOutputs().duration(9 * SECONDS).eut((int) TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 6L)) - .noFluidInputs().noFluidOutputs().duration(9 * SECONDS).eut((int) TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 2L)).noFluidInputs() - .noFluidOutputs().duration(10 * SECONDS + 10 * TICKS).eut(150).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 3)).noFluidInputs() - .noFluidOutputs().duration(10 * SECONDS + 10 * TICKS).eut(150).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 6L)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS + 10 * TICKS).eut(150) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 2L)).noFluidInputs() - .noFluidOutputs().duration(12 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 4)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .noFluidInputs().noFluidOutputs().duration(12 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.StainlessSteel, 6L)) - .noFluidInputs().noFluidOutputs().duration(12 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 2L)).noFluidInputs() - .noFluidOutputs().duration(13 * SECONDS + 10 * TICKS).eut(210).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 7)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .noFluidInputs().noFluidOutputs().duration(13 * SECONDS + 10 * TICKS).eut(210) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Titanium, 6L)) - .noFluidInputs().noFluidOutputs().duration(13 * SECONDS + 10 * TICKS).eut(210) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2L)).noFluidInputs() - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 10)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.TungstenSteel, 6L)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 2L)).noFluidInputs() - .noFluidOutputs().duration(16 * SECONDS + 10 * TICKS).eut(270).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 13)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .noFluidInputs().noFluidOutputs().duration(16 * SECONDS + 10 * TICKS).eut(270) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NiobiumTitanium, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L)) - .noFluidInputs().noFluidOutputs().duration(16 * SECONDS + 10 * TICKS).eut(270) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 2L)).noFluidInputs() - .noFluidOutputs().duration(18 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .noFluidInputs().noFluidOutputs().duration(18 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Enderium, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L)) - .noFluidInputs().noFluidOutputs().duration(18 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 2L)).noFluidInputs() - .noFluidOutputs().duration(18 * SECONDS).eut(330).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 4)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .noFluidInputs().noFluidOutputs().duration(18 * SECONDS).eut(330).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L)) - .noFluidInputs().noFluidOutputs().duration(18 * SECONDS).eut(330).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 2L)).noFluidInputs() - .noFluidOutputs().duration(18 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 7)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .noFluidInputs().noFluidOutputs().duration(18 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neutronium, 6L)) - .noFluidInputs().noFluidOutputs().duration(18 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sArcFurnaceRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3)) - .fluidInputs(Materials.Oxygen.getGas(2000L)).noFluidOutputs().duration(60 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sArcFurnaceRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Block_TungstenSteelReinforced.get(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Concrete, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(96) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Long_Distance_Pipeline_Fluid.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 19L)) + .noFluidInputs() + .noFluidOutputs() + .duration(9 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Long_Distance_Pipeline_Item.get(1L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 12L), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L)) + .noFluidInputs() + .noFluidOutputs() + .duration(9 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut((int) TierEU.RECIPE_MV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Long_Distance_Pipeline_Item_Pipe.get(1L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut((int) TierEU.RECIPE_MV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Cupronickel.get(1L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Kanthal.get(1L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Nichrome.get(1L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_TungstenSteel.get(1L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 5)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_HSSG.get(1L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 6)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_HSSS.get(1L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 7)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Naquadah.get(1L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_NaquadahAlloy.get(1L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 9)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Trinium.get(1L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 10)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_ElectrumFlux.get(1L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 11)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_AwakenedDraconium.get(1L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DraconiumAwakened, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(7 * SECONDS + 10 * TICKS) + .eut(90) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(7 * SECONDS + 10 * TICKS) + .eut(90) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6)) + .noFluidInputs() + .noFluidOutputs() + .duration(7 * SECONDS + 10 * TICKS) + .eut(90) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(9 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 14)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(9 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 6L)) + .noFluidInputs() + .noFluidOutputs() + .duration(9 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS + 10 * TICKS) + .eut(150) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS + 10 * TICKS) + .eut(150) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Aluminium, 6L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS + 10 * TICKS) + .eut(150) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 4)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.StainlessSteel, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.StainlessSteel, 6L)) + .noFluidInputs() + .noFluidOutputs() + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(13 * SECONDS + 10 * TICKS) + .eut(210) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 7)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(13 * SECONDS + 10 * TICKS) + .eut(210) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Titanium, 6L)) + .noFluidInputs() + .noFluidOutputs() + .duration(13 * SECONDS + 10 * TICKS) + .eut(210) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 10)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.TungstenSteel, 6L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * SECONDS + 10 * TICKS) + .eut(270) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 13)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Palladium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * SECONDS + 10 * TICKS) + .eut(270) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NiobiumTitanium, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * SECONDS + 10 * TICKS) + .eut(270) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(18 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iridium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(18 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Enderium, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L)) + .noFluidInputs() + .noFluidOutputs() + .duration(18 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(18 * SECONDS) + .eut(330) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 4)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(18 * SECONDS) + .eut(330) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L)) + .noFluidInputs() + .noFluidOutputs() + .duration(18 * SECONDS) + .eut(330) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 2L)) + .noFluidInputs() + .noFluidOutputs() + .duration(18 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 7)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 1L), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(18 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Neutronium, 12L), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Neutronium, 6L)) + .noFluidInputs() + .noFluidOutputs() + .duration(18 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sArcFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3)) + .fluidInputs(Materials.Oxygen.getGas(2000L)) + .noFluidOutputs() + .duration(60 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sArcFurnaceRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index c76b2a90f4..06c4ad1879 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -37,198 +37,292 @@ public class AssemblerRecipes implements Runnable { this.withIC2NuclearControl(); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1)) - .itemOutputs(ItemList.Block_Plascrete.get(1)).fluidInputs(Materials.Concrete.getMolten(144)) - .noFluidOutputs().duration(10 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1)) + .itemOutputs(ItemList.Block_Plascrete.get(1)) + .fluidInputs(Materials.Concrete.getMolten(144)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1)) - .itemOutputs(ItemList.Block_Plascrete.get(1)).fluidInputs(Materials.Concrete.getMolten(144)) - .noFluidOutputs().duration(10 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1)) + .itemOutputs(ItemList.Block_Plascrete.get(1)) + .fluidInputs(Materials.Concrete.getMolten(144)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); for (byte i = 0; i < 16; i = (byte) (i + 1)) { for (int j = 0; j < Dyes.VALUES[i].getSizeOfFluidList(); j++) { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.string, 3), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(new ItemStack(Blocks.carpet, 2, 15 - i)) - .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 24)).noFluidOutputs() - .duration(6 * SECONDS + 8 * TICKS).eut(5).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.string, 3), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(new ItemStack(Blocks.carpet, 2, 15 - i)) + .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 24)) + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sAssemblerRecipes); } } GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.PolyvinylChloride, 1), - ItemList.Paper_Printed_Pages.get(1)) - .itemOutputs(new ItemStack(Items.written_book, 1, 0)).fluidInputs(Materials.Glue.getFluid(20)) - .noFluidOutputs().duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.PolyvinylChloride, 1), + ItemList.Paper_Printed_Pages.get(1)) + .itemOutputs(new ItemStack(Items.written_book, 1, 0)) + .fluidInputs(Materials.Glue.getFluid(20)) + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.PolyvinylChloride, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3)) - .itemOutputs(new ItemStack(Items.book, 1, 0)).fluidInputs(Materials.Glue.getFluid(20)).noFluidOutputs() - .duration(20 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.PolyvinylChloride, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3)) + .itemOutputs(new ItemStack(Items.book, 1, 0)) + .fluidInputs(Materials.Glue.getFluid(20)) + .noFluidOutputs() + .duration(20 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getIC2Item("carbonMesh", 4), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Component_Filter.get(1)).noFluidInputs().noFluidOutputs() - .duration(1 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_ModHandler.getIC2Item("carbonMesh", 4), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Component_Filter.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Component_Filter.get(1)).fluidInputs(Materials.Plastic.getFluid(144)) - .noFluidOutputs().duration(1 * MINUTES + 20 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Component_Filter.get(1)) + .fluidInputs(Materials.Plastic.getFluid(144)) + .noFluidOutputs() + .duration(1 * MINUTES + 20 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), - ItemList.Circuit_Silicon_Wafer2.get(32), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64)) - .fluidInputs(Materials.AdvancedGlue.getFluid(500)).noFluidOutputs().duration(2 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), + ItemList.Circuit_Silicon_Wafer2.get(32), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64)) + .fluidInputs(Materials.AdvancedGlue.getFluid(500)) + .noFluidOutputs() + .duration(2 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), - ItemList.Circuit_Silicon_Wafer3.get(8), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64)) - .fluidInputs(Materials.AdvancedGlue.getFluid(250)).noFluidOutputs().duration(40 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), + ItemList.Circuit_Silicon_Wafer3.get(8), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64)) + .fluidInputs(Materials.AdvancedGlue.getFluid(250)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Electric_Pump_LV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Basic), 2), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.FluidRegulator_LV.get(1)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Electric_Pump_LV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Basic), 2), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.FluidRegulator_LV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Electric_Pump_MV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.FluidRegulator_MV.get(1)).noFluidInputs().noFluidOutputs() - .duration(17 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Electric_Pump_MV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.FluidRegulator_MV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(17 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Electric_Pump_HV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Advanced), 2), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.FluidRegulator_HV.get(1)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Electric_Pump_HV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Advanced), 2), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.FluidRegulator_HV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Electric_Pump_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Data), 2), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.FluidRegulator_EV.get(1)).noFluidInputs().noFluidOutputs() - .duration(12 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Electric_Pump_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Data), 2), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.FluidRegulator_EV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(12 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Electric_Pump_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Elite), 2), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.FluidRegulator_IV.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Electric_Pump_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Elite), 2), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.FluidRegulator_IV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Electric_Pump_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Master), 2), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.FluidRegulator_LuV.get(1)).noFluidInputs().noFluidOutputs() - .duration(7 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Electric_Pump_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Master), 2), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.FluidRegulator_LuV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Electric_Pump_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Ultimate), 2), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.FluidRegulator_ZPM.get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Electric_Pump_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Ultimate), 2), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.FluidRegulator_ZPM.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Electric_Pump_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.FluidRegulator_UV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(500000).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Electric_Pump_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.FluidRegulator_UV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(500000) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Steam_Valve_LV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Basic), 2), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Steam_Regulator_LV.get(1)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Steam_Valve_LV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Basic), 2), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Steam_Regulator_LV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Steam_Valve_MV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Steam_Regulator_MV.get(1)).noFluidInputs().noFluidOutputs() - .duration(17 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Steam_Valve_MV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Steam_Regulator_MV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(17 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Steam_Valve_HV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Advanced), 2), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Steam_Regulator_HV.get(1)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Steam_Valve_HV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Advanced), 2), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Steam_Regulator_HV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Steam_Valve_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Data), 2), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Steam_Regulator_EV.get(1)).noFluidInputs().noFluidOutputs() - .duration(12 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Steam_Valve_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Data), 2), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Steam_Regulator_EV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(12 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Steam_Valve_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Elite), 2), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Steam_Regulator_IV.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Steam_Valve_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Elite), 2), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Steam_Regulator_IV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Electric_Pump_LV.get(1), - ItemList.Electric_Motor_LV.get(1), - GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.Steel), 2), - GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(ItemList.Steam_Valve_LV.get(1)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Electric_Pump_LV.get(1), + ItemList.Electric_Motor_LV.get(1), + GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.Steel), 2), + GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(ItemList.Steam_Valve_LV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Electric_Pump_MV.get(1), - ItemList.Electric_Motor_MV.get(1), - GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.Aluminium), 2), - GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(ItemList.Steam_Valve_MV.get(1)).noFluidInputs().noFluidOutputs() - .duration(17 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Electric_Pump_MV.get(1), + ItemList.Electric_Motor_MV.get(1), + GT_OreDictUnificator.get(OrePrefixes.gear.get(Materials.Aluminium), 2), + GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(ItemList.Steam_Valve_MV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(17 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); { // limiting lifetime of the variables ItemStack flask = ItemList.VOLUMETRIC_FLASK.get(1); @@ -240,1768 +334,2802 @@ public class AssemblerRecipes implements Runnable { flask.setTagCompound(nbtFlask); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.VOLUMETRIC_FLASK.get(1), - GT_Utility.getIntegratedCircuit(circuitConfigurations[i])) - .itemOutputs(flask).noFluidInputs().noFluidOutputs().duration(10 * TICKS).eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.VOLUMETRIC_FLASK.get(1), + GT_Utility.getIntegratedCircuit(circuitConfigurations[i])) + .itemOutputs(flask) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); } } GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Bronze, 1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Bronze, 1), - ItemList.Electric_Motor_LV.get(1), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Hatch_Muffler_LV.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, 1), - ItemList.Electric_Motor_MV.get(1), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Hatch_Muffler_MV.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1), - ItemList.Electric_Motor_HV.get(1), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Hatch_Muffler_HV.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 1), - ItemList.Electric_Motor_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Hatch_Muffler_EV.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 1), - ItemList.Electric_Motor_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Hatch_Muffler_IV.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 1), - ItemList.Electric_Motor_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Enderium, 1), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Hatch_Muffler_LuV.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Bronze, 1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Bronze, 1), + ItemList.Electric_Motor_LV.get(1), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Hatch_Muffler_LV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 1), - ItemList.Electric_Motor_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 1), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Hatch_Muffler_ZPM.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 1), - ItemList.Electric_Motor_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 1), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Hatch_Muffler_UV.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(500000).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, 1), + ItemList.Electric_Motor_MV.get(1), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Hatch_Muffler_MV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MAX.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.MysteriousCrystal, 1), - ItemList.Electric_Motor_UHV.get(1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.CosmicNeutronium, 1), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Hatch_Muffler_MAX.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(2000000).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_HV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1), + ItemList.Electric_Motor_HV.get(1), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Hatch_Muffler_HV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.redstone_torch, 2, 32767), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1)) - .itemOutputs(new ItemStack(Items.repeater, 1, 0)).fluidInputs(Materials.Concrete.getMolten(144)) - .noFluidOutputs().duration(4 * SECONDS).eut(10).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 1), + ItemList.Electric_Motor_EV.get(1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Hatch_Muffler_EV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.leather, 1, 32767), new ItemStack(Items.lead, 1, 32767)) - .itemOutputs(new ItemStack(Items.name_tag, 1, 0)).fluidInputs(Materials.Glue.getFluid(72)) - .noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.ArtificialLeather", 1L, 0), - new ItemStack(Items.lead, 1, 32767)) - .itemOutputs(new ItemStack(Items.name_tag, 1, 0)).fluidInputs(Materials.Glue.getFluid(72)) - .noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 1), + ItemList.Electric_Motor_IV.get(1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Hatch_Muffler_IV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 8), - new ItemStack(Items.compass, 1, 32767)) - .itemOutputs(new ItemStack(Items.map, 1, 0)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(8).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 1), + ItemList.Electric_Motor_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Enderium, 1), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Hatch_Muffler_LuV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tantalum, 1), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Manganese, 1)) - .itemOutputs(ItemList.Battery_RE_ULV_Tantalum.get(8)).fluidInputs(Materials.Plastic.getMolten(144)) - .noFluidOutputs().duration(5 * SECONDS).eut(4).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 1), + ItemList.Electric_Motor_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 1), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Hatch_Muffler_ZPM.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfLife1", 4L, 0), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfLife2", 1L, 0)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 1), + ItemList.Electric_Motor_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 1), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Hatch_Muffler_UV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(500000) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfKeeping1", 4L, 0), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping2", 1L, 0)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MAX.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.MysteriousCrystal, 1), + ItemList.Electric_Motor_UHV.get(1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.CosmicNeutronium, 1), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Hatch_Muffler_MAX.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(2000000) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfKeeping2", 4L, 0), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping3", 1L, 0)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.redstone_torch, 2, 32767), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1)) + .itemOutputs(new ItemStack(Items.repeater, 1, 0)) + .fluidInputs(Materials.Concrete.getMolten(144)) + .noFluidOutputs() + .duration(4 * SECONDS) + .eut(10) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfLife2", 1L, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfLife1", 4L, 0)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(sAssemblerRecipes); + .itemInputs(new ItemStack(Items.leather, 1, 32767), new ItemStack(Items.lead, 1, 32767)) + .itemOutputs(new ItemStack(Items.name_tag, 1, 0)) + .fluidInputs(Materials.Glue.getFluid(72)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfKeeping2", 1L, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping1", 4L, 0)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(NewHorizonsCoreMod.modID, "item.ArtificialLeather", 1L, 0), + new ItemStack(Items.lead, 1, 32767)) + .itemOutputs(new ItemStack(Items.name_tag, 1, 0)) + .fluidInputs(Materials.Glue.getFluid(72)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(TwilightForest.modID, "item.charmOfKeeping3", 1L, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping2", 4L, 0)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 8), + new ItemStack(Items.compass, 1, 32767)) + .itemOutputs(new ItemStack(Items.map, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 16), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 23)) - .fluidInputs(Materials.Redstone.getMolten(144)).noFluidOutputs().duration(3 * SECONDS + 4 * TICKS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tantalum, 1), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Manganese, 1)) + .itemOutputs(ItemList.Battery_RE_ULV_Tantalum.get(8)) + .fluidInputs(Materials.Plastic.getMolten(144)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 17), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 24)) - .fluidInputs(Materials.Redstone.getMolten(144)).noFluidOutputs().duration(3 * SECONDS + 4 * TICKS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(TwilightForest.modID, "item.charmOfLife1", 4L, 0), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfLife2", 1L, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 18), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 22)) - .fluidInputs(Materials.Redstone.getMolten(144)).noFluidOutputs().duration(3 * SECONDS + 4 * TICKS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(TwilightForest.modID, "item.charmOfKeeping1", 4L, 0), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping2", 1L, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 1), - new ItemStack(Blocks.sand, 1, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 2L, 0)).noFluidInputs() - .noFluidOutputs().duration(3 * SECONDS + 4 * TICKS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(TwilightForest.modID, "item.charmOfKeeping2", 4L, 0), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping3", 1L, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 1), - new ItemStack(Blocks.sand, 1, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 2L, 600)).noFluidInputs() - .noFluidOutputs().duration(3 * SECONDS + 4 * TICKS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(TwilightForest.modID, "item.charmOfLife2", 1L, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfLife1", 4L, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Fluix, 1), - new ItemStack(Blocks.sand, 1, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 2L, 1200)).noFluidInputs() - .noFluidOutputs().duration(3 * SECONDS + 4 * TICKS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(TwilightForest.modID, "item.charmOfKeeping2", 1L, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping1", 4L, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.FR_Wax.get(6), new ItemStack(Items.string, 1, 32767)) - .itemOutputs(getModItem(Forestry.modID, "candle", 24L, 0)).fluidInputs(Materials.Water.getFluid(600)) - .noFluidOutputs().duration(3 * SECONDS + 4 * TICKS).eut(8).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + getModItem(TwilightForest.modID, "item.charmOfKeeping3", 1L, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(TwilightForest.modID, "item.charmOfKeeping2", 4L, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.FR_Wax.get(2), ItemList.FR_Silk.get(1)) - .itemOutputs(getModItem(Forestry.modID, "candle", 8L, 0)).fluidInputs(Materials.Water.getFluid(200)) - .noFluidOutputs().duration(16 * TICKS).eut(8).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 16), + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 23)) + .fluidInputs(Materials.Redstone.getMolten(144)) + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.FR_Silk.get(9), GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(getModItem(Forestry.modID, "craftingMaterial", 1L, 3)) - .fluidInputs(Materials.Water.getFluid(500)).noFluidOutputs().duration(3 * SECONDS + 4 * TICKS).eut(8) - .addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 17), + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 24)) + .fluidInputs(Materials.Redstone.getMolten(144)) + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "propolis", 5L, 2), GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(getModItem(Forestry.modID, "craftingMaterial", 1L, 1)).noFluidInputs().noFluidOutputs() - .duration(16 * TICKS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 18), + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 22)) + .fluidInputs(Materials.Redstone.getMolten(144)) + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(Forestry.modID, "sturdyMachine", 1L, 0), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 4)) - .itemOutputs(ItemList.FR_Casing_Hardened.get(1)).fluidInputs(Materials.Water.getFluid(5000)) - .noFluidOutputs().duration(3 * SECONDS + 4 * TICKS).eut(32).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 1), + new ItemStack(Blocks.sand, 1, 32767)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 2L, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.FR_Casing_Sturdy.get(1)).noFluidInputs().noFluidOutputs() - .duration(1 * SECONDS + 12 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 1), + new ItemStack(Blocks.sand, 1, 32767)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 2L, 600)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), - new ItemStack(Blocks.wool, 1, 32767)) - .itemOutputs(new ItemStack(Blocks.torch, 6, 0)).fluidInputs(Materials.Creosote.getFluid(1000)) - .noFluidOutputs().duration(20 * SECONDS).eut(1).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Fluix, 1), + new ItemStack(Blocks.sand, 1, 32767)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 2L, 1200)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "craftingMaterial", 5L, 1), GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1)).noFluidInputs() - .noFluidOutputs().duration(3 * SECONDS + 4 * TICKS).eut(8).addTo(sAssemblerRecipes); + .itemInputs(ItemList.FR_Wax.get(6), new ItemStack(Items.string, 1, 32767)) + .itemOutputs(getModItem(Forestry.modID, "candle", 24L, 0)) + .fluidInputs(Materials.Water.getFluid(600)) + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.piston, 1, 32767), new ItemStack(Items.slime_ball, 1, 32767)) - .itemOutputs(new ItemStack(Blocks.sticky_piston, 1, 0)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(4).addTo(sAssemblerRecipes); + .itemInputs(ItemList.FR_Wax.get(2), ItemList.FR_Silk.get(1)) + .itemOutputs(getModItem(Forestry.modID, "candle", 8L, 0)) + .fluidInputs(Materials.Water.getFluid(200)) + .noFluidOutputs() + .duration(16 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.piston, 1, 32767), ItemList.IC2_Resin.get(1)) - .itemOutputs(new ItemStack(Blocks.sticky_piston, 1, 0)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.FR_Silk.get(9), GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(getModItem(Forestry.modID, "craftingMaterial", 1L, 3)) + .fluidInputs(Materials.Water.getFluid(500)) + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.piston, 1, 32767), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(new ItemStack(Blocks.sticky_piston, 1, 0)).fluidInputs(Materials.Glue.getFluid(100)) - .noFluidOutputs().duration(5 * SECONDS).eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Forestry.modID, "propolis", 5L, 2), GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(getModItem(Forestry.modID, "craftingMaterial", 1L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 3), - GT_ModHandler.getIC2Item("carbonMesh", 3), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Duct_Tape.get(1)).fluidInputs(Materials.Glue.getFluid(300)).noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(Forestry.modID, "sturdyMachine", 1L, 0), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Diamond, 4)) + .itemOutputs(ItemList.FR_Casing_Hardened.get(1)) + .fluidInputs(Materials.Water.getFluid(5000)) + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(32) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StyreneButadieneRubber, 2), - GT_ModHandler.getIC2Item("carbonMesh", 2), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Duct_Tape.get(1)).fluidInputs(Materials.Glue.getFluid(200)).noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.FR_Casing_Sturdy.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicone, 1), - GT_ModHandler.getIC2Item("carbonMesh", 1), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Duct_Tape.get(1)).fluidInputs(Materials.Glue.getFluid(100)).noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), + new ItemStack(Blocks.wool, 1, 32767)) + .itemOutputs(new ItemStack(Blocks.torch, 6, 0)) + .fluidInputs(Materials.Creosote.getFluid(1000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(1) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + getModItem(Forestry.modID, "craftingMaterial", 5L, 1), + GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.piston, 1, 32767), new ItemStack(Items.slime_ball, 1, 32767)) + .itemOutputs(new ItemStack(Blocks.sticky_piston, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.piston, 1, 32767), ItemList.IC2_Resin.get(1)) + .itemOutputs(new ItemStack(Blocks.sticky_piston, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.piston, 1, 32767), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(new ItemStack(Blocks.sticky_piston, 1, 0)) + .fluidInputs(Materials.Glue.getFluid(100)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Rubber, 3), + GT_ModHandler.getIC2Item("carbonMesh", 3), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Duct_Tape.get(1)) + .fluidInputs(Materials.Glue.getFluid(300)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StyreneButadieneRubber, 2), + GT_ModHandler.getIC2Item("carbonMesh", 2), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Duct_Tape.get(1)) + .fluidInputs(Materials.Glue.getFluid(200)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicone, 1), + GT_ModHandler.getIC2Item("carbonMesh", 1), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Duct_Tape.get(1)) + .fluidInputs(Materials.Glue.getFluid(100)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); // Maintenance Hatch Recipes Using BrainTech + Refined Glue. Info: One BrainTech Recipe Is In GT+ü Originally. // The Maintenance Hatch Recipe using SuperGlue is there. GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Hull_LV.get(1), ItemList.Duct_Tape.get(2), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Maintenance.get(1)).fluidInputs(Materials.Glue.getFluid(1000)) - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs(ItemList.Hull_LV.get(1), ItemList.Duct_Tape.get(2), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Maintenance.get(1)) + .fluidInputs(Materials.Glue.getFluid(1000)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3), - new ItemStack(Items.leather, 1, 32767)) - .itemOutputs(new ItemStack(Items.book, 1, 0)).fluidInputs(Materials.Glue.getFluid(20)).noFluidOutputs() - .duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3), + new ItemStack(Items.leather, 1, 32767)) + .itemOutputs(new ItemStack(Items.book, 1, 0)) + .fluidInputs(Materials.Glue.getFluid(20)) + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3), - getModItem(NewHorizonsCoreMod.modID, "item.ArtificialLeather", 1L, 0)) - .itemOutputs(new ItemStack(Items.book, 1, 0)).fluidInputs(Materials.Glue.getFluid(20)).noFluidOutputs() - .duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3), + getModItem(NewHorizonsCoreMod.modID, "item.ArtificialLeather", 1L, 0)) + .itemOutputs(new ItemStack(Items.book, 1, 0)) + .fluidInputs(Materials.Glue.getFluid(20)) + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Paper, 1)) - .itemOutputs(new ItemStack(Items.book, 1, 0)).fluidInputs(Materials.Glue.getFluid(20)).noFluidOutputs() - .duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3), + GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Paper, 1)) + .itemOutputs(new ItemStack(Items.book, 1, 0)) + .fluidInputs(Materials.Glue.getFluid(20)) + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Paper_Printed_Pages.get(1), new ItemStack(Items.leather, 1, 32767)) - .itemOutputs(new ItemStack(Items.written_book, 1, 0)).fluidInputs(Materials.Glue.getFluid(20)) - .noFluidOutputs().duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(sAssemblerRecipes); + .itemInputs(ItemList.Paper_Printed_Pages.get(1), new ItemStack(Items.leather, 1, 32767)) + .itemOutputs(new ItemStack(Items.written_book, 1, 0)) + .fluidInputs(Materials.Glue.getFluid(20)) + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Paper_Printed_Pages.get(1), - getModItem(NewHorizonsCoreMod.modID, "item.ArtificialLeather", 1L, 0)) - .itemOutputs(new ItemStack(Items.written_book, 1, 0)).fluidInputs(Materials.Glue.getFluid(20)) - .noFluidOutputs().duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Paper_Printed_Pages.get(1), + getModItem(NewHorizonsCoreMod.modID, "item.ArtificialLeather", 1L, 0)) + .itemOutputs(new ItemStack(Items.written_book, 1, 0)) + .fluidInputs(Materials.Glue.getFluid(20)) + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 4)) - .itemOutputs(ItemList.Cell_Universal_Fluid.get(1)).noFluidInputs().noFluidOutputs() - .duration(6 * SECONDS + 8 * TICKS).eut(8).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 4)) + .itemOutputs(ItemList.Cell_Universal_Fluid.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Baked_Cake.get(1), new ItemStack(Items.egg, 1, 0)) - .itemOutputs(new ItemStack(Items.cake, 1, 0)).fluidInputs(Materials.Milk.getFluid(3000)) - .noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Baked_Cake.get(1), new ItemStack(Items.egg, 1, 0)) + .itemOutputs(new ItemStack(Items.cake, 1, 0)) + .fluidInputs(Materials.Milk.getFluid(3000)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Sliced_Bun.get(2), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Food_Sliced_Buns.get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Sliced_Bun.get(2), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Food_Sliced_Buns.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Sliced_Bread.get(2), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Food_Sliced_Breads.get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Sliced_Bread.get(2), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Food_Sliced_Breads.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Sliced_Baguette.get(2), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Food_Sliced_Baguettes.get(1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Sliced_Baguette.get(2), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Food_Sliced_Baguettes.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Sliced_Buns.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Food_Sliced_Bun.get(2)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Sliced_Buns.get(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Food_Sliced_Bun.get(2)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Sliced_Breads.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Food_Sliced_Bread.get(2)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Sliced_Breads.get(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Food_Sliced_Bread.get(2)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Sliced_Baguettes.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Food_Sliced_Baguette.get(2)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Sliced_Baguettes.get(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Food_Sliced_Baguette.get(2)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Food_Sliced_Bun.get(2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1)) - .itemOutputs(ItemList.Food_Burger_Meat.get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Food_Sliced_Bun.get(2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1)) + .itemOutputs(ItemList.Food_Burger_Meat.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Food_Sliced_Buns.get(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1)) - .itemOutputs(ItemList.Food_Burger_Meat.get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Food_Sliced_Buns.get(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1)) + .itemOutputs(ItemList.Food_Burger_Meat.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Sliced_Bun.get(2), ItemList.Food_Chum.get(1)) - .itemOutputs(ItemList.Food_Burger_Chum.get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Sliced_Bun.get(2), ItemList.Food_Chum.get(1)) + .itemOutputs(ItemList.Food_Burger_Chum.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Sliced_Buns.get(1), ItemList.Food_Chum.get(1)) - .itemOutputs(ItemList.Food_Burger_Chum.get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Sliced_Buns.get(1), ItemList.Food_Chum.get(1)) + .itemOutputs(ItemList.Food_Burger_Chum.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Sliced_Bun.get(2), ItemList.Food_Sliced_Cheese.get(3)) - .itemOutputs(ItemList.Food_Burger_Cheese.get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Sliced_Bun.get(2), ItemList.Food_Sliced_Cheese.get(3)) + .itemOutputs(ItemList.Food_Burger_Cheese.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Sliced_Buns.get(1), ItemList.Food_Sliced_Cheese.get(3)) - .itemOutputs(ItemList.Food_Burger_Cheese.get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Sliced_Buns.get(1), ItemList.Food_Sliced_Cheese.get(3)) + .itemOutputs(ItemList.Food_Burger_Cheese.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Food_Flat_Dough.get(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1)) - .itemOutputs(ItemList.Food_Raw_Pizza_Meat.get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Food_Flat_Dough.get(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1)) + .itemOutputs(ItemList.Food_Raw_Pizza_Meat.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Flat_Dough.get(1), ItemList.Food_Sliced_Cheese.get(3)) - .itemOutputs(ItemList.Food_Raw_Pizza_Cheese.get(1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Flat_Dough.get(1), ItemList.Food_Sliced_Cheese.get(3)) + .itemOutputs(ItemList.Food_Raw_Pizza_Cheese.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); // SC craft GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Pentacadmiummagnesiumhexaoxid, 3), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 2), - ItemList.Electric_Pump_MV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3)) - .fluidInputs(Materials.Helium.getGas(2000)).noFluidOutputs().duration(20 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator - .get(OrePrefixes.wireGt01, Materials.Titaniumonabariumdecacoppereikosaoxid, 6), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 4), - ItemList.Electric_Pump_HV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 6)) - .fluidInputs(Materials.Helium.getGas(4000)).noFluidOutputs().duration(20 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 6), - ItemList.Electric_Pump_EV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 9)) - .fluidInputs(Materials.Helium.getGas(6000)).noFluidOutputs().duration(20 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 8), - ItemList.Electric_Pump_IV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12)) - .fluidInputs(Materials.Helium.getGas(8000)).noFluidOutputs().duration(40 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get( - OrePrefixes.wireGt01, - Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, - 15), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10), - ItemList.Electric_Pump_LuV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15)) - .fluidInputs(Materials.Helium.getGas(12000)).noFluidOutputs().duration(40 * SECONDS) - .eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator - .get(OrePrefixes.wireGt01, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 18), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12), - ItemList.Electric_Pump_ZPM.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18)) - .fluidInputs(Materials.Helium.getGas(16000)).noFluidOutputs().duration(1 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator - .get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14), - ItemList.Electric_Pump_UV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21)) - .fluidInputs(Materials.Helium.getGas(20000)).noFluidOutputs().duration(1 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_UV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator - .get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16), - ItemList.Electric_Pump_UHV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24)) - .fluidInputs(Materials.Helium.getGas(24000)).noFluidOutputs().duration(2 * MINUTES + 40 * SECONDS) - .eut(TierEU.RECIPE_UHV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lead, 16), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.ULV_Coil.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(8) - .addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 16), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.LV_Coil.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SteelMagnetic, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Aluminium, 16), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.MV_Coil.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SteelMagnetic, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.EnergeticAlloy, 16), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.HV_Coil.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NeodymiumMagnetic, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.TungstenSteel, 16), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.EV_Coil.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NeodymiumMagnetic, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iridium, 16), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.IV_Coil.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Pentacadmiummagnesiumhexaoxid, 3), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 2), + ItemList.Electric_Pump_MV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3)) + .fluidInputs(Materials.Helium.getGas(2000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + Materials.Titaniumonabariumdecacoppereikosaoxid, + 6), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 4), + ItemList.Electric_Pump_HV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 6)) + .fluidInputs(Materials.Helium.getGas(4000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 6), + ItemList.Electric_Pump_EV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 9)) + .fluidInputs(Materials.Helium.getGas(6000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 8), + ItemList.Electric_Pump_IV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12)) + .fluidInputs(Materials.Helium.getGas(8000)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, + 15), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10), + ItemList.Electric_Pump_LuV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15)) + .fluidInputs(Materials.Helium.getGas(12000)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + Materials.Tetranaquadahdiindiumhexaplatiumosminid, + 18), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12), + ItemList.Electric_Pump_ZPM.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18)) + .fluidInputs(Materials.Helium.getGas(16000)) + .noFluidOutputs() + .duration(1 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + Materials.Longasssuperconductornameforuvwire, + 21), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14), + ItemList.Electric_Pump_UV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21)) + .fluidInputs(Materials.Helium.getGas(20000)) + .noFluidOutputs() + .duration(1 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_UV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + Materials.Longasssuperconductornameforuhvwire, + 24), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16), + ItemList.Electric_Pump_UHV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24)) + .fluidInputs(Materials.Helium.getGas(24000)) + .noFluidOutputs() + .duration(2 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_UHV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lead, 16), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.ULV_Coil.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 16), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.LV_Coil.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SteelMagnetic, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Aluminium, 16), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.MV_Coil.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SteelMagnetic, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.EnergeticAlloy, 16), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.HV_Coil.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NeodymiumMagnetic, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.TungstenSteel, 16), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.EV_Coil.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NeodymiumMagnetic, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iridium, 16), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.IV_Coil.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); Materials LuVMat = BartWorks.isModLoaded() ? Materials.get("Ruridit") : Materials.Osmiridium; GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 16), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.LuV_Coil.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 16), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.LuV_Coil.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 16), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.ZPM_Coil.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 16), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.ZPM_Coil.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.ElectrumFlux, 16), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.UV_Coil.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(500000).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.ElectrumFlux, 16), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.UV_Coil.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(500000) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 16), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.UHV_Coil.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(2000000).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 16), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.UHV_Coil.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(2000000) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 6), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Wood, 2)) - .fluidInputs(Materials.Glue.getFluid(10)).noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 6), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Wood, 2)) + .fluidInputs(Materials.Glue.getFluid(10)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 3), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Wood, 4)) - .fluidInputs(Materials.Glue.getFluid(20)).noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 3), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Wood, 4)) + .fluidInputs(Materials.Glue.getFluid(20)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1), - GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Wood, 6)) - .fluidInputs(Materials.Glue.getFluid(60)).noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Wood, 6)) + .fluidInputs(Materials.Glue.getFluid(60)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4), - GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Advanced, 4), - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Diamond, 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Ingot_IridiumAlloy.get(1)).noFluidInputs().noFluidOutputs().duration(60 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4), + GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Advanced, 4), + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Diamond, 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Ingot_IridiumAlloy.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), - ItemList.Electric_Motor_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Iridium, 1), - ItemList.Component_Filter.get(8), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iridium, 8)) - .itemOutputs(ItemList.Casing_Vent_T2.get(1)).noFluidInputs().noFluidOutputs().duration(30 * SECONDS) - .eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), + ItemList.Electric_Motor_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Iridium, 1), + ItemList.Component_Filter.get(8), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iridium, 8)) + .itemOutputs(ItemList.Casing_Vent_T2.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "torchesFromCoal", false)) { GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), - new ItemStack(Items.coal, 1, 32767)) - .itemOutputs(new ItemStack(Blocks.torch, 4)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS) - .eut(1).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), + new ItemStack(Items.coal, 1, 32767)) + .itemOutputs(new ItemStack(Blocks.torch, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(1) + .addTo(sAssemblerRecipes); } GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 2), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Steel, 1)) - .itemOutputs(new ItemStack(Blocks.light_weighted_pressure_plate, 1)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 2), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Steel, 1)) + .itemOutputs(new ItemStack(Blocks.light_weighted_pressure_plate, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 2), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Steel, 1)) - .itemOutputs(new ItemStack(Blocks.heavy_weighted_pressure_plate, 1)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 2), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Steel, 1)) + .itemOutputs(new ItemStack(Blocks.heavy_weighted_pressure_plate, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 6), - GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(new ItemStack(Items.iron_door, 1)).noFluidInputs().noFluidOutputs().duration(30 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 6), + GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(new ItemStack(Items.iron_door, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 7), - GT_Utility.getIntegratedCircuit(7)) - .itemOutputs(new ItemStack(Items.cauldron, 1)).noFluidInputs().noFluidOutputs().duration(35 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 7), + GT_Utility.getIntegratedCircuit(7)) + .itemOutputs(new ItemStack(Items.cauldron, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(35 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getIC2Item("ironFence", 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getIC2Item("ironFence", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 3), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(new ItemStack(Blocks.iron_bars, 4)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 3), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(new ItemStack(Blocks.iron_bars, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 6), - GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(new ItemStack(Items.iron_door, 1)).noFluidInputs().noFluidOutputs().duration(30 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 6), + GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(new ItemStack(Items.iron_door, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 7), - GT_Utility.getIntegratedCircuit(7)) - .itemOutputs(new ItemStack(Items.cauldron, 1)).noFluidInputs().noFluidOutputs().duration(35 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 7), + GT_Utility.getIntegratedCircuit(7)) + .itemOutputs(new ItemStack(Items.cauldron, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(35 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getIC2Item("ironFence", 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getIC2Item("ironFence", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 3), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(new ItemStack(Blocks.iron_bars, 4)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 3), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(new ItemStack(Blocks.iron_bars, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 3), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(new ItemStack(Blocks.fence, 1)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 3), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(new ItemStack(Blocks.fence, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Iron, 2)) - .itemOutputs(new ItemStack(Blocks.tripwire_hook, 1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Iron, 2)) + .itemOutputs(new ItemStack(Blocks.tripwire_hook, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 2)) - .itemOutputs(new ItemStack(Blocks.tripwire_hook, 1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 2)) + .itemOutputs(new ItemStack(Blocks.tripwire_hook, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 3), - new ItemStack(Items.string, 3, 32767)) - .itemOutputs(new ItemStack(Items.bow, 1)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(4) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 3), + new ItemStack(Items.string, 3, 32767)) + .itemOutputs(new ItemStack(Items.bow, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 3), - ItemList.Component_Minecart_Wheels_Iron.get(2)) - .itemOutputs(new ItemStack(Items.minecart, 1)).noFluidInputs().noFluidOutputs().duration(25 * SECONDS) - .eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 3), + ItemList.Component_Minecart_Wheels_Iron.get(2)) + .itemOutputs(new ItemStack(Items.minecart, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 3), - ItemList.Component_Minecart_Wheels_Iron.get(2)) - .itemOutputs(new ItemStack(Items.minecart, 1)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS) - .eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 3), + ItemList.Component_Minecart_Wheels_Iron.get(2)) + .itemOutputs(new ItemStack(Items.minecart, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 3), - ItemList.Component_Minecart_Wheels_Steel.get(2)) - .itemOutputs(new ItemStack(Items.minecart, 1)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 3), + ItemList.Component_Minecart_Wheels_Steel.get(2)) + .itemOutputs(new ItemStack(Items.minecart, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Iron, 2)) - .itemOutputs(ItemList.Component_Minecart_Wheels_Iron.get(1)).noFluidInputs().noFluidOutputs() - .duration(25 * SECONDS).eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Iron, 2)) + .itemOutputs(ItemList.Component_Minecart_Wheels_Iron.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 2)) - .itemOutputs(ItemList.Component_Minecart_Wheels_Iron.get(1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.WroughtIron, 2)) + .itemOutputs(ItemList.Component_Minecart_Wheels_Iron.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Steel, 2)) - .itemOutputs(ItemList.Component_Minecart_Wheels_Steel.get(1)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Steel, 2)) + .itemOutputs(ItemList.Component_Minecart_Wheels_Steel.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.hopper, 1, 32767)) - .itemOutputs(new ItemStack(Items.hopper_minecart, 1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.hopper, 1, 32767)) + .itemOutputs(new ItemStack(Items.hopper_minecart, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.tnt, 1, 32767)) - .itemOutputs(new ItemStack(Items.tnt_minecart, 1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.tnt, 1, 32767)) + .itemOutputs(new ItemStack(Items.tnt_minecart, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.chest, 1, 32767)) - .itemOutputs(new ItemStack(Items.chest_minecart, 1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.chest, 1, 32767)) + .itemOutputs(new ItemStack(Items.chest_minecart, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.trapped_chest, 1, 32767)) - .itemOutputs(new ItemStack(Items.chest_minecart, 1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(4).addTo(sAssemblerRecipes); + .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.trapped_chest, 1, 32767)) + .itemOutputs(new ItemStack(Items.chest_minecart, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.furnace, 1, 32767)) - .itemOutputs(new ItemStack(Items.furnace_minecart, 1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.minecart, 1), new ItemStack(Blocks.furnace, 1, 32767)) + .itemOutputs(new ItemStack(Items.furnace_minecart, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.tripwire_hook, 1), new ItemStack(Blocks.chest, 1, 32767)) - .itemOutputs(new ItemStack(Blocks.trapped_chest, 1)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(4).addTo(sAssemblerRecipes); + .itemInputs(new ItemStack(Blocks.tripwire_hook, 1), new ItemStack(Blocks.chest, 1, 32767)) + .itemOutputs(new ItemStack(Blocks.trapped_chest, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.stone, 1, 0), GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(new ItemStack(Blocks.stonebrick, 1, 0)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.stone, 1, 0), GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(new ItemStack(Blocks.stonebrick, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.sandstone, 1, 0), GT_Utility.getIntegratedCircuit(23)) - .itemOutputs(new ItemStack(Blocks.sandstone, 1, 2)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.sandstone, 1, 0), GT_Utility.getIntegratedCircuit(23)) + .itemOutputs(new ItemStack(Blocks.sandstone, 1, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.sandstone, 1, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(new ItemStack(Blocks.sandstone, 1, 0)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.sandstone, 1, 1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(new ItemStack(Blocks.sandstone, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(4) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.sandstone, 1, 2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(new ItemStack(Blocks.sandstone, 1, 0)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(4).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.sandstone, 1, 2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(new ItemStack(Blocks.sandstone, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 8), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(GT_ModHandler.getIC2Item("machine", 1)).noFluidInputs().noFluidOutputs() - .duration(1 * SECONDS + 5 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 8), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(GT_ModHandler.getIC2Item("machine", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 5 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 8), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.Casing_ULV.get(1)).noFluidInputs().noFluidOutputs() - .duration(1 * SECONDS + 5 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 8), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.Casing_ULV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 5 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 8), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.Casing_LV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 8), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.Casing_LV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 8), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.Casing_MV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 8), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.Casing_MV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.Casing_HV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.Casing_HV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 8), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.Casing_EV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 8), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.Casing_EV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 8), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.Casing_IV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 8), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.Casing_IV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 8), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.Casing_LuV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 8), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.Casing_LuV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 8), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.Casing_ZPM.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 8), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.Casing_ZPM.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 8), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.Casing_UV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 8), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.Casing_UV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.Casing_MAX.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.Casing_MAX.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Invar, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Invar, 1)) - .itemOutputs(ItemList.Casing_HeatProof.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Invar, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Invar, 1)) + .itemOutputs(ItemList.Casing_HeatProof.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1)) - .itemOutputs(ItemList.Casing_SolidSteel.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1)) + .itemOutputs(ItemList.Casing_SolidSteel.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1)) - .itemOutputs(ItemList.Casing_FrostProof.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1)) + .itemOutputs(ItemList.Casing_FrostProof.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1)) - .itemOutputs(ItemList.Casing_RobustTungstenSteel.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1)) + .itemOutputs(ItemList.Casing_RobustTungstenSteel.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1)) - .itemOutputs(ItemList.Casing_CleanStainlessSteel.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1)) + .itemOutputs(ItemList.Casing_CleanStainlessSteel.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1)) - .itemOutputs(ItemList.Casing_StableTitanium.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1)) + .itemOutputs(ItemList.Casing_StableTitanium.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 1)) - .itemOutputs(ItemList.Casing_MiningOsmiridium.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 1)) + .itemOutputs(ItemList.Casing_MiningOsmiridium.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1)) - .itemOutputs(ItemList.Casing_MiningNeutronium.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1)) + .itemOutputs(ItemList.Casing_MiningNeutronium.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackPlutonium, 1)) - .itemOutputs(ItemList.Casing_MiningBlackPlutonium.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackPlutonium, 1)) + .itemOutputs(ItemList.Casing_MiningBlackPlutonium.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 4), ItemList.Casing_LuV.get(1)) - .itemOutputs(ItemList.Casing_Fusion.get(1)).fluidInputs(Materials.HSSG.getMolten(288)).noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 4), + ItemList.Casing_LuV.get(1)) + .itemOutputs(ItemList.Casing_Fusion.get(1)) + .fluidInputs(Materials.HSSG.getMolten(288)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 4), - ItemList.Casing_Fusion.get(1)) - .itemOutputs(ItemList.Casing_Fusion2.get(1)).fluidInputs(Materials.NaquadahAlloy.getMolten(288)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 4), + ItemList.Casing_Fusion.get(1)) + .itemOutputs(ItemList.Casing_Fusion2.get(1)) + .fluidInputs(Materials.NaquadahAlloy.getMolten(288)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Magnalium, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1)) - .itemOutputs(ItemList.Casing_Turbine.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Magnalium, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1)) + .itemOutputs(ItemList.Casing_Turbine.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 6), - ItemList.Casing_Turbine.get(1)) - .itemOutputs(ItemList.Casing_Turbine1.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 6), + ItemList.Casing_Turbine.get(1)) + .itemOutputs(ItemList.Casing_Turbine1.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6), - ItemList.Casing_Turbine.get(1)) - .itemOutputs(ItemList.Casing_Turbine2.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6), + ItemList.Casing_Turbine.get(1)) + .itemOutputs(ItemList.Casing_Turbine2.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6), - ItemList.Casing_Turbine.get(1)) - .itemOutputs(ItemList.Casing_Turbine3.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6), + ItemList.Casing_Turbine.get(1)) + .itemOutputs(ItemList.Casing_Turbine3.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6), - ItemList.Casing_Turbine.get(1)) - .itemOutputs(ItemList.Casing_TurbineGasAdvanced.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6), + ItemList.Casing_Turbine.get(1)) + .itemOutputs(ItemList.Casing_TurbineGasAdvanced.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_SolidSteel.get(1), GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(ItemList.Casing_Chemically_Inert.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(216)).noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_SolidSteel.get(1), GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(ItemList.Casing_Chemically_Inert.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(216)) + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1)) - .itemOutputs(ItemList.Casing_Advanced_Iridium.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1)) + .itemOutputs(ItemList.Casing_Advanced_Iridium.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); if (GT_Mod.gregtechproxy.mHardMachineCasings) { GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead, 2), - ItemList.Casing_ULV.get(1)) - .itemOutputs(ItemList.Hull_ULV.get(1)).fluidInputs(Materials.Plastic.getMolten(288)) - .noFluidOutputs().duration(1 * SECONDS + 5 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead, 2), + ItemList.Casing_ULV.get(1)) + .itemOutputs(ItemList.Hull_ULV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(288)) + .noFluidOutputs() + .duration(1 * SECONDS + 5 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 2), - ItemList.Casing_LV.get(1)) - .itemOutputs(ItemList.Hull_LV.get(1)).fluidInputs(Materials.Plastic.getMolten(288)).noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 2), + ItemList.Casing_LV.get(1)) + .itemOutputs(ItemList.Hull_LV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(288)) + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 2), - ItemList.Casing_MV.get(1)) - .itemOutputs(ItemList.Hull_MV.get(1)).fluidInputs(Materials.Plastic.getMolten(288)).noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 2), + ItemList.Casing_MV.get(1)) + .itemOutputs(ItemList.Hull_MV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(288)) + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 2), - ItemList.Casing_MV.get(1)) - .itemOutputs(ItemList.Hull_MV.get(1)).fluidInputs(Materials.Plastic.getMolten(288)).noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 2), + ItemList.Casing_MV.get(1)) + .itemOutputs(ItemList.Hull_MV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(288)) + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 2), - ItemList.Casing_HV.get(1)) - .itemOutputs(ItemList.Hull_HV.get(1)).fluidInputs(Materials.Plastic.getMolten(288)).noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 2), + ItemList.Casing_HV.get(1)) + .itemOutputs(ItemList.Hull_HV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(288)) + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), - ItemList.Casing_EV.get(1)) - .itemOutputs(ItemList.Hull_EV.get(1)).fluidInputs(Materials.Plastic.getMolten(288)).noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), + ItemList.Casing_EV.get(1)) + .itemOutputs(ItemList.Hull_EV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(288)) + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 2), - ItemList.Casing_IV.get(1)) - .itemOutputs(ItemList.Hull_IV.get(1)).fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288)) - .noFluidOutputs().duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 2), + ItemList.Casing_IV.get(1)) + .itemOutputs(ItemList.Hull_IV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288)) + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2), - ItemList.Casing_LuV.get(1)) - .itemOutputs(ItemList.Hull_LuV.get(1)).fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288)) - .noFluidOutputs().duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2), + ItemList.Casing_LuV.get(1)) + .itemOutputs(ItemList.Hull_LuV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288)) + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2), - ItemList.Casing_ZPM.get(1)) - .itemOutputs(ItemList.Hull_ZPM.get(1)).fluidInputs(Materials.Polybenzimidazole.getMolten(288)) - .noFluidOutputs().duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2), + ItemList.Casing_ZPM.get(1)) + .itemOutputs(ItemList.Hull_ZPM.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(288)) + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), - ItemList.Casing_UV.get(1)) - .itemOutputs(ItemList.Hull_UV.get(1)).fluidInputs(Materials.Polybenzimidazole.getMolten(288)) - .noFluidOutputs().duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), + ItemList.Casing_UV.get(1)) + .itemOutputs(ItemList.Hull_UV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(288)) + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 2), - ItemList.Casing_MAX.get(1)) - .itemOutputs(ItemList.Hull_MAX.get(1)).fluidInputs(Materials.Polybenzimidazole.getMolten(288)) - .noFluidOutputs().duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 2), + ItemList.Casing_MAX.get(1)) + .itemOutputs(ItemList.Hull_MAX.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getMolten(288)) + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); } else { GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead, 2), - ItemList.Casing_ULV.get(1)) - .itemOutputs(ItemList.Hull_ULV.get(1)).noFluidInputs().noFluidOutputs() - .duration(1 * SECONDS + 5 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead, 2), + ItemList.Casing_ULV.get(1)) + .itemOutputs(ItemList.Hull_ULV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 5 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 2), - ItemList.Casing_LV.get(1)) - .itemOutputs(ItemList.Hull_LV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 2), + ItemList.Casing_LV.get(1)) + .itemOutputs(ItemList.Hull_LV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 2), - ItemList.Casing_MV.get(1)) - .itemOutputs(ItemList.Hull_MV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 2), + ItemList.Casing_MV.get(1)) + .itemOutputs(ItemList.Hull_MV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 2), - ItemList.Casing_MV.get(1)) - .itemOutputs(ItemList.Hull_MV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 2), + ItemList.Casing_MV.get(1)) + .itemOutputs(ItemList.Hull_MV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 2), - ItemList.Casing_HV.get(1)) - .itemOutputs(ItemList.Hull_HV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 2), + ItemList.Casing_HV.get(1)) + .itemOutputs(ItemList.Hull_HV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), - ItemList.Casing_EV.get(1)) - .itemOutputs(ItemList.Hull_EV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), + ItemList.Casing_EV.get(1)) + .itemOutputs(ItemList.Hull_EV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 2), - ItemList.Casing_IV.get(1)) - .itemOutputs(ItemList.Hull_IV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 2), + ItemList.Casing_IV.get(1)) + .itemOutputs(ItemList.Hull_IV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2), - ItemList.Casing_LuV.get(1)) - .itemOutputs(ItemList.Hull_LuV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2), + ItemList.Casing_LuV.get(1)) + .itemOutputs(ItemList.Hull_LuV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2), - ItemList.Casing_ZPM.get(1)) - .itemOutputs(ItemList.Hull_ZPM.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2), + ItemList.Casing_ZPM.get(1)) + .itemOutputs(ItemList.Hull_ZPM.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), - ItemList.Casing_UV.get(1)) - .itemOutputs(ItemList.Hull_UV.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2), + ItemList.Casing_UV.get(1)) + .itemOutputs(ItemList.Hull_UV.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 2), - ItemList.Casing_MAX.get(1)) - .itemOutputs(ItemList.Hull_MAX.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 2), + ItemList.Casing_MAX.get(1)) + .itemOutputs(ItemList.Hull_MAX.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); } GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 1)) - .itemOutputs(ItemList.Battery_Hull_LV.get(1)).fluidInputs(Materials.Plastic.getMolten(144)) - .noFluidOutputs().duration(40 * SECONDS).eut(1).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 1)) + .itemOutputs(ItemList.Battery_Hull_LV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(144)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(1) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 3)) - .itemOutputs(ItemList.Battery_Hull_MV.get(1)).fluidInputs(Materials.Plastic.getMolten(432)) - .noFluidOutputs().duration(1 * MINUTES + 20 * SECONDS).eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 3)) + .itemOutputs(ItemList.Battery_Hull_MV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(432)) + .noFluidOutputs() + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 3)) - .itemOutputs(ItemList.Battery_Hull_MV.get(1)).fluidInputs(Materials.Plastic.getMolten(432)) - .noFluidOutputs().duration(1 * MINUTES + 20 * SECONDS).eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnnealedCopper, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 3)) + .itemOutputs(ItemList.Battery_Hull_MV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(432)) + .noFluidOutputs() + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 9)) - .itemOutputs(ItemList.Battery_Hull_HV.get(1)).fluidInputs(Materials.Plastic.getMolten(1296)) - .noFluidOutputs().duration(2 * MINUTES + 40 * SECONDS).eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 9)) + .itemOutputs(ItemList.Battery_Hull_HV.get(1)) + .fluidInputs(Materials.Plastic.getMolten(1296)) + .noFluidOutputs() + .duration(2 * MINUTES + 40 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.string, 4, 32767), new ItemStack(Items.slime_ball, 1, 32767)) - .itemOutputs(new ItemStack(Items.lead, 2)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(2).addTo(sAssemblerRecipes); + .itemInputs(new ItemStack(Items.string, 4, 32767), new ItemStack(Items.slime_ball, 1, 32767)) + .itemOutputs(new ItemStack(Items.lead, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.IC2_Compressed_Coal_Ball.get(8), new ItemStack(Blocks.brick_block, 1)) - .itemOutputs(ItemList.IC2_Compressed_Coal_Chunk.get(1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(4).addTo(sAssemblerRecipes); + .itemInputs(ItemList.IC2_Compressed_Coal_Ball.get(8), new ItemStack(Blocks.brick_block, 1)) + .itemOutputs(ItemList.IC2_Compressed_Coal_Chunk.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("waterMill", 2), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_ModHandler.getIC2Item("generator", 1)).noFluidInputs().noFluidOutputs() - .duration(5 * MINUTES + 20 * SECONDS).eut(8).addTo(sAssemblerRecipes); + .itemInputs(GT_ModHandler.getIC2Item("waterMill", 2), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(GT_ModHandler.getIC2Item("generator", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * MINUTES + 20 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("batPack", 1L, 32767), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.IC2_ReBattery.get(6)).noFluidInputs().noFluidOutputs().duration(40 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + .itemInputs(GT_ModHandler.getIC2Item("batPack", 1L, 32767), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.IC2_ReBattery.get(6)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("carbonFiber", 2), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_ModHandler.getIC2Item("carbonMesh", 1)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(2).addTo(sAssemblerRecipes); + .itemInputs(GT_ModHandler.getIC2Item("carbonFiber", 2), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(GT_ModHandler.getIC2Item("carbonMesh", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 4), - GT_ModHandler.getIC2Item("generator", 1)) - .itemOutputs(GT_ModHandler.getIC2Item("waterMill", 2)).noFluidInputs().noFluidOutputs() - .duration(5 * MINUTES + 20 * SECONDS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 4), + GT_ModHandler.getIC2Item("generator", 1)) + .itemOutputs(GT_ModHandler.getIC2Item("waterMill", 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * MINUTES + 20 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 5), - new ItemStack(Blocks.chest, 1, 32767)) - .itemOutputs(new ItemStack(Blocks.hopper)).noFluidInputs().noFluidOutputs().duration(40 * SECONDS) - .eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 5), + new ItemStack(Blocks.chest, 1, 32767)) + .itemOutputs(new ItemStack(Blocks.hopper)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 5), - new ItemStack(Blocks.trapped_chest, 1, 32767)) - .itemOutputs(new ItemStack(Blocks.hopper)).noFluidInputs().noFluidOutputs().duration(40 * SECONDS) - .eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 5), + new ItemStack(Blocks.trapped_chest, 1, 32767)) + .itemOutputs(new ItemStack(Blocks.hopper)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 5), - new ItemStack(Blocks.chest, 1, 32767)) - .itemOutputs(new ItemStack(Blocks.hopper)).noFluidInputs().noFluidOutputs().duration(40 * SECONDS) - .eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 5), + new ItemStack(Blocks.chest, 1, 32767)) + .itemOutputs(new ItemStack(Blocks.hopper)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 5), - new ItemStack(Blocks.trapped_chest, 1, 32767)) - .itemOutputs(new ItemStack(Blocks.hopper)).noFluidInputs().noFluidOutputs().duration(40 * SECONDS) - .eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 5), + new ItemStack(Blocks.trapped_chest, 1, 32767)) + .itemOutputs(new ItemStack(Blocks.hopper)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Magnalium, 2), - GT_ModHandler.getIC2Item("generator", 1)) - .itemOutputs(GT_ModHandler.getIC2Item("windMill", 1)).noFluidInputs().noFluidOutputs() - .duration(5 * MINUTES + 20 * SECONDS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Magnalium, 2), + GT_ModHandler.getIC2Item("generator", 1)) + .itemOutputs(GT_ModHandler.getIC2Item("windMill", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * MINUTES + 20 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1), - new ItemStack(Items.blaze_powder, 1, 0)) - .itemOutputs(new ItemStack(Items.ender_eye, 1, 0)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1), + new ItemStack(Items.blaze_powder, 1, 0)) + .itemOutputs(new ItemStack(Items.ender_eye, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 6), - new ItemStack(Items.blaze_rod, 1, 0)) - .itemOutputs(new ItemStack(Items.ender_eye, 6, 0)).noFluidInputs().noFluidOutputs() - .duration(2 * MINUTES + 5 * SECONDS).eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 6), + new ItemStack(Items.blaze_rod, 1, 0)) + .itemOutputs(new ItemStack(Items.ender_eye, 6, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * MINUTES + 5 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.CobaltBrass, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1)) - .itemOutputs(ItemList.Component_Sawblade_Diamond.get(1)).noFluidInputs().noFluidOutputs() - .duration(1 * MINUTES + 20 * SECONDS).eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.CobaltBrass, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1)) + .itemOutputs(ItemList.Component_Sawblade_Diamond.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 20 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 4)) - .itemOutputs(new ItemStack(Blocks.redstone_lamp, 1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(1).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 4)) + .itemOutputs(new ItemStack(Blocks.redstone_lamp, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(1) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) - .itemOutputs(new ItemStack(Blocks.redstone_torch, 1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(1).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) + .itemOutputs(new ItemStack(Blocks.redstone_torch, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(1) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4)) - .itemOutputs(new ItemStack(Items.compass, 1)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4)) + .itemOutputs(new ItemStack(Items.compass, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 4)) - .itemOutputs(new ItemStack(Items.compass, 1)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 4)) + .itemOutputs(new ItemStack(Items.compass, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 4)) - .itemOutputs(new ItemStack(Items.clock, 1)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS) - .eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 4)) + .itemOutputs(new ItemStack(Items.clock, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1)) - .itemOutputs(new ItemStack(Blocks.torch, 2)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS) - .eut(1).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1)) + .itemOutputs(new ItemStack(Blocks.torch, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(1) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1)) - .itemOutputs(new ItemStack(Blocks.torch, 6)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS) - .eut(1).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1)) + .itemOutputs(new ItemStack(Blocks.torch, 6)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(1) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), ItemList.IC2_Resin.get(1)) - .itemOutputs(new ItemStack(Blocks.torch, 6)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS) - .eut(1).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1), + ItemList.IC2_Resin.get(1)) + .itemOutputs(new ItemStack(Blocks.torch, 6)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(1) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 8), - new ItemStack(Items.flint, 1)) - .itemOutputs(ItemList.IC2_Compressed_Coal_Ball.get(1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(4).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 8), + new ItemStack(Items.flint, 1)) + .itemOutputs(ItemList.IC2_Compressed_Coal_Ball.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4) + .addTo(sAssemblerRecipes); if (!GT_Mod.gregtechproxy.mDisableIC2Cables) { GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getIC2Item("tinCableItem", 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1)) - .itemOutputs(GT_ModHandler.getIC2Item("insulatedTinCableItem", 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_ModHandler.getIC2Item("tinCableItem", 1), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1)) + .itemOutputs(GT_ModHandler.getIC2Item("insulatedTinCableItem", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getIC2Item("copperCableItem", 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1)) - .itemOutputs(GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_ModHandler.getIC2Item("copperCableItem", 1), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1)) + .itemOutputs(GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getIC2Item("goldCableItem", 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2)) - .itemOutputs(GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_ModHandler.getIC2Item("goldCableItem", 1), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2)) + .itemOutputs(GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getIC2Item("ironCableItem", 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 3)) - .itemOutputs(GT_ModHandler.getIC2Item("insulatedIronCableItem", 1)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(2).addTo(sAssemblerRecipes); + .itemInputs( + GT_ModHandler.getIC2Item("ironCableItem", 1), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 3)) + .itemOutputs(GT_ModHandler.getIC2Item("insulatedIronCableItem", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sAssemblerRecipes); } GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Wood, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) - .itemOutputs(new ItemStack(Items.wooden_sword, 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Wood, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) + .itemOutputs(new ItemStack(Items.wooden_sword, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Stone, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) - .itemOutputs(new ItemStack(Items.stone_sword, 1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Stone, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) + .itemOutputs(new ItemStack(Items.stone_sword, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) - .itemOutputs(new ItemStack(Items.iron_sword, 1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) + .itemOutputs(new ItemStack(Items.iron_sword, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) - .itemOutputs(new ItemStack(Items.golden_sword, 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Gold, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) + .itemOutputs(new ItemStack(Items.golden_sword, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Diamond, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) - .itemOutputs(new ItemStack(Items.diamond_sword, 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Diamond, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) + .itemOutputs(new ItemStack(Items.diamond_sword, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Bronze, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) - .itemOutputs(ItemList.Tool_Sword_Bronze.getUndamaged(1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Bronze, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) + .itemOutputs(ItemList.Tool_Sword_Bronze.getUndamaged(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Steel, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) - .itemOutputs(ItemList.Tool_Sword_Steel.getUndamaged(1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Steel, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1)) + .itemOutputs(ItemList.Tool_Sword_Steel.getUndamaged(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Wood, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.wooden_pickaxe, 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Wood, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.wooden_pickaxe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Stone, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.stone_pickaxe, 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Stone, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.stone_pickaxe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.iron_pickaxe, 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.iron_pickaxe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.golden_pickaxe, 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Gold, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.golden_pickaxe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Diamond, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.diamond_pickaxe, 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Diamond, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.diamond_pickaxe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Bronze, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(ItemList.Tool_Pickaxe_Bronze.getUndamaged(1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Bronze, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(ItemList.Tool_Pickaxe_Bronze.getUndamaged(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Steel, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(ItemList.Tool_Pickaxe_Steel.getUndamaged(1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Steel, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(ItemList.Tool_Pickaxe_Steel.getUndamaged(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Wood, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.wooden_shovel, 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Wood, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.wooden_shovel, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Stone, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.stone_shovel, 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Stone, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.stone_shovel, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.iron_shovel, 1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.iron_shovel, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.golden_shovel, 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Gold, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.golden_shovel, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Diamond, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.diamond_shovel, 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Diamond, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.diamond_shovel, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Bronze, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(ItemList.Tool_Shovel_Bronze.getUndamaged(1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Bronze, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(ItemList.Tool_Shovel_Bronze.getUndamaged(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Steel, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(ItemList.Tool_Shovel_Steel.getUndamaged(1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Steel, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(ItemList.Tool_Shovel_Steel.getUndamaged(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Wood, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.wooden_axe, 1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Wood, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.wooden_axe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Stone, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.stone_axe, 1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Stone, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.stone_axe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.iron_axe, 1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.iron_axe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.golden_axe, 1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Gold, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.golden_axe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Diamond, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.diamond_axe, 1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Diamond, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.diamond_axe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Bronze, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(ItemList.Tool_Axe_Bronze.getUndamaged(1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Bronze, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(ItemList.Tool_Axe_Bronze.getUndamaged(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Steel, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(ItemList.Tool_Axe_Steel.getUndamaged(1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Steel, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(ItemList.Tool_Axe_Steel.getUndamaged(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Wood, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.wooden_hoe, 1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Wood, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.wooden_hoe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Stone, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.stone_hoe, 1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Stone, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.stone_hoe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.iron_hoe, 1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.iron_hoe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.golden_hoe, 1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Gold, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.golden_hoe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Diamond, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(new ItemStack(Items.diamond_hoe, 1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Diamond, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(new ItemStack(Items.diamond_hoe, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Bronze, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(ItemList.Tool_Hoe_Bronze.getUndamaged(1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Bronze, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(ItemList.Tool_Hoe_Bronze.getUndamaged(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Steel, 1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) - .itemOutputs(ItemList.Tool_Hoe_Steel.getUndamaged(1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Steel, 1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 2)) + .itemOutputs(ItemList.Tool_Hoe_Steel.getUndamaged(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); // fuel rod assembler recipes GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.ThoriumCell_1.get(2), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.ThoriumCell_2.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.ThoriumCell_1.get(2), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.ThoriumCell_2.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.ThoriumCell_1.get(4), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(ItemList.ThoriumCell_4.get(1)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.ThoriumCell_1.get(4), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(ItemList.ThoriumCell_4.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.ThoriumCell_2.get(2), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4), - GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(ItemList.ThoriumCell_4.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.ThoriumCell_2.get(2), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4), + GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(ItemList.ThoriumCell_4.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Uraniumcell_1.get(2), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Uraniumcell_2.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Uraniumcell_1.get(2), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Uraniumcell_2.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Uraniumcell_1.get(4), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(ItemList.Uraniumcell_4.get(1)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Uraniumcell_1.get(4), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(ItemList.Uraniumcell_4.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Uraniumcell_2.get(2), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4), - GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(ItemList.Uraniumcell_4.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Uraniumcell_2.get(2), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4), + GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(ItemList.Uraniumcell_4.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Moxcell_1.get(2), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Moxcell_2.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Moxcell_1.get(2), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Moxcell_2.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Moxcell_1.get(4), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(ItemList.Moxcell_4.get(1)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Moxcell_1.get(4), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Steel, 6), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(ItemList.Moxcell_4.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Moxcell_2.get(2), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4), - GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(ItemList.Moxcell_4.get(1)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Moxcell_2.get(2), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 4), + GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(ItemList.Moxcell_4.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.NaquadahCell_1.get(2), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.NaquadahCell_2.get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(400).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.NaquadahCell_1.get(2), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.NaquadahCell_2.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(400) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.NaquadahCell_1.get(4), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 6), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(ItemList.NaquadahCell_4.get(1)).noFluidInputs().noFluidOutputs() - .duration(7 * SECONDS + 10 * TICKS).eut(400).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.NaquadahCell_1.get(4), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 6), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(ItemList.NaquadahCell_4.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(7 * SECONDS + 10 * TICKS) + .eut(400) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.NaquadahCell_2.get(2), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(ItemList.NaquadahCell_4.get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(400).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.NaquadahCell_2.get(2), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(ItemList.NaquadahCell_4.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(400) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.MNqCell_1.get(2), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.MNqCell_2.get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(400) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.MNqCell_1.get(2), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.MNqCell_2.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(400) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.MNqCell_1.get(4), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 6), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(ItemList.MNqCell_4.get(1)).noFluidInputs().noFluidOutputs() - .duration(7 * SECONDS + 10 * TICKS).eut(400).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.MNqCell_1.get(4), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TungstenSteel, 6), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(ItemList.MNqCell_4.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(7 * SECONDS + 10 * TICKS) + .eut(400) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.MNqCell_2.get(2), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(ItemList.MNqCell_4.get(1)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(400) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.MNqCell_2.get(2), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 4), + GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(ItemList.MNqCell_4.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(400) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 8), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iridium, 4)) - .itemOutputs(ItemList.neutroniumHeatCapacitor.get(1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 8), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iridium, 4)) + .itemOutputs(ItemList.neutroniumHeatCapacitor.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - Materials.NaquadahAlloy.getPlates(8), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1)) - .itemOutputs(ItemList.RadiantNaquadahAlloyCasing.get(1)).noFluidInputs().noFluidOutputs() - .duration(10 * TICKS).eut(400000).addTo(sAssemblerRecipes); + .itemInputs( + Materials.NaquadahAlloy.getPlates(8), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1)) + .itemOutputs(ItemList.RadiantNaquadahAlloyCasing.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(400000) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.KevlarFiber.get(8), GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.WovenKevlar.get(1)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.KevlarFiber.get(8), GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.WovenKevlar.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); ItemStack[] plates = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), @@ -2013,43 +3141,64 @@ public class AssemblerRecipes implements Runnable { for (ItemStack tPlate : plates) { GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.lever, 1, 32767), tPlate, GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Cover_Controller.get(1)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs().duration(40 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.lever, 1, 32767), + tPlate, + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cover_Controller.get(1)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.redstone_torch, 1, 32767), - tPlate, - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Cover_ActivityDetector.get(1)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs().duration(40 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.redstone_torch, 1, 32767), + tPlate, + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cover_ActivityDetector.get(1)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 32767), - tPlate, - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Cover_FluidDetector.get(1)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs().duration(40 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 32767), + tPlate, + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cover_FluidDetector.get(1)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.light_weighted_pressure_plate, 1, 32767), - tPlate, - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Cover_ItemDetector.get(1)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs().duration(40 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.light_weighted_pressure_plate, 1, 32767), + tPlate, + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cover_ItemDetector.get(1)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("ecMeter", 1), tPlate, GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Cover_EnergyDetector.get(1)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs().duration(40 * SECONDS) - .eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_ModHandler.getIC2Item("ecMeter", 1), + tPlate, + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cover_EnergyDetector.get(1)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); } } @@ -2062,233 +3211,307 @@ public class AssemblerRecipes implements Runnable { // ULV input bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)).fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) + .fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) - .fluidInputs(Materials.Plastic.getFluid(1 * HALF_INGOT)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(1 * HALF_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * EIGHTH_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * EIGHTH_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(4)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_ULV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(4)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); } // LV input bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - new ItemStack(Blocks.chest), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_LV.get(1)).fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + new ItemStack(Blocks.chest), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_LV.get(1)) + .fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - new ItemStack(Blocks.chest), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_LV.get(1)).fluidInputs(Materials.Plastic.getFluid(1 * INGOTS)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + new ItemStack(Blocks.chest), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_LV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - new ItemStack(Blocks.chest), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_LV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * HALF_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + new ItemStack(Blocks.chest), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_LV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * HALF_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - new ItemStack(Blocks.chest), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_LV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(9)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + new ItemStack(Blocks.chest), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_LV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(9)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); } // MV input bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1)).fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 3), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 3), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 3), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_MV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); } // HV input bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1)).fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_HV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_HV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_HV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_HV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // EV input bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_EV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_EV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_EV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_EV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_EV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_EV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_EV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_EV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); } // IV input bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_IV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_IV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_IV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_IV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_IV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_IV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_IV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_IV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); } // LuV input bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LuV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_LuV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LuV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_LuV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LuV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_LuV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LuV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_LuV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); } // ZPM input bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ZPM.get(1), - getModItem(IronChests.modID, "BlockIronChest", 2, 5), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_ZPM.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ZPM.get(1), + getModItem(IronChests.modID, "BlockIronChest", 2, 5), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_ZPM.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sAssemblerRecipes); } // UV input bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_UV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 2, 6), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_UV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(8 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_UV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_UV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 2, 6), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_UV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(8 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_UV) + .addTo(sAssemblerRecipes); } // UHV input bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MAX.get(1), - getModItem(AvaritiaAddons.modID, "CompressedChest", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_Bus_MAX.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(16 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MAX.get(1), + getModItem(AvaritiaAddons.modID, "CompressedChest", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_Bus_MAX.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(16 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_UHV) + .addTo(sAssemblerRecipes); } } @@ -2309,77 +3532,103 @@ public class AssemblerRecipes implements Runnable { // ULV output bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)).fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) + .fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) - .fluidInputs(Materials.Plastic.getFluid(1 * HALF_INGOT)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(1 * HALF_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * EIGHTH_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * EIGHTH_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(4)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + getModItem(NewHorizonsCoreMod.modID, "BabyChest", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(4)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); } // LV output bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - new ItemStack(Blocks.chest), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)).fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + new ItemStack(Blocks.chest), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) + .fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - new ItemStack(Blocks.chest), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) - .fluidInputs(Materials.Plastic.getFluid(1 * INGOTS)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + new ItemStack(Blocks.chest), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - new ItemStack(Blocks.chest), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * HALF_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + new ItemStack(Blocks.chest), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * HALF_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - new ItemStack(Blocks.chest), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(9)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + new ItemStack(Blocks.chest), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(9)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); } if (!IronChests.isModLoaded()) { @@ -2389,148 +3638,190 @@ public class AssemblerRecipes implements Runnable { // MV output bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) - .fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 3), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 3), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 3), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 3), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); } // HV output bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) - .fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_HV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 0), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_HV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 0), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 0), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_HV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 0), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // EV output bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_EV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_EV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 4), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_EV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_EV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 4), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); } // IV output bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_IV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_IV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_IV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_IV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); } // LuV output bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LuV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 2), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LuV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 2), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LuV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 1, 2), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LuV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 1, 2), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); } // ZPM output bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ZPM.get(1), - getModItem(IronChests.modID, "BlockIronChest", 2, 5), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_ZPM.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ZPM.get(1), + getModItem(IronChests.modID, "BlockIronChest", 2, 5), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_ZPM.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sAssemblerRecipes); } // UV output bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_UV.get(1), - getModItem(IronChests.modID, "BlockIronChest", 2, 6), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_UV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(8 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_UV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_UV.get(1), + getModItem(IronChests.modID, "BlockIronChest", 2, 6), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_UV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(8 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_UV) + .addTo(sAssemblerRecipes); } if (!AvaritiaAddons.isModLoaded()) { @@ -2540,13 +3831,16 @@ public class AssemblerRecipes implements Runnable { // UHV output bus { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MAX.get(1), - getModItem(AvaritiaAddons.modID, "CompressedChest", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_MAX.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(16 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MAX.get(1), + getModItem(AvaritiaAddons.modID, "CompressedChest", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_MAX.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(16 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_UHV) + .addTo(sAssemblerRecipes); } } @@ -2557,38 +3851,52 @@ public class AssemblerRecipes implements Runnable { // ULV input hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_ULV.get(1)).fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_ULV.get(1)) + .fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_ULV.get(1)) - .fluidInputs(Materials.Plastic.getFluid(1 * HALF_INGOT)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_ULV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(1 * HALF_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_ULV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * EIGHTH_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_ULV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * EIGHTH_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_ULV.get(1)).fluidInputs(Materials.Polybenzimidazole.getFluid(4)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_ULV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(4)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); } /* @@ -2603,37 +3911,52 @@ public class AssemblerRecipes implements Runnable { // LV input hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_LV.get(1)).fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + getModItem(BuildCraftFactory.modID, "tankBlock", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_LV.get(1)) + .fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_LV.get(1)).fluidInputs(Materials.Plastic.getFluid(1 * INGOTS)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + getModItem(BuildCraftFactory.modID, "tankBlock", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_LV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_LV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * HALF_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + getModItem(BuildCraftFactory.modID, "tankBlock", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_LV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * HALF_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_LV.get(1)).fluidInputs(Materials.Polybenzimidazole.getFluid(9)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + getModItem(BuildCraftFactory.modID, "tankBlock", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_LV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(9)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); } if (!IronTanks.isModLoaded()) { @@ -2643,158 +3966,205 @@ public class AssemblerRecipes implements Runnable { // MV input hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_MV.get(1)).fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MV.get(1), + getModItem(IronTanks.modID, "copperTank", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_MV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_MV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MV.get(1), + getModItem(IronTanks.modID, "copperTank", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_MV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_MV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MV.get(1), + getModItem(IronTanks.modID, "copperTank", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_MV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); } // HV input hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_HV.get(1)).fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_HV.get(1), + getModItem(IronTanks.modID, "ironTank", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_HV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_HV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_HV.get(1), + getModItem(IronTanks.modID, "ironTank", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_HV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_HV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_HV.get(1), + getModItem(IronTanks.modID, "ironTank", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_HV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // EV input hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_EV.get(1), - getModItem(IronTanks.modID, "silverTank", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_EV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_EV.get(1), + getModItem(IronTanks.modID, "silverTank", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_EV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_EV.get(1), - getModItem(IronTanks.modID, "silverTank", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_EV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_EV.get(1), + getModItem(IronTanks.modID, "silverTank", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_EV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); } // IV input hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_IV.get(1), - getModItem(IronTanks.modID, "goldTank", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_IV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_IV.get(1), + getModItem(IronTanks.modID, "goldTank", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_IV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_IV.get(1), - getModItem(IronTanks.modID, "goldTank", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_IV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_IV.get(1), + getModItem(IronTanks.modID, "goldTank", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_IV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); } // LuV input hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LuV.get(1), - getModItem(IronTanks.modID, "diamondTank", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_LuV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LuV.get(1), + getModItem(IronTanks.modID, "diamondTank", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_LuV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LuV.get(1), - getModItem(IronTanks.modID, "diamondTank", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_LuV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LuV.get(1), + getModItem(IronTanks.modID, "diamondTank", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_LuV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); } // ZPM input hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ZPM.get(1), - getModItem(IronTanks.modID, "obsidianTank", 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_ZPM.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ZPM.get(1), + getModItem(IronTanks.modID, "obsidianTank", 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_ZPM.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sAssemblerRecipes); } // UV input hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_UV.get(1), - ItemList.Super_Tank_LV.get(1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_UV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(8 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_UV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_UV.get(1), + ItemList.Super_Tank_LV.get(1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_UV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(8 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_UV) + .addTo(sAssemblerRecipes); } // UHV input hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MAX.get(1), - ItemList.Super_Tank_MV.get(1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_MAX.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(16 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MAX.get(1), + ItemList.Super_Tank_MV.get(1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Hatch_Input_MAX.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(16 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_UHV) + .addTo(sAssemblerRecipes); } } @@ -2805,39 +4175,52 @@ public class AssemblerRecipes implements Runnable { // ULV output hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)).fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) + .fluidInputs(Materials.Glue.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) - .fluidInputs(Materials.Plastic.getFluid(1 * HALF_INGOT)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(1 * HALF_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * EIGHTH_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * EIGHTH_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ULV.get(1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(4)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_ULV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ULV.get(1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_ULV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(4)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ULV) + .addTo(sAssemblerRecipes); } /* @@ -2852,39 +4235,52 @@ public class AssemblerRecipes implements Runnable { // LV output hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)).fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + getModItem(BuildCraftFactory.modID, "tankBlock", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) + .fluidInputs(Materials.Glue.getFluid(5 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) - .fluidInputs(Materials.Plastic.getFluid(1 * INGOTS)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + getModItem(BuildCraftFactory.modID, "tankBlock", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * HALF_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + getModItem(BuildCraftFactory.modID, "tankBlock", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * HALF_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LV.get(1), - getModItem(BuildCraftFactory.modID, "tankBlock", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(9)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LV.get(1), + getModItem(BuildCraftFactory.modID, "tankBlock", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_LV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(9)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); } if (!IronTanks.isModLoaded()) { @@ -2894,160 +4290,205 @@ public class AssemblerRecipes implements Runnable { // MV output hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) - .fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MV.get(1), + getModItem(IronTanks.modID, "copperTank", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(2 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MV.get(1), + getModItem(IronTanks.modID, "copperTank", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MV.get(1), - getModItem(IronTanks.modID, "copperTank", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MV.get(1), + getModItem(IronTanks.modID, "copperTank", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_MV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * EIGHTH_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); } // HV output hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) - .fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_HV.get(1), + getModItem(IronTanks.modID, "ironTank", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) + .fluidInputs(Materials.Plastic.getFluid(3 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_HV.get(1), + getModItem(IronTanks.modID, "ironTank", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(2 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_HV.get(1), - getModItem(IronTanks.modID, "ironTank", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_HV.get(1), + getModItem(IronTanks.modID, "ironTank", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_HV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * QUARTER_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // EV output hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_EV.get(1), - getModItem(IronTanks.modID, "silverTank", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_EV.get(1), + getModItem(IronTanks.modID, "silverTank", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(4 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_EV.get(1), - getModItem(IronTanks.modID, "silverTank", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_EV.get(1), + getModItem(IronTanks.modID, "silverTank", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_EV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * HALF_INGOT)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); } // IV output hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_IV.get(1), - getModItem(IronTanks.modID, "goldTank", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_IV.get(1), + getModItem(IronTanks.modID, "goldTank", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(8 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_IV.get(1), - getModItem(IronTanks.modID, "goldTank", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_IV.get(1), + getModItem(IronTanks.modID, "goldTank", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_IV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(1 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); } // LuV output hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LuV.get(1), - getModItem(IronTanks.modID, "diamondTank", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LuV.get(1), + getModItem(IronTanks.modID, "diamondTank", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getFluid(16 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_LuV.get(1), - getModItem(IronTanks.modID, "diamondTank", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_LuV.get(1), + getModItem(IronTanks.modID, "diamondTank", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_LuV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(2 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); } // ZPM output hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_ZPM.get(1), - getModItem(IronTanks.modID, "obsidianTank", 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_ZPM.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_ZPM.get(1), + getModItem(IronTanks.modID, "obsidianTank", 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_ZPM.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(4 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sAssemblerRecipes); } // UV output hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_UV.get(1), - ItemList.Super_Tank_LV.get(1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_UV.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(8 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_UV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_UV.get(1), + ItemList.Super_Tank_LV.get(1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_UV.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(8 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_UV) + .addTo(sAssemblerRecipes); } // UHV output hatch { GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Hull_MAX.get(1), - ItemList.Super_Tank_MV.get(1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_Bus_MAX.get(1)) - .fluidInputs(Materials.Polybenzimidazole.getFluid(16 * INGOTS)).noFluidOutputs() - .duration(24 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Hull_MAX.get(1), + ItemList.Super_Tank_MV.get(1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Hatch_Output_Bus_MAX.get(1)) + .fluidInputs(Materials.Polybenzimidazole.getFluid(16 * INGOTS)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_UHV) + .addTo(sAssemblerRecipes); } } @@ -3058,217 +4499,329 @@ public class AssemblerRecipes implements Runnable { if (!Railcraft.isModLoaded()) return; GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { new ItemStack(Blocks.stone_slab, 1, 0), ItemList.RC_Rebar.get(1), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Tie_Stone.get(1)).noFluidInputs().noFluidOutputs() - .duration(6 * SECONDS + 8 * TICKS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack[] { new ItemStack(Blocks.stone_slab, 1, 0), ItemList.RC_Rebar.get(1), + GT_Utility.getIntegratedCircuit(1) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Tie_Stone.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { new ItemStack(Blocks.stone_slab, 1, 7), ItemList.RC_Rebar.get(1), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Tie_Stone.get(1)).noFluidInputs().noFluidOutputs() - .duration(6 * SECONDS + 8 * TICKS).eut(8).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack[] { new ItemStack(Blocks.stone_slab, 1, 7), ItemList.RC_Rebar.get(1), + GT_Utility.getIntegratedCircuit(1) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Tie_Stone.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.RC_Rail_HS.get(16)).fluidInputs(Materials.Blaze.getMolten(216)).noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.RC_Rail_HS.get(16)) + .fluidInputs(Materials.Blaze.getMolten(216)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(ItemList.RC_Rail_HS.get(8)).fluidInputs(Materials.ConductiveIron.getMolten(432)) - .noFluidOutputs().duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(ItemList.RC_Rail_HS.get(8)) + .fluidInputs(Materials.ConductiveIron.getMolten(432)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(ItemList.RC_Rail_HS.get(32)).fluidInputs(Materials.VibrantAlloy.getMolten(216)) - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(ItemList.RC_Rail_HS.get(32)) + .fluidInputs(Materials.VibrantAlloy.getMolten(216)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(ItemList.RC_Rail_HS.get(64)).fluidInputs(Materials.CrystallineAlloy.getMolten(216)) - .noFluidOutputs().duration(5 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(ItemList.RC_Rail_HS.get(64)) + .fluidInputs(Materials.CrystallineAlloy.getMolten(216)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.RC_Rail_Standard.get(3), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.RC_Rail_Adv.get(8)).fluidInputs(Materials.Redstone.getMolten(216)) - .noFluidOutputs().duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.RC_Rail_Standard.get(3), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.RC_Rail_Adv.get(8)) + .fluidInputs(Materials.Redstone.getMolten(216)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.RC_Rail_Standard.get(3), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.RC_Rail_Adv.get(16)).fluidInputs(Materials.RedAlloy.getMolten(216)) - .noFluidOutputs().duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.RC_Rail_Standard.get(3), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.RC_Rail_Adv.get(16)) + .fluidInputs(Materials.RedAlloy.getMolten(216)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.RC_Rail_Standard.get(3), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.RC_Rail_Adv.get(32)).fluidInputs(Materials.ConductiveIron.getMolten(216)) - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.RC_Rail_Standard.get(3), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.RC_Rail_Adv.get(32)) + .fluidInputs(Materials.ConductiveIron.getMolten(216)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.RC_Rail_Standard.get(3), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(ItemList.RC_Rail_Adv.get(64)).fluidInputs(Materials.VibrantAlloy.getMolten(216)) - .noFluidOutputs().duration(5 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.RC_Rail_Standard.get(3), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Electrum, 3), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(ItemList.RC_Rail_Adv.get(64)) + .fluidInputs(Materials.VibrantAlloy.getMolten(216)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { ItemList.RC_Rail_Standard.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Rail_Electric.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(4).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack[] { ItemList.RC_Rail_Standard.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1), + GT_Utility.getIntegratedCircuit(1) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Rail_Electric.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { ItemList.RC_Rail_Standard.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 1), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Rail_Electric.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(4).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack[] { ItemList.RC_Rail_Standard.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 1), + GT_Utility.getIntegratedCircuit(1) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Rail_Electric.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { ItemList.RC_Rail_Standard.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Rail_Electric.get(2)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(4).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack[] { ItemList.RC_Rail_Standard.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1), + GT_Utility.getIntegratedCircuit(1) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Rail_Electric.get(2)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(4) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { ItemList.RC_Rail_Standard.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Rail_Electric.get(4)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack[] { ItemList.RC_Rail_Standard.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1), + GT_Utility.getIntegratedCircuit(1) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Rail_Electric.get(4)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { ItemList.RC_Rail_Standard.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Rail_Electric.get(8)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { ItemList.RC_Rail_Standard.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 1), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Rail_Electric.get(16)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(48).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { ItemList.RC_Rail_Standard.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.HSSG, 1), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Rail_Electric.get(32)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(64).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { ItemList.RC_Rail_Standard.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 1), - GT_Utility.getIntegratedCircuit(1) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Rail_Electric.get(64)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(96).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { ItemList.RC_Tie_Wood.get(1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1), - GT_Utility.getIntegratedCircuit(10) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Rail_Wooden.get(8)).noFluidInputs().noFluidOutputs() - .duration(6 * SECONDS + 13 * TICKS).eut(4).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { ItemList.RC_Tie_Wood.get(1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1), - GT_Utility.getIntegratedCircuit(11) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Rail_Wooden.get(8)).noFluidInputs().noFluidOutputs() - .duration(6 * SECONDS + 13 * TICKS).eut(4).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { ItemList.RC_Tie_Wood.get(1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1), - GT_Utility.getIntegratedCircuit(11) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Rail_Wooden.get(16)).noFluidInputs().noFluidOutputs() - .duration(6 * SECONDS + 13 * TICKS).eut(16).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { ItemList.RC_Tie_Wood.get(1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 1), - GT_Utility.getIntegratedCircuit(11) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Rail_Wooden.get(32)).noFluidInputs().noFluidOutputs() - .duration(6 * SECONDS + 13 * TICKS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack[] { ItemList.RC_Tie_Wood.get(1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(11) }, - GT_Values.NF) - .itemOutputs(ItemList.RC_Rail_Wooden.get(64)).noFluidInputs().noFluidOutputs() - .duration(6 * SECONDS + 13 * TICKS).eut(48).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.RC_Tie_Wood.get(32), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(ItemList.RC_Bed_Wood.get(24)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.RC_Tie_Wood.get(64), GT_Utility.getIntegratedCircuit(24)) - .itemOutputs(ItemList.RC_Bed_Wood.get(48)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(48).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.RC_Tie_Stone.get(32), GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(ItemList.RC_Bed_Stone.get(24)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.RC_Tie_Stone.get(64), GT_Utility.getIntegratedCircuit(24)) - .itemOutputs(ItemList.RC_Bed_Stone.get(48)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(48).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack[] { ItemList.RC_Rail_Standard.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Rail_Electric.get(8)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack[] { ItemList.RC_Rail_Standard.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.TungstenSteel, 1), + GT_Utility.getIntegratedCircuit(1) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Rail_Electric.get(16)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(48) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack[] { ItemList.RC_Rail_Standard.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.HSSG, 1), + GT_Utility.getIntegratedCircuit(1) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Rail_Electric.get(32)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(64) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack[] { ItemList.RC_Rail_Standard.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 1), + GT_Utility.getIntegratedCircuit(1) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Rail_Electric.get(64)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(96) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack[] { ItemList.RC_Tie_Wood.get(1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1), + GT_Utility.getIntegratedCircuit(10) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Rail_Wooden.get(8)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 13 * TICKS) + .eut(4) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack[] { ItemList.RC_Tie_Wood.get(1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1), + GT_Utility.getIntegratedCircuit(11) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Rail_Wooden.get(8)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 13 * TICKS) + .eut(4) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack[] { ItemList.RC_Tie_Wood.get(1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1), + GT_Utility.getIntegratedCircuit(11) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Rail_Wooden.get(16)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 13 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack[] { ItemList.RC_Tie_Wood.get(1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 1), + GT_Utility.getIntegratedCircuit(11) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Rail_Wooden.get(32)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 13 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack[] { ItemList.RC_Tie_Wood.get(1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(11) }, + GT_Values.NF) + .itemOutputs(ItemList.RC_Rail_Wooden.get(64)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 13 * TICKS) + .eut(48) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.RC_Tie_Wood.get(32), GT_Utility.getIntegratedCircuit(20)) + .itemOutputs(ItemList.RC_Bed_Wood.get(24)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.RC_Tie_Wood.get(64), GT_Utility.getIntegratedCircuit(24)) + .itemOutputs(ItemList.RC_Bed_Wood.get(48)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.RC_Tie_Stone.get(32), GT_Utility.getIntegratedCircuit(20)) + .itemOutputs(ItemList.RC_Bed_Stone.get(24)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.RC_Tie_Stone.get(64), GT_Utility.getIntegratedCircuit(24)) + .itemOutputs(ItemList.RC_Bed_Stone.get(48)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); ItemStack tRailWood = getModItem(Railcraft.modID, "track", 64, 736); if (tRailWood != null) { @@ -3282,37 +4835,53 @@ public class AssemblerRecipes implements Runnable { tRailWoodB.stackTagCompound = tTagWoodB; GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.RC_Bed_Wood.get(1), - ItemList.RC_Rail_Wooden.get(6), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(tRailWood).noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.RC_Bed_Wood.get(1), + ItemList.RC_Rail_Wooden.get(6), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(tRailWood) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(tRailWoodB) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); + } + GT_Values.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(2, tRailWood), + new ItemStack(Blocks.rail, 1, 0), + ItemList.RC_Rail_Adv.get(2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(tRailWoodB).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); - } - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 1, 0), - ItemList.RC_Rail_Adv.get(2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(new ItemStack(Blocks.golden_rail, 16, 0)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemOutputs(new ItemStack(Blocks.golden_rail, 16, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.RC_Bed_Wood.get(1), - ItemList.RC_Rail_Standard.get(6), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(new ItemStack(Blocks.rail, 64, 0)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.RC_Bed_Wood.get(1), + ItemList.RC_Rail_Standard.get(6), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(new ItemStack(Blocks.rail, 64, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); ItemStack tRailRe = getModItem(Railcraft.modID, "track", 64); NBTTagCompound tTagRe = new NBTTagCompound(); @@ -3320,12 +4889,16 @@ public class AssemblerRecipes implements Runnable { tRailRe.stackTagCompound = tTagRe; GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.RC_Bed_Stone.get(1), - ItemList.RC_Rail_Reinforced.get(6), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(tRailRe).noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.RC_Bed_Stone.get(1), + ItemList.RC_Rail_Reinforced.get(6), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(tRailRe) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); ItemStack tRailReB = getModItem(Railcraft.modID, "track.reinforced", 16); NBTTagCompound tTagReB = new NBTTagCompound(); @@ -3333,12 +4906,16 @@ public class AssemblerRecipes implements Runnable { tRailReB.stackTagCompound = tTagReB; GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(tRailReB).noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(tRailReB) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); ItemStack tRailEl = getModItem(Railcraft.modID, "track", 64); NBTTagCompound tTagEl = new NBTTagCompound(); @@ -3346,12 +4923,16 @@ public class AssemblerRecipes implements Runnable { tRailEl.stackTagCompound = tTagEl; GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.RC_Bed_Stone.get(1), - ItemList.RC_Rail_Electric.get(6), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(tRailEl).noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.RC_Bed_Stone.get(1), + ItemList.RC_Rail_Electric.get(6), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(tRailEl) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); ItemStack tRailHs = getModItem(Railcraft.modID, "track", 64, 816); if (tRailHs != null) { @@ -3360,12 +4941,16 @@ public class AssemblerRecipes implements Runnable { tRailHs.stackTagCompound = tTagHs; GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.RC_Bed_Stone.get(1), - ItemList.RC_Rail_HS.get(6), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(tRailHs).noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .itemInputs( + ItemList.RC_Bed_Stone.get(1), + ItemList.RC_Rail_HS.get(6), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(tRailHs) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); } ItemStack tRailHsB = getModItem(Railcraft.modID, "track.speed", 16); NBTTagCompound tTagHsB = new NBTTagCompound(); @@ -3373,12 +4958,16 @@ public class AssemblerRecipes implements Runnable { tRailHsB.stackTagCompound = tTagHsB; GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(tRailHsB).noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(tRailHsB) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); // --- Wooden Switch Track --- ItemStack tRailSS = getModItem(Railcraft.modID, "track.slow", 1, 19986); @@ -3388,60 +4977,88 @@ public class AssemblerRecipes implements Runnable { tRailSS.stackTagCompound = tTagSS; GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.AnyIron, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(tRailSS).noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(8) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.AnyIron, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tRailSS) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(2, tRailSS)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(2, tRailSS)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailSS)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailSS)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailSS)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailSS)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailSS)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailSS)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailSS)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailSS)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailSS)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailSS)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); } // --- Wooden Wye Track --- ItemStack tRailSW = getModItem(Railcraft.modID, "track.slow", 1); @@ -3451,60 +5068,88 @@ public class AssemblerRecipes implements Runnable { tRailSW.stackTagCompound = tTagSW; GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.AnyIron, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(tRailSW).noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(8) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.AnyIron, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tRailSW) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(2, tRailSW)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(2, tRailSW)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailSW)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailSW)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailSW)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailSW)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailSW)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailSW)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailSW)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailSW)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailSW)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailSW)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); } // --- Wooden Junction Tack --- ItemStack tRailSJ = getModItem(Railcraft.modID, "track.slow", 1); @@ -3514,60 +5159,88 @@ public class AssemblerRecipes implements Runnable { tRailSJ.stackTagCompound = tTagSJ; GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.AnyIron, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(tRailSJ).noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(8) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.AnyIron, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tRailSJ) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(2, tRailSJ)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(2, tRailSJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailSJ)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailSJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailSJ)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailSJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailSJ)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailSJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailSJ)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailSJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailWood), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailSJ)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailWood), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailSJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); } // --- Switch Tack --- ItemStack tRailNS = getModItem(Railcraft.modID, "track", 1, 4767); @@ -3577,60 +5250,88 @@ public class AssemblerRecipes implements Runnable { tRailNS.stackTagCompound = tTagNS; GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(tRailNS).noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tRailNS) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(2, tRailNS)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(2, tRailNS)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailNS)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailNS)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailNS)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailNS)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailNS)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailNS)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailNS)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailNS)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailNS)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailNS)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // --- Wye Tack --- @@ -3641,60 +5342,88 @@ public class AssemblerRecipes implements Runnable { tRailNW.stackTagCompound = tTagNW; GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(tRailNW).noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tRailNW) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(2, tRailNW)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(2, tRailNW)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailNW)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailNW)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailNW)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailNW)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailNW)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailNW)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailNW)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailNW)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailNW)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailNW)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // --- Junction Tack --- ItemStack tRailNJ = getModItem(Railcraft.modID, "track", 1); @@ -3704,60 +5433,88 @@ public class AssemblerRecipes implements Runnable { tRailNJ.stackTagCompound = tTagNJ; GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(tRailNJ).noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tRailNJ) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(2, tRailNJ)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(2, tRailNJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailNJ)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailNJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailNJ)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailNJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailNJ)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailNJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailNJ)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailNJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.rail, 2, 0), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailNJ)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.rail, 2, 0), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailNJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // --- Reinforced Switch Track --- ItemStack tRailRS = getModItem(Railcraft.modID, "track.reinforced", 1); @@ -3767,60 +5524,88 @@ public class AssemblerRecipes implements Runnable { tRailRS.stackTagCompound = tTagRS; GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(tRailRS).noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(16) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tRailRS) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(2, tRailRS)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(2, tRailRS)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailRS)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailRS)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailRS)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailRS)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailRS)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailRS)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailRS)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailRS)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailRS)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailRS)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // --- Reinforced Wye Track --- ItemStack tRailRW = getModItem(Railcraft.modID, "track.reinforced", 1); @@ -3830,60 +5615,88 @@ public class AssemblerRecipes implements Runnable { tRailRW.stackTagCompound = tTagRW; GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(tRailRW).noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(16) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tRailRW) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(2, tRailRW)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(2, tRailRW)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailRW)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailRW)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailRW)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailRW)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailRW)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailRW)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailRW)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailRW)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailRW)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailRW)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // --- Reinforced Junction Track --- ItemStack tRailRJ = getModItem(Railcraft.modID, "track.reinforced", 1, 764); @@ -3893,60 +5706,88 @@ public class AssemblerRecipes implements Runnable { tRailRJ.stackTagCompound = tTagRJ; GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(tRailRJ).noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(16) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tRailRJ) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(2, tRailRJ)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(2, tRailRJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailRJ)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailRJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailRJ)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailRJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailRJ)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iridium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailRJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailRJ)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailRJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailRe), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailRJ)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailRe), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailRJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // --- H.S. Switch Track --- ItemStack tRailSSw = getModItem(Railcraft.modID, "track.speed", 1, 7916); @@ -3956,60 +5797,88 @@ public class AssemblerRecipes implements Runnable { tRailSSw.stackTagCompound = tTagRSSw; GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(tRailSSw).noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(16) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Steel, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tRailSSw) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(2, tRailSSw)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.StainlessSteel, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(2, tRailSSw)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailSSw)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailSSw)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailSSw)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.TungstenSteel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailSSw)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailSSw)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Iridium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailSSw)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailSSw)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Osmium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailSSw)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailSSw)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Neutronium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailSSw)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // --- H.S. Wye Track --- ItemStack tRailSWy = getModItem(Railcraft.modID, "track.speed", 1); @@ -4019,60 +5888,88 @@ public class AssemblerRecipes implements Runnable { tRailSWy.stackTagCompound = tTagRSWy; GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(tRailSWy).noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(16) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Steel, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tRailSWy) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(2, tRailSWy)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.StainlessSteel, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(2, tRailSWy)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailSWy)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailSWy)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailSWy)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TungstenSteel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailSWy)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailSWy)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailSWy)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailSWy)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailSWy)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailSWy)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailSWy)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // --- H.S. Transition Track --- ItemStack tRailSTt = getModItem(Railcraft.modID, "track.speed", 1, 26865); @@ -4082,49 +5979,69 @@ public class AssemblerRecipes implements Runnable { tRailSTt.stackTagCompound = tTagRSTt; GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - ItemList.RC_Bed_Stone.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailSTt)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + ItemList.RC_Bed_Stone.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailSTt)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - ItemList.RC_Bed_Stone.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ConductiveIron, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailSTt)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + ItemList.RC_Bed_Stone.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ConductiveIron, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailSTt)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - ItemList.RC_Bed_Stone.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailSTt)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + ItemList.RC_Bed_Stone.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailSTt)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - ItemList.RC_Bed_Stone.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailSTt)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + ItemList.RC_Bed_Stone.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CrystallineAlloy, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailSTt)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailHs), - ItemList.RC_Bed_Stone.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MelodicAlloy, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailSTt)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailHs), + ItemList.RC_Bed_Stone.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MelodicAlloy, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailSTt)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // --- Electric Switch Track --- ItemStack tRailES = getModItem(Railcraft.modID, "track.electric", 1, 10488); @@ -4134,60 +6051,88 @@ public class AssemblerRecipes implements Runnable { tRailES.stackTagCompound = tTagES; GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Copper, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(tRailES).noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(16) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Copper, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tRailES) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Gold, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(2, tRailES)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Gold, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(2, tRailES)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Electrum, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailES)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Electrum, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailES)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailES)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailES)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Platinum, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailES)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Platinum, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailES)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.VanadiumGallium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailES)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.VanadiumGallium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailES)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Naquadah, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailES)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.springSmall, Materials.Naquadah, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailES)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // --- Electric Wye Track --- ItemStack tRailEw = getModItem(Railcraft.modID, "track.electric", 1); @@ -4197,60 +6142,88 @@ public class AssemblerRecipes implements Runnable { tRailEw.stackTagCompound = tTagEw; GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Copper, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(tRailEw).noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(16) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Copper, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tRailEw) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Gold, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(2, tRailEw)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Gold, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(2, tRailEw)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Electrum, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailEw)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Electrum, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailEw)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailEw)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailEw)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailEw)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailEw)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.VanadiumGallium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailEw)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.VanadiumGallium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailEw)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Naquadah, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailEw)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Naquadah, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailEw)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // --- Electric Junction Track --- ItemStack tRailEJ = getModItem(Railcraft.modID, "track.electric", 1); @@ -4260,60 +6233,88 @@ public class AssemblerRecipes implements Runnable { tRailEJ.stackTagCompound = tTagREJ; GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Copper, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(tRailEJ).noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(16) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Copper, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tRailEJ) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Gold, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(2, tRailEJ)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Gold, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(2, tRailEJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(4, tRailEJ)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(4, tRailEJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(8, tRailEJ)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(8, tRailEJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Platinum, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(16, tRailEJ)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Platinum, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(16, tRailEJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.VanadiumGallium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(32, tRailEJ)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.VanadiumGallium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(32, tRailEJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(2, tRailEl), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Naquadah, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_Utility.copyAmount(64, tRailEJ)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_Utility.copyAmount(2, tRailEl), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Naquadah, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_Utility.copyAmount(64, tRailEJ)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } // Shunting Wire for (Materials tMat : solderingMats) { @@ -4321,507 +6322,752 @@ public class AssemblerRecipes implements Runnable { : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.RC_ShuntingWire.get(1)).fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) - .noFluidOutputs().duration(10 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.RC_ShuntingWire.get(1)) + .fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.RC_ShuntingWire.get(1)).fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) - .noFluidOutputs().duration(10 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.AnnealedCopper, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.RC_ShuntingWire.get(1)) + .fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.RC_ShuntingWire.get(4)).fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) - .noFluidOutputs().duration(10 * SECONDS).eut(24).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Lead, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.RC_ShuntingWire.get(4)) + .fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(24) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.RC_ShuntingWire.get(8)).fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.RC_ShuntingWire.get(8)) + .fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.RC_ShuntingWire.get(16)).fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) - .noFluidOutputs().duration(10 * SECONDS).eut(48).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Electrum, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.RC_ShuntingWire.get(16)) + .fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(48) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Platinum, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.RC_ShuntingWire.get(32)).fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) - .noFluidOutputs().duration(10 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Platinum, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.RC_ShuntingWire.get(32)) + .fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Platinum, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.RC_ShuntingWire.get(64)).fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.VanadiumGallium, 1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Platinum, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.RC_ShuntingWire.get(64)) + .fluidInputs(tMat.getMolten(16L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); // chunkloader upgrade OC GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Plastic_Advanced.get(1), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Aluminium, 2), - getModItem(Railcraft.modID, "machine.alpha", 1L, 0), - getModItem(OpenComputers.modID, "item", 1L, 26), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(OpenComputers.modID, "item", 1L, 62)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs() - .duration(12 * SECONDS + 10 * TICKS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Plastic_Advanced.get(1), + GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Aluminium, 2), + getModItem(Railcraft.modID, "machine.alpha", 1L, 0), + getModItem(OpenComputers.modID, "item", 1L, 26), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(OpenComputers.modID, "item", 1L, 62)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(12 * SECONDS + 10 * TICKS) + .eut(256) + .addTo(sAssemblerRecipes); } GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.piston, 1, 0), - ItemList.FR_Casing_Sturdy.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1L, 0)) - .fluidInputs(Materials.SeedOil.getFluid(250)).noFluidOutputs().duration(5 * SECONDS).eut(16) - .addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.piston, 1, 0), + ItemList.FR_Casing_Sturdy.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1L, 0)) + .fluidInputs(Materials.SeedOil.getFluid(250)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.piston, 1, 0), - ItemList.FR_Casing_Sturdy.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1L, 0)) - .fluidInputs(Materials.Lubricant.getFluid(125)).noFluidOutputs().duration(5 * SECONDS).eut(16) - .addTo(sAssemblerRecipes); + .itemInputs( + new ItemStack(Blocks.piston, 1, 0), + ItemList.FR_Casing_Sturdy.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lapis, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1L, 0)) + .fluidInputs(Materials.Lubricant.getFluid(125)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(ExtraUtilities.modID, "trashcan", 1L, 0), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 11)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(ExtraUtilities.modID, "trashcan", 1L, 0), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Obsidian, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 11)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyCopper, 10), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 7)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyCopper, 10), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 7)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 10), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 8)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 10), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 8)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 10), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 9)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(NewHorizonsCoreMod.modID, "item.EngineCore", 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 10), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 9)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Gold, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 4), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1, 0)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Gold, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 4), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2), - GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2), + GT_Utility.getIntegratedCircuit(20)) + .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 1)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2), + new ItemStack(Blocks.glass_pane, 2, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 1)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2), + getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Bronze, 2), - new ItemStack(Blocks.iron_bars, 2, 0), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Bronze, 2), + new ItemStack(Blocks.iron_bars, 2, 0), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2), - GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2), + GT_Utility.getIntegratedCircuit(20)) + .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 14)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2), + new ItemStack(Blocks.glass_pane, 2, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 14)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 14)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2), + getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 2L, 14)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 2), - getModItem(NewHorizonsCoreMod.modID, "item.SteelBars", 2), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(64).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Steel, 2), + getModItem(NewHorizonsCoreMod.modID, "item.SteelBars", 2), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2), - GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2), + GT_Utility.getIntegratedCircuit(20)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 1)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2), + new ItemStack(Blocks.glass_pane, 2, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 1)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2), + getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Plastic, 2), - getModItem(NewHorizonsCoreMod.modID, "item.AluminiumBars", 2), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Plastic, 2), + getModItem(NewHorizonsCoreMod.modID, "item.AluminiumBars", 2), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), - GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), + GT_Utility.getIntegratedCircuit(20)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 4)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), + new ItemStack(Blocks.glass_pane, 2, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 4)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2), + getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 2), - getModItem(NewHorizonsCoreMod.modID, "item.StainlessSteelBars", 2), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(256).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 2), + getModItem(NewHorizonsCoreMod.modID, "item.StainlessSteelBars", 2), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(256) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2), - GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2), + GT_Utility.getIntegratedCircuit(20)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 7)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2), + new ItemStack(Blocks.glass_pane, 2, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 7)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 7)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2), + getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 7)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 2), - getModItem(NewHorizonsCoreMod.modID, "item.TitaniumBars", 2), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 2), + getModItem(NewHorizonsCoreMod.modID, "item.TitaniumBars", 2), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), - GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), + GT_Utility.getIntegratedCircuit(20)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 10)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), + new ItemStack(Blocks.glass_pane, 2, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 10)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 10)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), + getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 10)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 2), - getModItem(NewHorizonsCoreMod.modID, "item.TungstenSteelBars", 2), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 2), + getModItem(NewHorizonsCoreMod.modID, "item.TungstenSteelBars", 2), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2), - GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2), + GT_Utility.getIntegratedCircuit(20)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 13)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2), + new ItemStack(Blocks.glass_pane, 2, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 13)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 13)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2), + getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 2L, 13)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NiobiumTitanium, 2), - getModItem(NewHorizonsCoreMod.modID, "item.ChromeBars", 2), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NiobiumTitanium, 2), + getModItem(NewHorizonsCoreMod.modID, "item.ChromeBars", 2), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), - GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(4096).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), + GT_Utility.getIntegratedCircuit(20)) + .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(4096) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(4096).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), + new ItemStack(Blocks.glass_pane, 2, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4096) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(4096).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), + getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4096) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 2), - getModItem(NewHorizonsCoreMod.modID, "item.IridiumBars", 2), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(4096).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Enderium, 2), + getModItem(NewHorizonsCoreMod.modID, "item.IridiumBars", 2), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(4096) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), - GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), + GT_Utility.getIntegratedCircuit(20)) + .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 4)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), + new ItemStack(Blocks.glass_pane, 2, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 4)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), + getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2), - getModItem(NewHorizonsCoreMod.modID, "item.OsmiumBars", 2), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2), + getModItem(NewHorizonsCoreMod.modID, "item.OsmiumBars", 2), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), - GT_Utility.getIntegratedCircuit(20)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), + GT_Utility.getIntegratedCircuit(20)) + .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), - new ItemStack(Blocks.glass_pane, 2, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 7)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), + new ItemStack(Blocks.glass_pane, 2, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 7)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), - getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 7)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), + getModItem(TinkerConstruct.modID, "GlassPane", 2L, 0), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 2L, 7)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2), - getModItem(NewHorizonsCoreMod.modID, "item.NeutroniumBars", 2), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2), + getModItem(NewHorizonsCoreMod.modID, "item.NeutroniumBars", 2), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); // Water Tank GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1L, 14)) - .fluidInputs(Materials.Glue.getFluid(36)).noFluidOutputs().duration(10 * SECONDS).eut(8) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2)) + .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1L, 14)) + .fluidInputs(Materials.Glue.getFluid(36)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1L, 14)) - .fluidInputs(Materials.Glue.getFluid(36)).noFluidOutputs().duration(10 * SECONDS).eut(8) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2)) + .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1L, 14)) + .fluidInputs(Materials.Glue.getFluid(36)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1L, 14)) - .fluidInputs(Materials.Glue.getFluid(36)).noFluidOutputs().duration(10 * SECONDS).eut(8) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 2)) + .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 1L, 14)) + .fluidInputs(Materials.Glue.getFluid(36)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(8) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 4), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 4)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 3L, 14)) - .fluidInputs(Materials.Glue.getFluid(72)).noFluidOutputs().duration(20 * SECONDS).eut(30) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 4), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Wood, 4)) + .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 3L, 14)) + .fluidInputs(Materials.Glue.getFluid(72)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(30) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 2), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 1)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 3L, 14)) - .fluidInputs(Materials.Plastic.getMolten(36)).noFluidOutputs().duration(20 * SECONDS).eut(30) - .addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Steel, 2), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 1)) + .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 3L, 14)) + .fluidInputs(Materials.Plastic.getMolten(36)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(30) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.StainlessSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 4)) - .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 9L, 14)) - .fluidInputs(Materials.Plastic.getMolten(72)).noFluidOutputs().duration(20 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.StainlessSteel, 4), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.WoodSealed, 4)) + .itemOutputs(getModItem(Railcraft.modID, "machine.alpha", 9L, 14)) + .fluidInputs(Materials.Plastic.getMolten(72)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); // Steam Boilers - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Item_Casing_Iron.get(6), GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 3)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Item_Casing_Iron.get(6), GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Item_Casing_Steel.get(6), GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 4)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(64).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Item_Casing_Steel.get(6), GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(getModItem(Railcraft.modID, "machine.beta", 1L, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(64) + .addTo(sAssemblerRecipes); } public void withBartWorks() { @@ -4830,11 +7076,15 @@ public class AssemblerRecipes implements Runnable { } GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(BartWorks.modID, "gt.bwMetaGeneratedplate", 6L, 88), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Chrome, 1)) - .itemOutputs(ItemList.Casing_Advanced_Rhodium_Palladium.get(1)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(BartWorks.modID, "gt.bwMetaGeneratedplate", 6L, 88), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Chrome, 1)) + .itemOutputs(ItemList.Casing_Advanced_Rhodium_Palladium.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sAssemblerRecipes); } @@ -4844,29 +7094,41 @@ public class AssemblerRecipes implements Runnable { } GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Bronze, 1), - GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Aluminium, 1), - GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Steel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Ingot_Heavy1.get(1)).fluidInputs(Materials.StainlessSteel.getMolten(72)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Bronze, 1), + GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Aluminium, 1), + GT_OreDictUnificator.get(OrePrefixes.compressed, Materials.Steel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Ingot_Heavy1.get(1)) + .fluidInputs(Materials.StainlessSteel.getMolten(72)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(GalacticraftCore.modID, "item.heavyPlating", 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MeteoricIron, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Ingot_Heavy2.get(1)).fluidInputs(Materials.TungstenSteel.getMolten(72)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(GalacticraftCore.modID, "item.heavyPlating", 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.MeteoricIron, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Ingot_Heavy2.get(1)) + .fluidInputs(Materials.TungstenSteel.getMolten(72)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(GalacticraftMars.modID, "item.null", 1L, 3), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Desh, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Ingot_Heavy3.get(1)).fluidInputs(Materials.Platinum.getMolten(72)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(GalacticraftMars.modID, "item.null", 1L, 3), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Desh, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Ingot_Heavy3.get(1)) + .fluidInputs(Materials.Platinum.getMolten(72)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); } public void withGalaxySpace() { @@ -4875,111 +7137,149 @@ public class AssemblerRecipes implements Runnable { } GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Pentacadmiummagnesiumhexaoxid, 3), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 2), - ItemList.Electric_Pump_MV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 2000)).noFluidOutputs() - .duration(16 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator - .get(OrePrefixes.wireGt01, Materials.Titaniumonabariumdecacoppereikosaoxid, 6), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 4), - ItemList.Electric_Pump_HV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 6)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 4000)).noFluidOutputs() - .duration(16 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 6), - ItemList.Electric_Pump_EV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 9)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 6000)).noFluidOutputs() - .duration(16 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 8), - ItemList.Electric_Pump_IV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 8000)).noFluidOutputs() - .duration(32 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get( - OrePrefixes.wireGt01, - Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, - 15), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10), - ItemList.Electric_Pump_LuV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 12000)).noFluidOutputs() - .duration(32 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator - .get(OrePrefixes.wireGt01, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 18), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12), - ItemList.Electric_Pump_ZPM.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 16000)).noFluidOutputs() - .duration(1 * MINUTES + 4 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator - .get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14), - ItemList.Electric_Pump_UV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 20000)).noFluidOutputs() - .duration(1 * MINUTES + 4 * SECONDS).eut(TierEU.RECIPE_UV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator - .get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16), - ItemList.Electric_Pump_UHV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 24000)).noFluidOutputs() - .duration(2 * MINUTES + 8 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEVBase, 27), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Infinity, 18), - ItemList.Electric_Pump_UEV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 27)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 28000)).noFluidOutputs() - .duration(2 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_UEV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 33), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.SpaceTime, 22), - ItemList.Electric_Pump_UMV.get(1), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 33)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 36000)).noFluidOutputs() - .duration(2 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_UMV).addTo(sAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Pentacadmiummagnesiumhexaoxid, 3), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 2), + ItemList.Electric_Pump_MV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 2000)) + .noFluidOutputs() + .duration(16 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + Materials.Titaniumonabariumdecacoppereikosaoxid, + 6), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 4), + ItemList.Electric_Pump_HV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 6)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 4000)) + .noFluidOutputs() + .duration(16 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.TungstenSteel, 6), + ItemList.Electric_Pump_EV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 9)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 6000)) + .noFluidOutputs() + .duration(16 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.NiobiumTitanium, 8), + ItemList.Electric_Pump_IV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 8000)) + .noFluidOutputs() + .duration(32 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, + 15), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10), + ItemList.Electric_Pump_LuV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 12000)) + .noFluidOutputs() + .duration(32 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + Materials.Tetranaquadahdiindiumhexaplatiumosminid, + 18), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12), + ItemList.Electric_Pump_ZPM.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 16000)) + .noFluidOutputs() + .duration(1 * MINUTES + 4 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + Materials.Longasssuperconductornameforuvwire, + 21), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14), + ItemList.Electric_Pump_UV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 20000)) + .noFluidOutputs() + .duration(1 * MINUTES + 4 * SECONDS) + .eut(TierEU.RECIPE_UV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.wireGt01, + Materials.Longasssuperconductornameforuhvwire, + 24), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16), + ItemList.Electric_Pump_UHV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 24000)) + .noFluidOutputs() + .duration(2 * MINUTES + 8 * SECONDS) + .eut(TierEU.RECIPE_UHV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEVBase, 27), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Infinity, 18), + ItemList.Electric_Pump_UEV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 27)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 28000)) + .noFluidOutputs() + .duration(2 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_UEV) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 33), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.SpaceTime, 22), + ItemList.Electric_Pump_UMV.get(1), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 33)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("liquid helium"), 36000)) + .noFluidOutputs() + .duration(2 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_UMV) + .addTo(sAssemblerRecipes); } public void withGTNHLanthAndGTPP() { @@ -4988,18 +7288,22 @@ public class AssemblerRecipes implements Runnable { } GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Electric_Pump_EV.get(4), - ItemList.Field_Generator_EV.get(4), - getModItem(GTPlusPlus.modID, "itemPlateInconel690", 4), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 16), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.BorosilicateGlass, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4), - ItemList.Shape_Extruder_Wire.get(16)) - .itemOutputs(ItemList.Spinneret.get(1)).fluidInputs(Materials.SolderingAlloy.getGas(144)) - .noFluidOutputs().duration(2 * MINUTES).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemInputs( + ItemList.Electric_Pump_EV.get(4), + ItemList.Field_Generator_EV.get(4), + getModItem(GTPlusPlus.modID, "itemPlateInconel690", 4), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 16), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.BorosilicateGlass, 16), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4), + ItemList.Shape_Extruder_Wire.get(16)) + .itemOutputs(ItemList.Spinneret.get(1)) + .fluidInputs(Materials.SolderingAlloy.getGas(144)) + .noFluidOutputs() + .duration(2 * MINUTES) + .eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); } public void withIC2NuclearControl() { @@ -5008,104 +7312,157 @@ public class AssemblerRecipes implements Runnable { } GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemVanillaMachineCard", 1L, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(IC2NuclearControl.modID, "ItemVanillaMachineCard", 1L, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemInventoryScannerCard", 1L, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(IC2NuclearControl.modID, "ItemInventoryScannerCard", 1L, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemEnergySensorLocationCard", 1L, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(IC2NuclearControl.modID, "ItemEnergySensorLocationCard", 1L, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(IC2NuclearControl.modID, "RFSensorCard", 1L, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(IC2NuclearControl.modID, "RFSensorCard", 1L, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemMultipleSensorLocationCard", 1L, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 1)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(IC2NuclearControl.modID, "ItemMultipleSensorLocationCard", 1L, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); // counter GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemMultipleSensorLocationCard", 1L, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 1)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(IC2NuclearControl.modID, "ItemMultipleSensorLocationCard", 1L, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); // liquid GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemMultipleSensorLocationCard", 1L, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(IC2NuclearControl.modID, "ItemMultipleSensorLocationCard", 1L, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); // generator GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemLiquidArrayLocationCard", 1L, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(IC2NuclearControl.modID, "ItemLiquidArrayLocationCard", 1L, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); // 2-6 liquid GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemEnergyArrayLocationCard", 1L, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(IC2NuclearControl.modID, "ItemEnergyArrayLocationCard", 1L, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); // 2-6 energy GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(IC2NuclearControl.modID, "ItemSensorLocationCard", 1L, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2)).noFluidInputs() - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(IC2NuclearControl.modID, "ItemSensorLocationCard", 1L, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); // non-fluid nuke GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(IC2NuclearControl.modID, "Item55ReactorCard", 1L, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2)).noFluidInputs() - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(IC2NuclearControl.modID, "Item55ReactorCard", 1L, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(IC2NuclearControl.modID, "CardAppeng", 1L, 0), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemInputs( + getModItem(IC2NuclearControl.modID, "CardAppeng", 1L, 0), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.NC_SensorCard.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 3)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.NC_SensorCard.get(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getIC2Item("electronicCircuit", 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java index 4eab816d2e..ddac3b5623 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java @@ -44,689 +44,841 @@ public class AssemblyLineRecipes implements Runnable { // Motors { // LuV motor - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Electric_Motor_IV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.HSSS, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2)) - .fluidInputs(new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250)) - .noFluidOutputs().itemOutputs(ItemList.Electric_Motor_LuV.get(1)).eut(TierEU.RECIPE_IV) - .duration(600).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Electric_Motor_IV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.HSSS, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2)) + .fluidInputs(new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250)) + .noFluidOutputs() + .itemOutputs(ItemList.Electric_Motor_LuV.get(1)) + .eut(TierEU.RECIPE_IV) + .duration(600) + .addTo(AssemblyLine); // ZPM motor - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Electric_Motor_LuV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 2), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 16), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2)) - .fluidInputs(new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750)) - .noFluidOutputs().itemOutputs(ItemList.Electric_Motor_ZPM.get(1)).eut(TierEU.RECIPE_LuV) - .duration(30 * SECONDS).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Electric_Motor_LuV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 2), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 16), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2)) + .fluidInputs(new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750)) + .noFluidOutputs() + .itemOutputs(ItemList.Electric_Motor_ZPM.get(1)) + .eut(TierEU.RECIPE_LuV) + .duration(30 * SECONDS) + .addTo(AssemblyLine); // UV motor - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Electric_Motor_ZPM.get(1)) - .metadata(RESEARCH_TIME, 4 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 2), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 4), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 16), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2)) - .fluidInputs( - Materials.Naquadria.getMolten(1296), - new FluidStack(solderIndalloy, 1296), - Materials.Lubricant.getFluid(2000)) - .noFluidOutputs().itemOutputs( - - ).eut(TierEU.RECIPE_ZPM).duration(30 * SECONDS).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Electric_Motor_ZPM.get(1)) + .metadata(RESEARCH_TIME, 4 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 2), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 4), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 16), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2)) + .fluidInputs( + Materials.Naquadria.getMolten(1296), + new FluidStack(solderIndalloy, 1296), + Materials.Lubricant.getFluid(2000)) + .noFluidOutputs() + .itemOutputs( + + ) + .eut(TierEU.RECIPE_ZPM) + .duration(30 * SECONDS) + .addTo(AssemblyLine); } // Pumps { // LuV Pump - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Electric_Pump_IV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - ItemList.Electric_Motor_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.NiobiumTitanium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.HSSS, 8), - new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 4 }, - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.HSSS, 2), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2)) - .fluidInputs(new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250)) - .noFluidOutputs().itemOutputs(ItemList.Electric_Pump_LuV.get(1)).eut(TierEU.RECIPE_IV).duration(600) - .addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Electric_Pump_IV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + ItemList.Electric_Motor_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.NiobiumTitanium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.HSSS, 8), + new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 4 }, + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.HSSS, 2), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2)) + .fluidInputs(new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250)) + .noFluidOutputs() + .itemOutputs(ItemList.Electric_Pump_LuV.get(1)) + .eut(TierEU.RECIPE_IV) + .duration(600) + .addTo(AssemblyLine); // ZPM Pump - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Electric_Pump_LuV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - ItemList.Electric_Motor_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 8), - new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 8 }, - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2)) - .fluidInputs(new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750)) - .noFluidOutputs().itemOutputs(ItemList.Electric_Pump_ZPM.get(1)).eut(TierEU.RECIPE_LuV) - .duration(30 * SECONDS).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Electric_Pump_LuV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + ItemList.Electric_Motor_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 8), + new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 8 }, + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2)) + .fluidInputs(new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750)) + .noFluidOutputs() + .itemOutputs(ItemList.Electric_Pump_ZPM.get(1)) + .eut(TierEU.RECIPE_LuV) + .duration(30 * SECONDS) + .addTo(AssemblyLine); // UV Pump - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Electric_Pump_ZPM.get(1)) - .metadata(RESEARCH_TIME, 4 * HOURS) - .itemInputs( - ItemList.Electric_Motor_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 8), - new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 16 }, - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 2), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2)) - .itemOutputs(ItemList.Electric_Pump_UV.get(1)) - .fluidInputs( - Materials.Naquadria.getMolten(1296), - new FluidStack(solderIndalloy, 1296), - Materials.Lubricant.getFluid(2000)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_ZPM).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Electric_Pump_ZPM.get(1)) + .metadata(RESEARCH_TIME, 4 * HOURS) + .itemInputs( + ItemList.Electric_Motor_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 8), + new Object[] { OrePrefixes.ring.get(Materials.AnySyntheticRubber), 16 }, + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Neutronium, 2), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2)) + .itemOutputs(ItemList.Electric_Pump_UV.get(1)) + .fluidInputs( + Materials.Naquadria.getMolten(1296), + new FluidStack(solderIndalloy, 1296), + Materials.Lubricant.getFluid(2000)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); } // Conveyors { // LuV Conveyor - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Conveyor_Module_IV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - ItemList.Electric_Motor_LuV.get(2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 2), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.HSSS, 32), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2), - new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 10 }) - .itemOutputs(ItemList.Conveyor_Module_LuV.get(1)) - .fluidInputs(new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_IV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Conveyor_Module_IV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + ItemList.Electric_Motor_LuV.get(2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 2), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.HSSS, 32), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2), + new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 10 }) + .itemOutputs(ItemList.Conveyor_Module_LuV.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_IV) + .addTo(AssemblyLine); // ZPM Conveyor - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Conveyor_Module_LuV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - ItemList.Electric_Motor_ZPM.get(2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 32), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2), - new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 20 }) - .itemOutputs(ItemList.Conveyor_Module_ZPM.get(1)) - .fluidInputs(new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_LuV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Conveyor_Module_LuV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + ItemList.Electric_Motor_ZPM.get(2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 32), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2), + new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 20 }) + .itemOutputs(ItemList.Conveyor_Module_ZPM.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_LuV) + .addTo(AssemblyLine); // UV Conveyor - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Conveyor_Module_ZPM.get(1)) - .metadata(RESEARCH_TIME, 4 * HOURS) - .itemInputs( - ItemList.Electric_Motor_UV.get(2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2), - new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 40 }) - .itemOutputs(ItemList.Conveyor_Module_UV.get(1)) - .fluidInputs( - Materials.Naquadria.getMolten(1296), - new FluidStack(solderIndalloy, 1296), - Materials.Lubricant.getFluid(2000)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_ZPM).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Conveyor_Module_ZPM.get(1)) + .metadata(RESEARCH_TIME, 4 * HOURS) + .itemInputs( + ItemList.Electric_Motor_UV.get(2), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 2), + new Object[] { OrePrefixes.plate.get(Materials.AnySyntheticRubber), 40 }) + .itemOutputs(ItemList.Conveyor_Module_UV.get(1)) + .fluidInputs( + Materials.Naquadria.getMolten(1296), + new FluidStack(solderIndalloy, 1296), + Materials.Lubricant.getFluid(2000)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); } // Pistons { // LuV Piston - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Electric_Piston_IV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - ItemList.Electric_Motor_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.HSSS, 32), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.HSSS, 4), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.HSSS, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 2), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 4)) - .itemOutputs(ItemList.Electric_Piston_LuV.get(1)) - .fluidInputs(new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_IV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Electric_Piston_IV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + ItemList.Electric_Motor_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.HSSS, 32), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.HSSS, 4), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.HSSS, 1), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 2), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 4)) + .itemOutputs(ItemList.Electric_Piston_LuV.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 144), Materials.Lubricant.getFluid(250)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_IV) + .addTo(AssemblyLine); // ZPM Pistons - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Electric_Piston_LuV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - ItemList.Electric_Motor_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 6), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 32), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.NaquadahAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 2), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 4)) - .itemOutputs(ItemList.Electric_Piston_ZPM.get(1)) - .fluidInputs(new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_LuV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Electric_Piston_LuV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + ItemList.Electric_Motor_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 6), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.NaquadahAlloy, 32), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.NaquadahAlloy, 1), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 2), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 4)) + .itemOutputs(ItemList.Electric_Piston_ZPM.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 288), Materials.Lubricant.getFluid(750)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_LuV) + .addTo(AssemblyLine); // UV Piston - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Electric_Piston_ZPM.get(1)) - .metadata(RESEARCH_TIME, 4 * HOURS) - .itemInputs( - ItemList.Electric_Motor_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4), - GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 4), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 2), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 4)) - .itemOutputs(ItemList.Electric_Piston_UV.get(1)) - .fluidInputs( - Materials.Naquadria.getMolten(1296), - new FluidStack(solderIndalloy, 1296), - Materials.Lubricant.getFluid(2000)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_ZPM).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Electric_Piston_ZPM.get(1)) + .metadata(RESEARCH_TIME, 4 * HOURS) + .itemInputs( + ItemList.Electric_Motor_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 4), + GT_OreDictUnificator.get(OrePrefixes.round, Materials.Neutronium, 32), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 4), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 1), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 2), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 4)) + .itemOutputs(ItemList.Electric_Piston_UV.get(1)) + .fluidInputs( + Materials.Naquadria.getMolten(1296), + new FluidStack(solderIndalloy, 1296), + Materials.Lubricant.getFluid(2000)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); } // RobotArms { // LuV Robot Arm - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Robot_Arm_IV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.HSSS, 4), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.HSSS, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 3), - ItemList.Electric_Motor_LuV.get(2), - ItemList.Electric_Piston_LuV.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, - new Object[] { OrePrefixes.circuit.get(Materials.Elite), 4 }, - new Object[] { OrePrefixes.circuit.get(Materials.Data), 8 }, - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 6)) - .itemOutputs(ItemList.Robot_Arm_LuV.get(1)) - .fluidInputs(new FluidStack(solderIndalloy, 576), Materials.Lubricant.getFluid(250)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_IV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Robot_Arm_IV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.HSSS, 4), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.HSSS, 1), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 3), + ItemList.Electric_Motor_LuV.get(2), + ItemList.Electric_Piston_LuV.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.Elite), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.Data), 8 }, + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 6)) + .itemOutputs(ItemList.Robot_Arm_LuV.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 576), Materials.Lubricant.getFluid(250)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_IV) + .addTo(AssemblyLine); // ZPM Robot Arm - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Robot_Arm_LuV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.NaquadahAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 3), - ItemList.Electric_Motor_ZPM.get(2), - ItemList.Electric_Piston_ZPM.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 }, - new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, - new Object[] { OrePrefixes.circuit.get(Materials.Elite), 8 }, - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 6)) - .itemOutputs(ItemList.Robot_Arm_ZPM.get(1)) - .fluidInputs(new FluidStack(solderIndalloy, 1152), Materials.Lubricant.getFluid(750)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_LuV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Robot_Arm_LuV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.NaquadahAlloy, 1), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 3), + ItemList.Electric_Motor_ZPM.get(2), + ItemList.Electric_Piston_ZPM.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.Elite), 8 }, + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 6)) + .itemOutputs(ItemList.Robot_Arm_ZPM.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 1152), Materials.Lubricant.getFluid(750)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_LuV) + .addTo(AssemblyLine); // UV Robot Arm - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Robot_Arm_ZPM.get(1)) - .metadata(RESEARCH_TIME, 4 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 4), - GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 3), - ItemList.Electric_Motor_UV.get(2), - ItemList.Electric_Piston_UV.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, - new Object[] { OrePrefixes.circuit.get(Materials.Master), 8 }, - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 6)) - .itemOutputs(ItemList.Robot_Arm_UV.get(1)) - .fluidInputs( - Materials.Naquadria.getMolten(1296), - new FluidStack(solderIndalloy, 2304), - Materials.Lubricant.getFluid(2000)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_ZPM).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Robot_Arm_ZPM.get(1)) + .metadata(RESEARCH_TIME, 4 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 4), + GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Neutronium, 1), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 3), + ItemList.Electric_Motor_UV.get(2), + ItemList.Electric_Piston_UV.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.Master), 8 }, + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 6)) + .itemOutputs(ItemList.Robot_Arm_UV.get(1)) + .fluidInputs( + Materials.Naquadria.getMolten(1296), + new FluidStack(solderIndalloy, 2304), + Materials.Lubricant.getFluid(2000)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); } // Emitters { // LuV Emitter - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Emitter_IV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1), - ItemList.Electric_Motor_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.stick, LuVMat, 8), - ItemList.QuantumStar.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 7)) - .itemOutputs(ItemList.Emitter_LuV.get(1)).fluidInputs(new FluidStack(solderIndalloy, 576)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_IV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Emitter_IV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1), + ItemList.Electric_Motor_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.stick, LuVMat, 8), + ItemList.QuantumStar.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 7)) + .itemOutputs(ItemList.Emitter_LuV.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 576)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_IV) + .addTo(AssemblyLine); // ZPM Emitter - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Emitter_LuV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), - ItemList.Electric_Motor_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 8), - ItemList.QuantumStar.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7)) - .itemOutputs(ItemList.Emitter_ZPM.get(1)).fluidInputs(new FluidStack(solderIndalloy, 1152)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_LuV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Emitter_LuV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), + ItemList.Electric_Motor_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 8), + ItemList.QuantumStar.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7)) + .itemOutputs(ItemList.Emitter_ZPM.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 1152)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_LuV) + .addTo(AssemblyLine); // UV Emitter - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Emitter_ZPM.get(1)) - .metadata(RESEARCH_TIME, 4 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1), - ItemList.Electric_Motor_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 8), - ItemList.Gravistar.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 }, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 7)) - .itemOutputs(ItemList.Emitter_UV.get(1)) - .fluidInputs(Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_ZPM).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Emitter_ZPM.get(1)) + .metadata(RESEARCH_TIME, 4 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1), + ItemList.Electric_Motor_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 8), + ItemList.Gravistar.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 7)) + .itemOutputs(ItemList.Emitter_UV.get(1)) + .fluidInputs(Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); } // Sensors { // LuV Sensor - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Sensor_IV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1), - ItemList.Electric_Motor_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, LuVMat, 8), - ItemList.QuantumStar.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 7)) - .itemOutputs(ItemList.Sensor_LuV.get(1)).fluidInputs(new FluidStack(solderIndalloy, 576)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_IV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Sensor_IV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1), + ItemList.Electric_Motor_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, LuVMat, 8), + ItemList.QuantumStar.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 7)) + .itemOutputs(ItemList.Sensor_LuV.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 576)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_IV) + .addTo(AssemblyLine); // ZPM Sensor - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Sensor_LuV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), - ItemList.Electric_Motor_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 8), - ItemList.QuantumStar.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7)) - .itemOutputs(ItemList.Sensor_ZPM.get(1)).fluidInputs(new FluidStack(solderIndalloy, 1152)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_LuV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Sensor_LuV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), + ItemList.Electric_Motor_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 8), + ItemList.QuantumStar.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 7)) + .itemOutputs(ItemList.Sensor_ZPM.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 1152)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_LuV) + .addTo(AssemblyLine); // UV Sensor - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Sensor_ZPM.get(1)) - .metadata(RESEARCH_TIME, 4 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1), - ItemList.Electric_Motor_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), - ItemList.Gravistar.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 }, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 7)) - .itemOutputs(ItemList.Sensor_UV.get(1)) - .fluidInputs(Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_ZPM).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Sensor_ZPM.get(1)) + .metadata(RESEARCH_TIME, 4 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1), + ItemList.Electric_Motor_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), + ItemList.Gravistar.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 }, + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 7)) + .itemOutputs(ItemList.Sensor_UV.get(1)) + .fluidInputs(Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); } // Field Generators { // LuV Field Generator - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Field_Generator_IV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6), - ItemList.QuantumStar.get(2), - ItemList.Emitter_LuV.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, - GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 8)) - .itemOutputs(ItemList.Field_Generator_LuV.get(1)).fluidInputs(new FluidStack(solderIndalloy, 576)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_IV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Field_Generator_IV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6), + ItemList.QuantumStar.get(2), + ItemList.Emitter_LuV.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 8)) + .itemOutputs(ItemList.Field_Generator_LuV.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 576)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_IV) + .addTo(AssemblyLine); // ZPM Field Generator - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Field_Generator_LuV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 6), - ItemList.QuantumStar.get(2), - ItemList.Emitter_ZPM.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 }, - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8)) - .itemOutputs(ItemList.Field_Generator_ZPM.get(1)).fluidInputs(new FluidStack(solderIndalloy, 1152)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_LuV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Field_Generator_LuV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 6), + ItemList.QuantumStar.get(2), + ItemList.Emitter_ZPM.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 }, + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8)) + .itemOutputs(ItemList.Field_Generator_ZPM.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 1152)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_LuV) + .addTo(AssemblyLine); // UV Field Generator - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Field_Generator_ZPM.get(1)) - .metadata(RESEARCH_TIME, 4 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6), - ItemList.Gravistar.get(2), - ItemList.Emitter_UV.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4 }, - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8)) - .itemOutputs(ItemList.Field_Generator_UV.get(1)) - .fluidInputs(Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_ZPM).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Field_Generator_ZPM.get(1)) + .metadata(RESEARCH_TIME, 4 * HOURS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6), + ItemList.Gravistar.get(2), + ItemList.Emitter_UV.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4 }, + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8)) + .itemOutputs(ItemList.Field_Generator_UV.get(1)) + .fluidInputs(Materials.Naquadria.getMolten(1296), new FluidStack(solderIndalloy, 2304)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); } // Energy Hatches { // LuV Energy Hatch - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Hatch_Energy_IV.get(1)) - .metadata(RESEARCH_TIME, 60 * MINUTES) - .itemInputs( - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 2), - ItemList.Circuit_Chip_UHPIC.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, - ItemList.LuV_Coil.get(2), - new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1), - ItemList.Reactor_Coolant_NaK_3.get(1), ItemList.Reactor_Coolant_Sp_1.get(1) }, - new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1), - ItemList.Reactor_Coolant_NaK_3.get(1), ItemList.Reactor_Coolant_Sp_1.get(1) }, - ItemList.Electric_Pump_LuV.get(1)) - .itemOutputs(ItemList.Hatch_Energy_LuV.get(1)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - new FluidStack(solderIndalloy, 720)) - .noFluidOutputs().duration(20 * SECONDS).eut((int) TierEU.RECIPE_LuV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Hatch_Energy_IV.get(1)) + .metadata(RESEARCH_TIME, 60 * MINUTES) + .itemInputs( + ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 2), + ItemList.Circuit_Chip_UHPIC.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, + ItemList.LuV_Coil.get(2), + new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1), + ItemList.Reactor_Coolant_NaK_3.get(1), ItemList.Reactor_Coolant_Sp_1.get(1) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1), + ItemList.Reactor_Coolant_NaK_3.get(1), ItemList.Reactor_Coolant_Sp_1.get(1) }, + ItemList.Electric_Pump_LuV.get(1)) + .itemOutputs(ItemList.Hatch_Energy_LuV.get(1)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), + new FluidStack(solderIndalloy, 720)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut((int) TierEU.RECIPE_LuV) + .addTo(AssemblyLine); // ZPM Energy Hatch - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Hatch_Energy_LuV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 2), - ItemList.Circuit_Chip_NPIC.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 }, - ItemList.ZPM_Coil.get(2), - new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), - ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, - new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), - ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, - ItemList.Electric_Pump_ZPM.get(1)) - .itemOutputs(ItemList.Hatch_Energy_ZPM.get(1)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), - new FluidStack(solderIndalloy, 1440)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_ZPM).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Hatch_Energy_LuV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 2), + ItemList.Circuit_Chip_NPIC.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 }, + ItemList.ZPM_Coil.get(2), + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), + ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), + ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, + ItemList.Electric_Pump_ZPM.get(1)) + .itemOutputs(ItemList.Hatch_Energy_ZPM.get(1)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), + new FluidStack(solderIndalloy, 1440)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); // UV Energy Hatch - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Hatch_Energy_ZPM.get(1)) - .metadata(RESEARCH_TIME, 4 * HOURS) - .itemInputs( - ItemList.Hull_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 2), - ItemList.Circuit_Chip_PPIC.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2 }, - ItemList.UV_Coil.get(2), - new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), - ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, - new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), - ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, - new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), - ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, - new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), - ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, - ItemList.Electric_Pump_UV.get(1)) - .itemOutputs(ItemList.Hatch_Energy_UV.get(1)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 8000), - new FluidStack(solderIndalloy, 2880)) - .noFluidOutputs().duration(40 * SECONDS).eut((int) TierEU.RECIPE_UV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Hatch_Energy_ZPM.get(1)) + .metadata(RESEARCH_TIME, 4 * HOURS) + .itemInputs( + ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 2), + ItemList.Circuit_Chip_PPIC.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2 }, + ItemList.UV_Coil.get(2), + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), + ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), + ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), + ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), + ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, + ItemList.Electric_Pump_UV.get(1)) + .itemOutputs(ItemList.Hatch_Energy_UV.get(1)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 8000), + new FluidStack(solderIndalloy, 2880)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut((int) TierEU.RECIPE_UV) + .addTo(AssemblyLine); } // Dynamo Hatches { // LuV Dynamo Hatch - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Hatch_Dynamo_IV.get(1)) - .metadata(RESEARCH_TIME, 60 * MINUTES) - .itemInputs( - ItemList.Hull_LuV.get(1), - GT_OreDictUnificator.get( - OrePrefixes.spring, - Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, - 2), - ItemList.Circuit_Chip_UHPIC.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, - ItemList.LuV_Coil.get(2), - new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1), - ItemList.Reactor_Coolant_NaK_3.get(1), ItemList.Reactor_Coolant_Sp_1.get(1) }, - new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1), - ItemList.Reactor_Coolant_NaK_3.get(1), ItemList.Reactor_Coolant_Sp_1.get(1) }, - ItemList.Electric_Pump_LuV.get(1)) - .itemOutputs(ItemList.Hatch_Dynamo_LuV.get(1)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), - new FluidStack(solderIndalloy, 720)) - .noFluidOutputs().duration(20 * SECONDS).eut((int) TierEU.RECIPE_LuV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Hatch_Dynamo_IV.get(1)) + .metadata(RESEARCH_TIME, 60 * MINUTES) + .itemInputs( + ItemList.Hull_LuV.get(1), + GT_OreDictUnificator.get( + OrePrefixes.spring, + Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, + 2), + ItemList.Circuit_Chip_UHPIC.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, + ItemList.LuV_Coil.get(2), + new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1), + ItemList.Reactor_Coolant_NaK_3.get(1), ItemList.Reactor_Coolant_Sp_1.get(1) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1), + ItemList.Reactor_Coolant_NaK_3.get(1), ItemList.Reactor_Coolant_Sp_1.get(1) }, + ItemList.Electric_Pump_LuV.get(1)) + .itemOutputs(ItemList.Hatch_Dynamo_LuV.get(1)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), + new FluidStack(solderIndalloy, 720)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut((int) TierEU.RECIPE_LuV) + .addTo(AssemblyLine); // ZPM Dynamo Hatch - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Hatch_Dynamo_LuV.get(1)) - .metadata(RESEARCH_TIME, 2 * HOURS) - .itemInputs( - ItemList.Hull_ZPM.get(1), - GT_OreDictUnificator - .get(OrePrefixes.spring, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 4), - ItemList.Circuit_Chip_NPIC.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 }, - ItemList.ZPM_Coil.get(2), - new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), - ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, - new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), - ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, - ItemList.Electric_Pump_ZPM.get(1)) - .itemOutputs(ItemList.Hatch_Dynamo_ZPM.get(1)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), - new FluidStack(solderIndalloy, 1440)) - .noFluidOutputs().duration(30 * SECONDS).eut((int) TierEU.RECIPE_ZPM).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Hatch_Dynamo_LuV.get(1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + ItemList.Hull_ZPM.get(1), + GT_OreDictUnificator.get( + OrePrefixes.spring, + Materials.Tetranaquadahdiindiumhexaplatiumosminid, + 4), + ItemList.Circuit_Chip_NPIC.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 }, + ItemList.ZPM_Coil.get(2), + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), + ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), + ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, + ItemList.Electric_Pump_ZPM.get(1)) + .itemOutputs(ItemList.Hatch_Dynamo_ZPM.get(1)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 4000), + new FluidStack(solderIndalloy, 1440)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); // UV Dynamo Hatch - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Hatch_Dynamo_ZPM.get(1)) - .metadata(RESEARCH_TIME, 4 * HOURS) - .itemInputs( - ItemList.Hull_UV.get(1), - GT_OreDictUnificator - .get(OrePrefixes.spring, Materials.Longasssuperconductornameforuvwire, 4), - ItemList.Circuit_Chip_PPIC.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2 }, - ItemList.UV_Coil.get(2), - new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), - ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, - new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), - ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, - new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), - ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, - new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), - ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, - ItemList.Electric_Pump_UV.get(1)) - .itemOutputs(ItemList.Hatch_Dynamo_UV.get(1)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 8000), - new FluidStack(solderIndalloy, 2880)) - .noFluidOutputs().duration(40 * SECONDS).eut((int) TierEU.RECIPE_UV).addTo(AssemblyLine); + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Hatch_Dynamo_ZPM.get(1)) + .metadata(RESEARCH_TIME, 4 * HOURS) + .itemInputs( + ItemList.Hull_UV.get(1), + GT_OreDictUnificator.get( + OrePrefixes.spring, + Materials.Longasssuperconductornameforuvwire, + 4), + ItemList.Circuit_Chip_PPIC.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2 }, + ItemList.UV_Coil.get(2), + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), + ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), + ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), + ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, + new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), + ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, + ItemList.Electric_Pump_UV.get(1)) + .itemOutputs(ItemList.Hatch_Dynamo_UV.get(1)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 8000), + new FluidStack(solderIndalloy, 2880)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut((int) TierEU.RECIPE_UV) + .addTo(AssemblyLine); } // Fusion Controller { // mkI GT_Values.RA.stdBuilder() - .metadata( - RESEARCH_ITEM, - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 1)) - .metadata(RESEARCH_TIME, 2 * HOURS) + .metadata( + RESEARCH_ITEM, + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 1)) + .metadata(RESEARCH_TIME, 2 * HOURS) + .itemInputs( + ItemList.Casing_Fusion_Coil.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 4), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 4), + ItemList.Field_Generator_LuV.get(2), + ItemList.Circuit_Wafer_UHPIC.get(32), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 32)) + .itemOutputs(ItemList.FusionComputer_LuV.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 2880), Materials.VanadiumGallium.getMolten(1152)) + .noFluidOutputs() + .duration(50 * SECONDS) + .eut((int) TierEU.RECIPE_LuV) + .addTo(AssemblyLine); + + // mkII + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, GT_OreDictUnificator.get(OrePrefixes.block, Materials.Europium, 1)) + .metadata(RESEARCH_TIME, 4 * HOURS) + .itemInputs( + ItemList.Casing_Fusion_Coil.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 4), + ItemList.Field_Generator_ZPM.get(2), + ItemList.Circuit_Wafer_PPIC.get(48), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 32)) + .itemOutputs(ItemList.FusionComputer_ZPMV.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 2880), Materials.NiobiumTitanium.getMolten(1152)) + .noFluidOutputs() + .duration(50 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(AssemblyLine); + + // mkIII + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, GT_OreDictUnificator.get(OrePrefixes.block, Materials.Americium, 1)) + .metadata(RESEARCH_TIME, 6 * HOURS) + .itemInputs( + ItemList.Casing_Fusion_Coil.get(1), + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 4), + ItemList.Field_Generator_UV.get(2), + ItemList.Circuit_Wafer_QPIC.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 32)) + .itemOutputs(ItemList.FusionComputer_UV.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 2880), Materials.ElectrumFlux.getMolten(1152)) + .noFluidOutputs() + .duration(50 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); + } + // Energy Module + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Energy_LapotronicOrb2.get(1)) + .metadata(RESEARCH_TIME, 4 * HOURS) .itemInputs( - ItemList.Casing_Fusion_Coil.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16), new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 4), + ItemList.Energy_LapotronicOrb2.get(8), ItemList.Field_Generator_LuV.get(2), - ItemList.Circuit_Wafer_UHPIC.get(32), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 32)) - .itemOutputs(ItemList.FusionComputer_LuV.get(1)) - .fluidInputs(new FluidStack(solderIndalloy, 2880), Materials.VanadiumGallium.getMolten(1152)) - .noFluidOutputs().duration(50 * SECONDS).eut((int) TierEU.RECIPE_LuV).addTo(AssemblyLine); + ItemList.Circuit_Wafer_SoC2.get(64), + ItemList.Circuit_Wafer_SoC2.get(64), + ItemList.Circuit_Parts_DiodeASMD.get(8), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32)) + .itemOutputs(ItemList.Energy_Module.get(1)) + .fluidInputs( + new FluidStack(solderIndalloy, 2880), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)) + .noFluidOutputs() + .duration(1 * MINUTES + 40 * SECONDS) + .eut((int) TierEU.RECIPE_ZPM) + .addTo(AssemblyLine); - // mkII - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, GT_OreDictUnificator.get(OrePrefixes.block, Materials.Europium, 1)) + // Energy Cluster + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Energy_Module.get(1)) .metadata(RESEARCH_TIME, 4 * HOURS) .itemInputs( - ItemList.Casing_Fusion_Coil.get(1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 32), new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 4), + ItemList.Energy_Module.get(8), ItemList.Field_Generator_ZPM.get(2), - ItemList.Circuit_Wafer_PPIC.get(48), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 32)) - .itemOutputs(ItemList.FusionComputer_ZPMV.get(1)) - .fluidInputs(new FluidStack(solderIndalloy, 2880), Materials.NiobiumTitanium.getMolten(1152)) - .noFluidOutputs().duration(50 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(AssemblyLine); + ItemList.Circuit_Wafer_HPIC.get(64), + ItemList.Circuit_Wafer_HPIC.get(64), + ItemList.Circuit_Parts_DiodeASMD.get(16), + GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32)) + .itemOutputs(ItemList.Energy_Cluster.get(1)) + .fluidInputs( + new FluidStack(solderIndalloy, 2880), + new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)) + .noFluidOutputs() + .duration(1 * MINUTES + 40 * SECONDS) + .eut(200000) + .addTo(AssemblyLine); - // mkIII - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, GT_OreDictUnificator.get(OrePrefixes.block, Materials.Americium, 1)) + // Integrated Ore Factory + GT_Values.RA.stdBuilder() + .metadata(RESEARCH_ITEM, ItemList.Machine_IV_OreWasher.get(1)) .metadata(RESEARCH_TIME, 6 * HOURS) .itemInputs( - ItemList.Casing_Fusion_Coil.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 4), - ItemList.Field_Generator_UV.get(2), - ItemList.Circuit_Wafer_QPIC.get(64), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 32)) - .itemOutputs(ItemList.FusionComputer_UV.get(1)) - .fluidInputs(new FluidStack(solderIndalloy, 2880), Materials.ElectrumFlux.getMolten(1152)) - .noFluidOutputs().duration(50 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(AssemblyLine); - } - // Energy Module - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Energy_LapotronicOrb2.get(1)) - .metadata(RESEARCH_TIME, 4 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - ItemList.Energy_LapotronicOrb2.get(8), - ItemList.Field_Generator_LuV.get(2), - ItemList.Circuit_Wafer_SoC2.get(64), - ItemList.Circuit_Wafer_SoC2.get(64), - ItemList.Circuit_Parts_DiodeASMD.get(8), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 32)) - .itemOutputs(ItemList.Energy_Module.get(1)) - .fluidInputs( - new FluidStack(solderIndalloy, 2880), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)) - .noFluidOutputs().duration(1 * MINUTES + 40 * SECONDS).eut((int) TierEU.RECIPE_ZPM).addTo(AssemblyLine); - - // Energy Cluster - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Energy_Module.get(1)) - .metadata(RESEARCH_TIME, 4 * HOURS) - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 32), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - ItemList.Energy_Module.get(8), - ItemList.Field_Generator_ZPM.get(2), - ItemList.Circuit_Wafer_HPIC.get(64), - ItemList.Circuit_Wafer_HPIC.get(64), - ItemList.Circuit_Parts_DiodeASMD.get(16), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 32)) - .itemOutputs(ItemList.Energy_Cluster.get(1)) - .fluidInputs( - new FluidStack(solderIndalloy, 2880), - new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000)) - .noFluidOutputs().duration(1 * MINUTES + 40 * SECONDS).eut(200000).addTo(AssemblyLine); - - // Integrated Ore Factory - GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Machine_IV_OreWasher.get(1)) - .metadata(RESEARCH_TIME, 6 * HOURS) - .itemInputs( - ItemList.Hull_MAX.get(1), - ItemList.Electric_Motor_UHV.get(32), - ItemList.Electric_Piston_UHV.get(8), - ItemList.Electric_Pump_UHV.get(16), - ItemList.Conveyor_Module_UHV.get(8), - ItemList.Robot_Arm_UHV.get(8), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4 }, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Duranium, 32), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 32) }, - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 64), - new ItemStack[] { ItemList.Component_Grinder_Tungsten.get(64), - ItemList.Component_Grinder_Diamond.get(64) }, - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 32), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Chrome, 16)) - .itemOutputs(ItemList.Ore_Processor.get(1)) - .fluidInputs(new FluidStack(solderIndalloy, 2880), Materials.Naquadria.getMolten(1440)).noFluidOutputs() - .duration(60 * SECONDS).eut(TierEU.RECIPE_UV).addTo(AssemblyLine); + ItemList.Hull_MAX.get(1), + ItemList.Electric_Motor_UHV.get(32), + ItemList.Electric_Piston_UHV.get(8), + ItemList.Electric_Pump_UHV.get(16), + ItemList.Conveyor_Module_UHV.get(8), + ItemList.Robot_Arm_UHV.get(8), + new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4 }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Duranium, 32), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 32) }, + GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 64), + new ItemStack[] { ItemList.Component_Grinder_Tungsten.get(64), + ItemList.Component_Grinder_Diamond.get(64) }, + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 32), + GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Chrome, 16)) + .itemOutputs(ItemList.Ore_Processor.get(1)) + .fluidInputs(new FluidStack(solderIndalloy, 2880), Materials.Naquadria.getMolten(1440)) + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_UV) + .addTo(AssemblyLine); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java index 99268da1bf..0a9bbe203a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java @@ -14,125 +14,238 @@ public class AutoclaveRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Energium_Dust.get(9L)) - .itemOutputs(ItemList.IC2_EnergyCrystal.get(1L)).outputChances(10000) - .fluidInputs(Materials.EnergeticAlloy.getMolten(288)).noFluidOutputs().duration(30 * SECONDS).eut(256) - .addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Energium_Dust.get(9L)) - .itemOutputs(ItemList.IC2_EnergyCrystal.get(1L)).outputChances(10000) - .fluidInputs(Materials.ConductiveIron.getMolten(576)).noFluidOutputs().duration(60 * SECONDS).eut(256) - .addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 0)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10)) - .outputChances(8000).fluidInputs(Materials.Water.getFluid(200L)).noFluidOutputs() - .duration(1 * MINUTES + 40 * SECONDS).eut(24).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 600)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 11)) - .outputChances(8000).fluidInputs(Materials.Water.getFluid(200L)).noFluidOutputs() - .duration(1 * MINUTES + 40 * SECONDS).eut(24).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 1200)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 12)) - .outputChances(8000).fluidInputs(Materials.Water.getFluid(200L)).noFluidOutputs() - .duration(1 * MINUTES + 40 * SECONDS).eut(24).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 0)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10)) - .outputChances(9000).fluidInputs(GT_ModHandler.getDistilledWater(100L)).noFluidOutputs() - .duration(50 * SECONDS).eut(24).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 600)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 11)) - .outputChances(9000).fluidInputs(GT_ModHandler.getDistilledWater(100L)).noFluidOutputs() - .duration(50 * SECONDS).eut(24).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 1200)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 12)) - .outputChances(9000).fluidInputs(GT_ModHandler.getDistilledWater(100L)).noFluidOutputs() - .duration(50 * SECONDS).eut(24).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 0)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10)) - .outputChances(10000).fluidInputs(Materials.Void.getMolten(36L)).noFluidOutputs().duration(25 * SECONDS) - .eut(24).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 600)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 11)) - .outputChances(10000).fluidInputs(Materials.Void.getMolten(36L)).noFluidOutputs().duration(25 * SECONDS) - .eut(24).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 1200)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 12)) - .outputChances(10000).fluidInputs(Materials.Void.getMolten(36L)).noFluidOutputs().duration(25 * SECONDS) - .eut(24).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 32)) - .itemOutputs(GT_ModHandler.getIC2Item("carbonFiber", 64L)).outputChances(10000) - .fluidInputs(Materials.Polybenzimidazole.getMolten(36L)).noFluidOutputs() - .duration(7 * SECONDS + 10 * TICKS).eut((int) TierEU.RECIPE_EV).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64)) - .itemOutputs(GT_ModHandler.getIC2Item("carbonFiber", 64L)).outputChances(10000) - .fluidInputs(Materials.Epoxid.getMolten(144L)).noFluidOutputs().duration(15 * SECONDS) - .eut((int) TierEU.RECIPE_HV).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64)) - .itemOutputs(GT_ModHandler.getIC2Item("carbonFiber", 32L)).outputChances(10000) - .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288L)).noFluidOutputs().duration(20 * SECONDS) - .eut((int) TierEU.RECIPE_MV).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64)) - .itemOutputs(GT_ModHandler.getIC2Item("carbonFiber", 16L)).outputChances(10000) - .fluidInputs(Materials.Plastic.getMolten(576L)).noFluidOutputs().duration(30 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1)).outputChances(3333) - .fluidInputs(Materials.UUMatter.getFluid(576L)).noFluidOutputs().duration(60 * MINUTES) - .eut((int) TierEU.RECIPE_HV).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(ItemList.QuantumStar.get(1L))) - .itemOutputs(ItemList.Gravistar.get(1L)).outputChances(10000) - .fluidInputs(Materials.Neutronium.getMolten(288)).noFluidOutputs().duration(24 * SECONDS) - .eut((int) TierEU.RECIPE_IV).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(ItemList.Gravistar.get(16L))) - .itemOutputs(ItemList.NuclearStar.get(1L)).outputChances(10000) - .fluidInputs(Materials.Infinity.getMolten(288)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_UEV).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SiliconDioxide.getDust(1)) - .itemOutputs(Materials.Quartzite.getGems(1)).outputChances(750) - .fluidInputs(Materials.Water.getFluid(200L)).noFluidOutputs().duration(1 * MINUTES + 40 * SECONDS) - .eut(24).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SiliconDioxide.getDust(1)) - .itemOutputs(Materials.Quartzite.getGems(1)).outputChances(1000) - .fluidInputs(GT_ModHandler.getDistilledWater(100L)).noFluidOutputs() - .duration(1 * MINUTES + 15 * SECONDS).eut(24).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SiliconDioxide.getDust(1)) - .itemOutputs(Materials.Quartzite.getGems(1)).outputChances(10000) - .fluidInputs(Materials.Void.getMolten(36L)).noFluidOutputs().duration(50 * SECONDS).eut(24) - .addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3)) - .outputChances(7500).fluidInputs(Materials.Water.getFluid(1000L)).noFluidOutputs() - .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAutoclaveRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3)) - .outputChances(9000).fluidInputs(GT_ModHandler.getDistilledWater(1000L)).noFluidOutputs() - .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAutoclaveRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Energium_Dust.get(9L)) + .itemOutputs(ItemList.IC2_EnergyCrystal.get(1L)) + .outputChances(10000) + .fluidInputs(Materials.EnergeticAlloy.getMolten(288)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(256) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Energium_Dust.get(9L)) + .itemOutputs(ItemList.IC2_EnergyCrystal.get(1L)) + .outputChances(10000) + .fluidInputs(Materials.ConductiveIron.getMolten(576)) + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(256) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 0)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10)) + .outputChances(8000) + .fluidInputs(Materials.Water.getFluid(200L)) + .noFluidOutputs() + .duration(1 * MINUTES + 40 * SECONDS) + .eut(24) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 600)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 11)) + .outputChances(8000) + .fluidInputs(Materials.Water.getFluid(200L)) + .noFluidOutputs() + .duration(1 * MINUTES + 40 * SECONDS) + .eut(24) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 1200)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 12)) + .outputChances(8000) + .fluidInputs(Materials.Water.getFluid(200L)) + .noFluidOutputs() + .duration(1 * MINUTES + 40 * SECONDS) + .eut(24) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 0)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10)) + .outputChances(9000) + .fluidInputs(GT_ModHandler.getDistilledWater(100L)) + .noFluidOutputs() + .duration(50 * SECONDS) + .eut(24) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 600)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 11)) + .outputChances(9000) + .fluidInputs(GT_ModHandler.getDistilledWater(100L)) + .noFluidOutputs() + .duration(50 * SECONDS) + .eut(24) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 1200)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 12)) + .outputChances(9000) + .fluidInputs(GT_ModHandler.getDistilledWater(100L)) + .noFluidOutputs() + .duration(50 * SECONDS) + .eut(24) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 0)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10)) + .outputChances(10000) + .fluidInputs(Materials.Void.getMolten(36L)) + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(24) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 600)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 11)) + .outputChances(10000) + .fluidInputs(Materials.Void.getMolten(36L)) + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(24) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemCrystalSeed", 1L, 1200)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 12)) + .outputChances(10000) + .fluidInputs(Materials.Void.getMolten(36L)) + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(24) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 32)) + .itemOutputs(GT_ModHandler.getIC2Item("carbonFiber", 64L)) + .outputChances(10000) + .fluidInputs(Materials.Polybenzimidazole.getMolten(36L)) + .noFluidOutputs() + .duration(7 * SECONDS + 10 * TICKS) + .eut((int) TierEU.RECIPE_EV) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64)) + .itemOutputs(GT_ModHandler.getIC2Item("carbonFiber", 64L)) + .outputChances(10000) + .fluidInputs(Materials.Epoxid.getMolten(144L)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut((int) TierEU.RECIPE_HV) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64)) + .itemOutputs(GT_ModHandler.getIC2Item("carbonFiber", 32L)) + .outputChances(10000) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(288L)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64)) + .itemOutputs(GT_ModHandler.getIC2Item("carbonFiber", 16L)) + .outputChances(10000) + .fluidInputs(Materials.Plastic.getMolten(576L)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1)) + .outputChances(3333) + .fluidInputs(Materials.UUMatter.getFluid(576L)) + .noFluidOutputs() + .duration(60 * MINUTES) + .eut((int) TierEU.RECIPE_HV) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(ItemList.QuantumStar.get(1L))) + .itemOutputs(ItemList.Gravistar.get(1L)) + .outputChances(10000) + .fluidInputs(Materials.Neutronium.getMolten(288)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut((int) TierEU.RECIPE_IV) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(ItemList.Gravistar.get(16L))) + .itemOutputs(ItemList.NuclearStar.get(1L)) + .outputChances(10000) + .fluidInputs(Materials.Infinity.getMolten(288)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_UEV) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SiliconDioxide.getDust(1)) + .itemOutputs(Materials.Quartzite.getGems(1)) + .outputChances(750) + .fluidInputs(Materials.Water.getFluid(200L)) + .noFluidOutputs() + .duration(1 * MINUTES + 40 * SECONDS) + .eut(24) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SiliconDioxide.getDust(1)) + .itemOutputs(Materials.Quartzite.getGems(1)) + .outputChances(1000) + .fluidInputs(GT_ModHandler.getDistilledWater(100L)) + .noFluidOutputs() + .duration(1 * MINUTES + 15 * SECONDS) + .eut(24) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SiliconDioxide.getDust(1)) + .itemOutputs(Materials.Quartzite.getGems(1)) + .outputChances(10000) + .fluidInputs(Materials.Void.getMolten(36L)) + .noFluidOutputs() + .duration(50 * SECONDS) + .eut(24) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3)) + .outputChances(7500) + .fluidInputs(Materials.Water.getFluid(1000L)) + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3)) + .outputChances(9000) + .fluidInputs(GT_ModHandler.getDistilledWater(1000L)) + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAutoclaveRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java index 6ee45ad7a2..eed056c59c 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java @@ -17,219 +17,362 @@ public class BenderRecipes implements Runnable { @Override public void run() { GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Aluminium, 20L), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(ItemList.RC_Rail_Standard.get(64L)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Aluminium, 20L), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 48L), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(ItemList.RC_Rail_Standard.get(64L)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 48L), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 32L), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(ItemList.RC_Rail_Standard.get(64L)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 32L), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Bronze, 32L), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(ItemList.RC_Rail_Standard.get(64L)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Bronze, 32L), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 24L), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(ItemList.RC_Rail_Standard.get(64L)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 24L), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 16L), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(ItemList.RC_Rail_Standard.get(64L)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 16L), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 12L), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(ItemList.RC_Rail_Standard.get(64L)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 12L), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 9L), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(ItemList.RC_Rail_Standard.get(64L)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 9L), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 6L), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(ItemList.RC_Rail_Standard.get(64L)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 6L), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 3L), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(ItemList.RC_Rail_Standard.get(64L)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 3L), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 2L), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs(ItemList.RC_Rail_Standard.get(64L)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 2L), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs(ItemList.RC_Rail_Standard.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Obsidian, 24L), - GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Obsidian, 24L), + GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 12L), - GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 12L), + GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 6L), - GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 6L), + GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 3L), - GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 3L), + GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 1L), - GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 1L), + GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(ItemList.RC_Rail_Reinforced.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Aluminium, 20L), - GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(ItemList.RC_Rebar.get(64L)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(200).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Aluminium, 20L), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(ItemList.RC_Rebar.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(200) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 48L), - GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(ItemList.RC_Rebar.get(64L)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(200).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 48L), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(ItemList.RC_Rebar.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(200) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 24L), - GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(ItemList.RC_Rebar.get(64L)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(200).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 24L), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(ItemList.RC_Rebar.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(200) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Bronze, 32L), - GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(ItemList.RC_Rebar.get(64L)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(200).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Bronze, 32L), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(ItemList.RC_Rebar.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(200) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 16L), - GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(ItemList.RC_Rebar.get(64L)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(200).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 16L), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(ItemList.RC_Rebar.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(200) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 12L), - GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(ItemList.RC_Rebar.get(64L)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(200).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 12L), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(ItemList.RC_Rebar.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(200) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 8), - GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(ItemList.RC_Rebar.get(64L)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(200).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 8), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(ItemList.RC_Rebar.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(200) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 6L), - GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(ItemList.RC_Rebar.get(64L)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(200).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 6L), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(ItemList.RC_Rebar.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(200) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 4L), - GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(ItemList.RC_Rebar.get(64L)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(200).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 4L), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(ItemList.RC_Rebar.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(200) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 2L), - GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(ItemList.RC_Rebar.get(64L)).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(200).addTo(sBenderRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 2L), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(ItemList.RC_Rebar.get(64L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(200) + .addTo(sBenderRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Mixed_Metal_Ingot.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Advanced, 1L)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(sBenderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Mixed_Metal_Ingot.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Advanced, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sBenderRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 12L)) - .itemOutputs(ItemList.Cell_Empty.get(6L)).noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(8) - .addTo(sBenderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 12L)) + .itemOutputs(ItemList.Cell_Empty.get(6L)) + .noFluidInputs() + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(8) + .addTo(sBenderRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 12L)) - .itemOutputs(ItemList.Cell_Empty.get(12L)).noFluidInputs().noFluidOutputs().duration(60 * SECONDS) - .eut(8).addTo(sBenderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 12L)) + .itemOutputs(ItemList.Cell_Empty.get(12L)) + .noFluidInputs() + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(8) + .addTo(sBenderRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 12L)) - .itemOutputs(ItemList.Cell_Empty.get(48L)).noFluidInputs().noFluidOutputs().duration(60 * SECONDS) - .eut(8).addTo(sBenderRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 12L)) + .itemOutputs(ItemList.Cell_Empty.get(48L)) + .noFluidInputs() + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(8) + .addTo(sBenderRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 12L)) - .itemOutputs(new ItemStack(Items.bucket, 4, 0)).noFluidInputs().noFluidOutputs().duration(40 * SECONDS) - .eut(4).addTo(sBenderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 12L)) + .itemOutputs(new ItemStack(Items.bucket, 4, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(4) + .addTo(sBenderRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 12L)) - .itemOutputs(new ItemStack(Items.bucket, 4, 0)).noFluidInputs().noFluidOutputs().duration(40 * SECONDS) - .eut(4).addTo(sBenderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 12L)) + .itemOutputs(new ItemStack(Items.bucket, 4, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(4) + .addTo(sBenderRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Iron, 2L)) - .itemOutputs(GT_ModHandler.getIC2Item("fuelRod", 1L)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(8).addTo(sBenderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Iron, 2L)) + .itemOutputs(GT_ModHandler.getIC2Item("fuelRod", 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sBenderRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L)) - .itemOutputs(ItemList.IC2_Food_Can_Empty.get(1L)).noFluidInputs().noFluidOutputs().duration(20 * TICKS) - .eut((int) TierEU.RECIPE_HV).addTo(sBenderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L)) + .itemOutputs(ItemList.IC2_Food_Can_Empty.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * TICKS) + .eut((int) TierEU.RECIPE_HV) + .addTo(sBenderRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java index 906448ccc1..df7f1e6f93 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java @@ -31,305 +31,524 @@ public class BlastFurnaceRecipes implements Runnable { } public void registerBlastFurnaceRecipes() { - GT_Values.RA.stdBuilder().itemInputs(Materials.Gypsum.getDust(8)).itemOutputs(Materials.Quicklime.getDust(1)) - .noFluidInputs().fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1500)).duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_HV).metadata(COIL_HEAT, 3200).addTo(sBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Gypsum.getDust(8)) + .itemOutputs(Materials.Quicklime.getDust(1)) + .noFluidInputs() + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1500)) + .duration(10 * SECONDS) + .eut((int) TierEU.RECIPE_HV) + .metadata(COIL_HEAT, 3200) + .addTo(sBlastRecipes); // Carbothermic Reduction // Depend on real amount except real ores int outputIngotAmount = GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre ? 2 : 3; - GT_Values.RA.stdBuilder().itemInputs(Materials.RoastedCopper.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Copper.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) - .noFluidInputs().fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.RoastedAntimony.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Antimony.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) - .noFluidInputs().fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.RoastedIron.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS).eut((int) TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.RoastedNickel.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Nickel.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) - .noFluidInputs().fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.RoastedZinc.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Zinc.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS).eut((int) TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.RoastedCobalt.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Cobalt.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) - .noFluidInputs().fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.RoastedArsenic.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Arsenic.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) - .noFluidInputs().fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.RoastedLead.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Lead.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS).eut((int) TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Malachite.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Copper.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) - .noFluidInputs().fluidOutputs(Materials.CarbonDioxide.getGas(3000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Magnetite.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS).eut((int) TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.YellowLimonite.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS).eut((int) TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.BrownLimonite.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS).eut((int) TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.BasalticMineralSand.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS).eut((int) TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.GraniticMineralSand.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS).eut((int) TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Cassiterite.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Tin.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS).eut((int) TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.CassiteriteSand.getDust(2), Materials.Carbon.getDust(1)) - .itemOutputs(Materials.Tin.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS).eut((int) TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SiliconDioxide.getDust(3), Materials.Carbon.getDust(2)) - .itemOutputs(Materials.Silicon.getIngots(1), Materials.Ash.getDustTiny(1)).noFluidInputs() - .fluidOutputs(Materials.CarbonMonoxide.getGas(2000)).duration(4 * SECONDS).eut((int) TierEU.RECIPE_MV) - .metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.RoastedCopper.getDust(2), Materials.Carbon.getDust(1)) + .itemOutputs(Materials.Copper.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); - if (GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) { - GT_Values.RA.stdBuilder().itemInputs(Materials.CupricOxide.getDust(2), Materials.Carbon.getDustSmall(4)) - .itemOutputs(Materials.Copper.getIngots(1), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.RoastedAntimony.getDust(2), Materials.Carbon.getDust(1)) + .itemOutputs(Materials.Antimony.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Malachite.getDust(2), Materials.Carbon.getDustSmall(4)) - .itemOutputs(Materials.Copper.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) - .noFluidInputs().fluidOutputs(Materials.CarbonDioxide.getGas(3000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.RoastedIron.getDust(2), Materials.Carbon.getDust(1)) + .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(Materials.AntimonyTrioxide.getDust(5), Materials.Carbon.getDustSmall(4)) - .itemOutputs(Materials.Antimony.getIngots(2), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(3000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.RoastedNickel.getDust(2), Materials.Carbon.getDust(1)) + .itemOutputs(Materials.Nickel.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.BandedIron.getDust(5), Materials.Carbon.getDustSmall(4)) - .itemOutputs(Materials.Iron.getIngots(2), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.RoastedZinc.getDust(2), Materials.Carbon.getDust(1)) + .itemOutputs(Materials.Zinc.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.RoastedCobalt.getDust(2), Materials.Carbon.getDust(1)) + .itemOutputs(Materials.Cobalt.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.RoastedArsenic.getDust(2), Materials.Carbon.getDust(1)) + .itemOutputs(Materials.Arsenic.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Magnetite.getDust(2), Materials.Carbon.getDustSmall(4)) + GT_Values.RA.stdBuilder() + .itemInputs(Materials.RoastedLead.getDust(2), Materials.Carbon.getDust(1)) + .itemOutputs(Materials.Lead.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Malachite.getDust(2), Materials.Carbon.getDust(1)) + .itemOutputs(Materials.Copper.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(3000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Magnetite.getDust(2), Materials.Carbon.getDust(1)) .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) - .noFluidInputs().fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.YellowLimonite.getDust(2), Materials.Carbon.getDustSmall(4)) + GT_Values.RA.stdBuilder() + .itemInputs(Materials.YellowLimonite.getDust(2), Materials.Carbon.getDust(1)) .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) - .noFluidInputs().fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.BrownLimonite.getDust(2), Materials.Carbon.getDustSmall(4)) + GT_Values.RA.stdBuilder() + .itemInputs(Materials.BrownLimonite.getDust(2), Materials.Carbon.getDust(1)) .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) - .noFluidInputs().fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(Materials.BasalticMineralSand.getDust(2), Materials.Carbon.getDustSmall(4)) + GT_Values.RA.stdBuilder() + .itemInputs(Materials.BasalticMineralSand.getDust(2), Materials.Carbon.getDust(1)) .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) - .noFluidInputs().fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(Materials.GraniticMineralSand.getDust(2), Materials.Carbon.getDustSmall(4)) + GT_Values.RA.stdBuilder() + .itemInputs(Materials.GraniticMineralSand.getDust(2), Materials.Carbon.getDust(1)) .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) - .noFluidInputs().fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Cassiterite.getDust(2), Materials.Carbon.getDustSmall(4)) + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Cassiterite.getDust(2), Materials.Carbon.getDust(1)) .itemOutputs(Materials.Tin.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) - .noFluidInputs().fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.CassiteriteSand.getDust(2), Materials.Carbon.getDustSmall(4)) + GT_Values.RA.stdBuilder() + .itemInputs(Materials.CassiteriteSand.getDust(2), Materials.Carbon.getDust(1)) .itemOutputs(Materials.Tin.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) - .noFluidInputs().fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Garnierite.getDust(2), Materials.Carbon.getDustSmall(4)) - .itemOutputs(Materials.Nickel.getIngots(1), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.CobaltOxide.getDust(2), Materials.Carbon.getDustSmall(4)) - .itemOutputs(Materials.Cobalt.getIngots(1), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.ArsenicTrioxide.getDust(5), Materials.Carbon.getDustSmall(4)) - .itemOutputs(Materials.Arsenic.getIngots(2), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Massicot.getDust(2), Materials.Carbon.getDustSmall(4)) - .itemOutputs(Materials.Lead.getIngots(1), Materials.Ash.getDustTiny(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1200).addTo(sBlastRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 32), - ItemList.GalliumArsenideCrystalSmallPart.get(1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Circuit_Silicon_Ingot.get(1)).noFluidInputs().noFluidOutputs() - .duration(7 * MINUTES + 30 * SECONDS).eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1784) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) .addTo(sBlastRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 64), - ItemList.GalliumArsenideCrystalSmallPart.get(2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 8), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Circuit_Silicon_Ingot2.get(1)).fluidInputs(Materials.Nitrogen.getGas(8000)) - .noFluidOutputs().duration(10 * MINUTES).eut((int) TierEU.RECIPE_HV).metadata(COIL_HEAT, 2484) + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SiliconDioxide.getDust(3), Materials.Carbon.getDust(2)) + .itemOutputs(Materials.Silicon.getIngots(1), Materials.Ash.getDustTiny(1)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonMonoxide.getGas(2000)) + .duration(4 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) .addTo(sBlastRecipes); + if (GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) { GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 16), - ItemList.GalliumArsenideCrystal.get(1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Circuit_Silicon_Ingot3.get(1)).fluidInputs(Materials.Argon.getGas(8000)) - .noFluidOutputs().duration(12 * MINUTES + 30 * SECONDS).eut((int) TierEU.RECIPE_EV) - .metadata(COIL_HEAT, 4484).addTo(sBlastRecipes); + .itemInputs(Materials.CupricOxide.getDust(2), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Copper.getIngots(1), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 32), - ItemList.GalliumArsenideCrystal.get(2), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Europium, 2), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Circuit_Silicon_Ingot4.get(1)).fluidInputs(Materials.Radon.getGas(8000)) - .noFluidOutputs().duration(15 * MINUTES).eut((int) TierEU.RECIPE_IV).metadata(COIL_HEAT, 6484) - .addTo(sBlastRecipes); + .itemInputs(Materials.Malachite.getDust(2), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Copper.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(3000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.AntimonyTrioxide.getDust(5), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Antimony.getIngots(2), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(3000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.BandedIron.getDust(5), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Iron.getIngots(2), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Magnetite.getDust(2), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 64), - ItemList.GalliumArsenideCrystal.get(4), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Americium, 4), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(ItemList.Circuit_Silicon_Ingot5.get(1)).fluidInputs(Materials.Radon.getGas(16000)) - .noFluidOutputs().duration(17 * MINUTES + 30 * SECONDS).eut((int) TierEU.RECIPE_LuV) - .metadata(COIL_HEAT, 9000).addTo(sBlastRecipes); + .itemInputs(Materials.YellowLimonite.getDust(2), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.BrownLimonite.getDust(2), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.BasalticMineralSand.getDust(2), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.GraniticMineralSand.getDust(2), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Cassiterite.getDust(2), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Tin.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.CassiteriteSand.getDust(2), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Tin.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Garnierite.getDust(2), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Nickel.getIngots(1), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.CobaltOxide.getDust(2), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Cobalt.getIngots(1), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.ArsenicTrioxide.getDust(5), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Arsenic.getIngots(2), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Massicot.getDust(2), Materials.Carbon.getDustSmall(4)) + .itemOutputs(Materials.Lead.getIngots(1), Materials.Ash.getDustTiny(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1200) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 32), + ItemList.GalliumArsenideCrystalSmallPart.get(1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Circuit_Silicon_Ingot.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(7 * MINUTES + 30 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1784) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 64), + ItemList.GalliumArsenideCrystalSmallPart.get(2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 8), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Circuit_Silicon_Ingot2.get(1)) + .fluidInputs(Materials.Nitrogen.getGas(8000)) + .noFluidOutputs() + .duration(10 * MINUTES) + .eut((int) TierEU.RECIPE_HV) + .metadata(COIL_HEAT, 2484) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 16), + ItemList.GalliumArsenideCrystal.get(1), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Circuit_Silicon_Ingot3.get(1)) + .fluidInputs(Materials.Argon.getGas(8000)) + .noFluidOutputs() + .duration(12 * MINUTES + 30 * SECONDS) + .eut((int) TierEU.RECIPE_EV) + .metadata(COIL_HEAT, 4484) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 32), + ItemList.GalliumArsenideCrystal.get(2), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Europium, 2), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Circuit_Silicon_Ingot4.get(1)) + .fluidInputs(Materials.Radon.getGas(8000)) + .noFluidOutputs() + .duration(15 * MINUTES) + .eut((int) TierEU.RECIPE_IV) + .metadata(COIL_HEAT, 6484) + .addTo(sBlastRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 64), + ItemList.GalliumArsenideCrystal.get(4), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Americium, 4), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(ItemList.Circuit_Silicon_Ingot5.get(1)) + .fluidInputs(Materials.Radon.getGas(16000)) + .noFluidOutputs() + .duration(17 * MINUTES + 30 * SECONDS) + .eut((int) TierEU.RECIPE_LuV) + .metadata(COIL_HEAT, 9000) + .addTo(sBlastRecipes); // CaH2 + 2Si = CaSi2 + 2H GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calciumhydride, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3)) - .noFluidInputs().fluidOutputs(Materials.Hydrogen.getGas(2000)).duration(15 * SECONDS) - .eut((int) TierEU.RECIPE_MV).metadata(COIL_HEAT, 1273).addTo(sBlastRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calciumhydride, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3)) + .noFluidInputs() + .fluidOutputs(Materials.Hydrogen.getGas(2000)) + .duration(15 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .metadata(COIL_HEAT, 1273) + .addTo(sBlastRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUEVBase, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1)) - .noFluidInputs().noFluidOutputs().duration(16 * MINUTES + 23 * SECONDS).eut((int) TierEU.RECIPE_UV) - .metadata(COIL_HEAT, 11800).addTo(sBlastRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUEVBase, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * MINUTES + 23 * SECONDS) + .eut((int) TierEU.RECIPE_UV) + .metadata(COIL_HEAT, 11800) + .addTo(sBlastRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUEVBase, 1), - GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1)) - .fluidInputs(Materials.Radon.getGas(1000)).noFluidOutputs() - .duration(7 * MINUTES + 22 * SECONDS + 7 * TICKS).eut((int) TierEU.RECIPE_UV) - .metadata(COIL_HEAT, 11800).addTo(sBlastRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUEVBase, 1), + GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1)) + .fluidInputs(Materials.Radon.getGas(1000)) + .noFluidOutputs() + .duration(7 * MINUTES + 22 * SECONDS + 7 * TICKS) + .eut((int) TierEU.RECIPE_UV) + .metadata(COIL_HEAT, 11800) + .addTo(sBlastRecipes); // 0.45 * 19660 = 8847 GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUIVBase, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1)) - .noFluidInputs().noFluidOutputs().duration(16 * MINUTES + 23 * SECONDS).eut((int) TierEU.RECIPE_UHV) - .metadata(COIL_HEAT, 12700).addTo(sBlastRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUIVBase, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * MINUTES + 23 * SECONDS) + .eut((int) TierEU.RECIPE_UHV) + .metadata(COIL_HEAT, 12700) + .addTo(sBlastRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUIVBase, 1), - GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1)) - .fluidInputs(Materials.Radon.getGas(1000)).noFluidOutputs() - .duration(7 * MINUTES + 22 * SECONDS + 7 * TICKS).eut((int) TierEU.RECIPE_UHV) - .metadata(COIL_HEAT, 12700).addTo(sBlastRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUIVBase, 1), + GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1)) + .fluidInputs(Materials.Radon.getGas(1000)) + .noFluidOutputs() + .duration(7 * MINUTES + 22 * SECONDS + 7 * TICKS) + .eut((int) TierEU.RECIPE_UHV) + .metadata(COIL_HEAT, 12700) + .addTo(sBlastRecipes); // 0.45 * 19660 = 8847 GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUMVBase, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1)) - .noFluidInputs().noFluidOutputs().duration(16 * MINUTES + 23 * SECONDS).eut((int) TierEU.RECIPE_UEV) - .metadata(COIL_HEAT, 13600).addTo(sBlastRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUMVBase, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * MINUTES + 23 * SECONDS) + .eut((int) TierEU.RECIPE_UEV) + .metadata(COIL_HEAT, 13600) + .addTo(sBlastRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUMVBase, 1), - GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1)) - .fluidInputs(Materials.Radon.getGas(1000)).noFluidOutputs() - .duration(7 * MINUTES + 22 * SECONDS + 7 * TICKS).eut((int) TierEU.RECIPE_UEV) - .metadata(COIL_HEAT, 13600).addTo(sBlastRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUMVBase, 1), + GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1)) + .fluidInputs(Materials.Radon.getGas(1000)) + .noFluidOutputs() + .duration(7 * MINUTES + 22 * SECONDS + 7 * TICKS) + .eut((int) TierEU.RECIPE_UEV) + .metadata(COIL_HEAT, 13600) + .addTo(sBlastRecipes); // 0.45 * 19660 = 8847 // CaO + 3C = CaC2 + CO - GT_Values.RA.stdBuilder().itemInputs(Materials.Quicklime.getDust(2), Materials.Carbon.getDust(3)) - .itemOutputs(MaterialsKevlar.CalciumCarbide.getDust(3)).noFluidInputs() - .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)).duration(30 * SECONDS) - .eut((int) TierEU.RECIPE_HV).metadata(COIL_HEAT, 2573).addTo(sBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Quicklime.getDust(2), Materials.Carbon.getDust(3)) + .itemOutputs(MaterialsKevlar.CalciumCarbide.getDust(3)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)) + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_HV) + .metadata(COIL_HEAT, 2573) + .addTo(sBlastRecipes); // Ni + 3Al = NiAl3 - GT_Values.RA.stdBuilder().itemInputs(Materials.Nickel.getDust(1), Materials.Aluminium.getDust(3)) - .itemOutputs(MaterialsKevlar.NickelAluminide.getIngots(4)).noFluidInputs().noFluidOutputs() - .duration(45 * SECONDS).eut((int) TierEU.RECIPE_HV).metadata(COIL_HEAT, 1688).addTo(sBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Nickel.getDust(1), Materials.Aluminium.getDust(3)) + .itemOutputs(MaterialsKevlar.NickelAluminide.getIngots(4)) + .noFluidInputs() + .noFluidOutputs() + .duration(45 * SECONDS) + .eut((int) TierEU.RECIPE_HV) + .metadata(COIL_HEAT, 1688) + .addTo(sBlastRecipes); ItemStack[] tSiliconDioxide = new ItemStack[] { Materials.SiliconDioxide.getDust(3), Materials.NetherQuartz.getDust(3), Materials.CertusQuartz.getDust(3), @@ -431,21 +650,28 @@ public class BlastFurnaceRecipes implements Runnable { if (GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs(Materials.TranscendentMetal.getDust(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.TranscendentMetal, 1)) - .fluidInputs(Materials.Tungsten.getMolten(144)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 72)) - .duration(3 * MINUTES).eut(32000000).metadata(COIL_HEAT, 11701).addTo(sBlastRecipes); + .itemInputs(Materials.TranscendentMetal.getDust(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.TranscendentMetal, 1)) + .fluidInputs(Materials.Tungsten.getMolten(144)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 72)) + .duration(3 * MINUTES) + .eut(32000000) + .metadata(COIL_HEAT, 11701) + .addTo(sBlastRecipes); // Rh + 3Cl = RhCl3 GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(BartWorks.modID, "gt.bwMetaGenerateddust", 1L, 78), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(MaterialsKevlar.RhodiumChloride.getDust(4)) - .fluidInputs(Materials.Chlorine.getGas(3000)).noFluidOutputs().duration(30 * SECONDS) - .eut((int) TierEU.RECIPE_HV).metadata(COIL_HEAT, 573).addTo(sBlastRecipes); + .itemInputs( + getModItem(BartWorks.modID, "gt.bwMetaGenerateddust", 1L, 78), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(MaterialsKevlar.RhodiumChloride.getDust(4)) + .fluidInputs(Materials.Chlorine.getGas(3000)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_HV) + .metadata(COIL_HEAT, 573) + .addTo(sBlastRecipes); } } @@ -489,51 +715,88 @@ public class BlastFurnaceRecipes implements Runnable { for (Materials coal : new Materials[] { Materials.Coal, Materials.Charcoal }) { // coal as gems - GT_Values.RA.stdBuilder().itemInputs(ArrayUtils.add(inputs, coal.getGems(coalAmount))) - .itemOutputs(ArrayUtils.add(outputs, Materials.DarkAsh.getDustTiny(coalAmount))).noFluidInputs() - .noFluidOutputs().duration(duration).eut(0).addTo(sPrimitiveBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ArrayUtils.add(inputs, coal.getGems(coalAmount))) + .itemOutputs(ArrayUtils.add(outputs, Materials.DarkAsh.getDustTiny(coalAmount))) + .noFluidInputs() + .noFluidOutputs() + .duration(duration) + .eut(0) + .addTo(sPrimitiveBlastRecipes); // coal as dust - GT_Values.RA.stdBuilder().itemInputs(ArrayUtils.add(inputs, coal.getDust(coalAmount))) - .itemOutputs(ArrayUtils.add(outputs, Materials.DarkAsh.getDustTiny(coalAmount))).noFluidInputs() - .noFluidOutputs().duration(duration).eut(0).addTo(sPrimitiveBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ArrayUtils.add(inputs, coal.getDust(coalAmount))) + .itemOutputs(ArrayUtils.add(outputs, Materials.DarkAsh.getDustTiny(coalAmount))) + .noFluidInputs() + .noFluidOutputs() + .duration(duration) + .eut(0) + .addTo(sPrimitiveBlastRecipes); if (!blockVersion) { continue; } // coal as block - GT_Values.RA.stdBuilder().itemInputs(ArrayUtils.add(inputs, coal.getBlocks(coalAmount))) - .itemOutputs(ArrayUtils.add(outputs, Materials.DarkAsh.getDust(coalAmount))).noFluidInputs() - .noFluidOutputs().duration(duration * 10).eut(0).addTo(sPrimitiveBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ArrayUtils.add(inputs, coal.getBlocks(coalAmount))) + .itemOutputs(ArrayUtils.add(outputs, Materials.DarkAsh.getDust(coalAmount))) + .noFluidInputs() + .noFluidOutputs() + .duration(duration * 10) + .eut(0) + .addTo(sPrimitiveBlastRecipes); } if (Railcraft.isModLoaded()) { // coal coke - GT_Values.RA.stdBuilder().itemInputs(ArrayUtils.add(inputs, RailcraftToolItems.getCoalCoke(coalAmount / 2))) - .itemOutputs(ArrayUtils.add(outputs, Materials.Ash.getDustTiny(coalAmount / 2))).noFluidInputs() - .noFluidOutputs().duration(duration * 2 / 3).eut(0).addTo(sPrimitiveBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ArrayUtils.add(inputs, RailcraftToolItems.getCoalCoke(coalAmount / 2))) + .itemOutputs(ArrayUtils.add(outputs, Materials.Ash.getDustTiny(coalAmount / 2))) + .noFluidInputs() + .noFluidOutputs() + .duration(duration * 2 / 3) + .eut(0) + .addTo(sPrimitiveBlastRecipes); // coal coke block - GT_Values.RA.stdBuilder().itemInputs(ArrayUtils.add(inputs, EnumCube.COKE_BLOCK.getItem(coalAmount / 2))) - .itemOutputs(ArrayUtils.add(outputs, Materials.Ash.getDust(coalAmount / 2))).noFluidInputs() - .noFluidOutputs().duration(duration * 10 * 2 / 3).eut(0).addTo(sPrimitiveBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ArrayUtils.add(inputs, EnumCube.COKE_BLOCK.getItem(coalAmount / 2))) + .itemOutputs(ArrayUtils.add(outputs, Materials.Ash.getDust(coalAmount / 2))) + .noFluidInputs() + .noFluidOutputs() + .duration(duration * 10 * 2 / 3) + .eut(0) + .addTo(sPrimitiveBlastRecipes); } if (GTPlusPlus.isModLoaded()) { // cactus coke - GT_Values.RA.stdBuilder().itemInputs( - ArrayUtils - .add(inputs, GT_ModHandler.getModItem(GTPlusPlus.modID, "itemCactusCoke", coalAmount * 2))) - .itemOutputs(ArrayUtils.add(outputs, Materials.Ash.getDustTiny(coalAmount * 2))).noFluidInputs() - .noFluidOutputs().duration(duration * 2 / 3).eut(0).addTo(sPrimitiveBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + ArrayUtils.add( + inputs, + GT_ModHandler.getModItem(GTPlusPlus.modID, "itemCactusCoke", coalAmount * 2))) + .itemOutputs(ArrayUtils.add(outputs, Materials.Ash.getDustTiny(coalAmount * 2))) + .noFluidInputs() + .noFluidOutputs() + .duration(duration * 2 / 3) + .eut(0) + .addTo(sPrimitiveBlastRecipes); // sugar coke - GT_Values.RA.stdBuilder().itemInputs( - ArrayUtils - .add(inputs, GT_ModHandler.getModItem(GTPlusPlus.modID, "itemSugarCoke", (coalAmount * 2)))) - .itemOutputs(ArrayUtils.add(outputs, Materials.Ash.getDustTiny(coalAmount * 2))).noFluidInputs() - .noFluidOutputs().duration(duration * 2 / 3).eut(0).addTo(sPrimitiveBlastRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + ArrayUtils.add( + inputs, + GT_ModHandler.getModItem(GTPlusPlus.modID, "itemSugarCoke", (coalAmount * 2)))) + .itemOutputs(ArrayUtils.add(outputs, Materials.Ash.getDustTiny(coalAmount * 2))) + .noFluidInputs() + .noFluidOutputs() + .duration(duration * 2 / 3) + .eut(0) + .addTo(sPrimitiveBlastRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java index ed9ccef53c..3149888354 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java @@ -27,35 +27,62 @@ public class BreweryRecipes implements Runnable { for (ItemStack item : brewingItems) { // creosote to lubricant recipes - GT_Values.RA.stdBuilder().itemInputs(item).noItemOutputs().fluidInputs(getFluidStack("creosote", 750)) - .fluidOutputs(getFluidStack("lubricant", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(item) + .noItemOutputs() + .fluidInputs(getFluidStack("creosote", 750)) + .fluidOutputs(getFluidStack("lubricant", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); // seed oil to lubricant recipes - GT_Values.RA.stdBuilder().itemInputs(item).noItemOutputs().fluidInputs(getFluidStack("seedoil", 750)) - .fluidOutputs(getFluidStack("lubricant", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(item) + .noItemOutputs() + .fluidInputs(getFluidStack("seedoil", 750)) + .fluidOutputs(getFluidStack("lubricant", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); // lubricant recipes { - GT_Values.RA.stdBuilder().itemInputs(item).noItemOutputs().fluidInputs(getFluidStack("oil", 750)) - .fluidOutputs(getFluidStack("lubricant", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(item) + .noItemOutputs() + .fluidInputs(getFluidStack("oil", 750)) + .fluidOutputs(getFluidStack("lubricant", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(item).noItemOutputs() - .fluidInputs(getFluidStack("liquid_light_oil", 750)) - .fluidOutputs(getFluidStack("lubricant", 500)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(item) + .noItemOutputs() + .fluidInputs(getFluidStack("liquid_light_oil", 750)) + .fluidOutputs(getFluidStack("lubricant", 500)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(item).noItemOutputs() - .fluidInputs(getFluidStack("liquid_medium_oil", 750)) - .fluidOutputs(getFluidStack("lubricant", 500)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(item) + .noItemOutputs() + .fluidInputs(getFluidStack("liquid_medium_oil", 750)) + .fluidOutputs(getFluidStack("lubricant", 500)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(item).noItemOutputs() - .fluidInputs(getFluidStack("liquid_heavy_oil", 500)) - .fluidOutputs(getFluidStack("lubricant", 750)).duration(3 * SECONDS + 4 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(item) + .noItemOutputs() + .fluidInputs(getFluidStack("liquid_heavy_oil", 500)) + .fluidOutputs(getFluidStack("lubricant", 750)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); } } @@ -69,253 +96,481 @@ public class BreweryRecipes implements Runnable { */ if (IndustrialCraft2.isModLoaded()) { waterArray = new String[] { FluidRegistry.WATER.getUnlocalizedName(), - GT_ModHandler.getDistilledWater(1L).getFluid().getUnlocalizedName() }; + GT_ModHandler.getDistilledWater(1L) + .getFluid() + .getUnlocalizedName() }; } else { waterArray = new String[] { FluidRegistry.WATER.getUnlocalizedName(), }; } for (String fluid : waterArray) { - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L)) - .noItemOutputs().fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("milk", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("milk", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L)) - .noItemOutputs().fluidInputs(getFluidStack(fluid, 750)) - .fluidOutputs(getFluidStack("potion.wheatyjuice", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.wheatyjuice", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.mineralwater", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.mineralwater", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L)) - .noItemOutputs().fluidInputs(getFluidStack(fluid, 750)) - .fluidOutputs(getFluidStack("potion.mineralwater", 750)).duration(6 * SECONDS + 8 * TICKS) - .eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.mineralwater", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L)) - .noItemOutputs().fluidInputs(getFluidStack(fluid, 750)) - .fluidOutputs(getFluidStack("potion.mineralwater", 750)).duration(6 * SECONDS + 8 * TICKS) - .eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.mineralwater", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 1L)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.mineralwater", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.mineralwater", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.thick", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.thick", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L)) - .noItemOutputs().fluidInputs(getFluidStack(fluid, 750)) - .fluidOutputs(getFluidStack("potion.mundane", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.mundane", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) - .noItemOutputs().fluidInputs(getFluidStack(fluid, 750)) - .fluidOutputs(getFluidStack("potion.mundane", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.mundane", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L)) - .noItemOutputs().fluidInputs(getFluidStack(fluid, 750)) - .fluidOutputs(getFluidStack("potion.mundane", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.mundane", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.magma_cream, 1, 0)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.mundane", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.magma_cream, 1, 0)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.mundane", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.fermented_spider_eye, 1, 0)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.mundane", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.fermented_spider_eye, 1, 0)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.mundane", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.spider_eye, 1, 0)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.mundane", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.spider_eye, 1, 0)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.mundane", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.speckled_melon, 1, 0)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.mundane", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.speckled_melon, 1, 0)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.mundane", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.ghast_tear, 1, 0)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.mundane", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.ghast_tear, 1, 0)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.mundane", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.nether_wart, 1, 0)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.awkward", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.nether_wart, 1, 0)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.awkward", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.red_mushroom, 1, 0)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.poison", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.red_mushroom, 1, 0)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.poison", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.fish, 1, 3)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.poison.strong", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).hidden().addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.fish, 1, 3)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.poison.strong", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .hidden() + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Grin_Powder.get(1L)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.poison.strong", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Grin_Powder.get(1L)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.poison.strong", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.reeds, 1, 0)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.reedwater", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.reeds, 1, 0)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.reedwater", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.apple, 1, 0)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.applejuice", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.apple, 1, 0)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.applejuice", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.golden_apple, 1, 0)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)) - .fluidOutputs(getFluidStack("potion.goldenapplejuice", 750)).duration(6 * SECONDS + 8 * TICKS) - .eut(4).hidden().addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.golden_apple, 1, 0)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.goldenapplejuice", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .hidden() + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.golden_apple, 1, 1)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)) - .fluidOutputs(getFluidStack("potion.idunsapplejuice", 750)).duration(6 * SECONDS + 8 * TICKS) - .eut(4).hidden().addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.golden_apple, 1, 1)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.idunsapplejuice", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .hidden() + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Hops.get(1L)).noItemOutputs() - .fluidInputs(getFluidStack(fluid, 750)).fluidOutputs(getFluidStack("potion.hopsjuice", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Hops.get(1L)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.hopsjuice", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)) - .noItemOutputs().fluidInputs(getFluidStack(fluid, 750)) - .fluidOutputs(getFluidStack("potion.darkcoffee", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.darkcoffee", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) - .noItemOutputs().fluidInputs(getFluidStack(fluid, 750)) - .fluidOutputs(getFluidStack("potion.chillysauce", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack(fluid, 750)) + .fluidOutputs(getFluidStack("potion.chillysauce", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); } } // potion brewing 1 { - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("potion.chillysauce", 750)) - .fluidOutputs(getFluidStack("potion.hotsauce", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.chillysauce", 750)) + .fluidOutputs(getFluidStack("potion.hotsauce", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("potion.hotsauce", 750)) - .fluidOutputs(getFluidStack("potion.diabolosauce", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .hidden().addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.hotsauce", 750)) + .fluidOutputs(getFluidStack("potion.diabolosauce", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .hidden() + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("potion.diabolosauce", 750)) - .fluidOutputs(getFluidStack("potion.diablosauce", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .hidden().addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.diabolosauce", 750)) + .fluidOutputs(getFluidStack("potion.diablosauce", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .hidden() + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("milk", 750)) - .fluidOutputs(getFluidStack("potion.coffee", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("milk", 750)) + .fluidOutputs(getFluidStack("potion.coffee", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("milk", 750)) - .fluidOutputs(getFluidStack("potion.darkchocolatemilk", 750)).duration(6 * SECONDS + 8 * TICKS) - .eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("milk", 750)) + .fluidOutputs(getFluidStack("potion.darkchocolatemilk", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Hops.get(1L)).noItemOutputs() - .fluidInputs(getFluidStack("potion.wheatyjuice", 750)) - .fluidOutputs(getFluidStack("potion.wheatyhopsjuice", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Hops.get(1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.wheatyjuice", 750)) + .fluidOutputs(getFluidStack("potion.wheatyhopsjuice", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("potion.hopsjuice", 750)) - .fluidOutputs(getFluidStack("potion.wheatyhopsjuice", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.hopsjuice", 750)) + .fluidOutputs(getFluidStack("potion.wheatyhopsjuice", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("potion.tea", 750)) - .fluidOutputs(getFluidStack("potion.sweettea", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .hidden().addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.tea", 750)) + .fluidOutputs(getFluidStack("potion.sweettea", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .hidden() + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("potion.coffee", 750)) - .fluidOutputs(getFluidStack("potion.cafeaulait", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.coffee", 750)) + .fluidOutputs(getFluidStack("potion.cafeaulait", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("potion.cafeaulait", 750)) - .fluidOutputs(getFluidStack("potion.laitaucafe", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .hidden().addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.cafeaulait", 750)) + .fluidOutputs(getFluidStack("potion.laitaucafe", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .hidden() + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("potion.lemonjuice", 750)) - .fluidOutputs(getFluidStack("potion.lemonade", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.lemonjuice", 750)) + .fluidOutputs(getFluidStack("potion.lemonade", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("potion.darkcoffee", 750)) - .fluidOutputs(getFluidStack("potion.darkcafeaulait", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .hidden().addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.darkcoffee", 750)) + .fluidOutputs(getFluidStack("potion.darkcafeaulait", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .hidden() + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("potion.darkchocolatemilk", 750)) - .fluidOutputs(getFluidStack("potion.chocolatemilk", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.darkchocolatemilk", 750)) + .fluidOutputs(getFluidStack("potion.chocolatemilk", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("potion.tea", 750)) - .fluidOutputs(getFluidStack("potion.icetea", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.tea", 750)) + .fluidOutputs(getFluidStack("potion.icetea", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("potion.lemonade", 750)) - .fluidOutputs(getFluidStack("potion.cavejohnsonsgrenadejuice", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).hidden().addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.lemonade", 750)) + .fluidOutputs(getFluidStack("potion.cavejohnsonsgrenadejuice", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .hidden() + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("potion.mundane", 750)) - .fluidOutputs(getFluidStack("potion.purpledrink", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .hidden().addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.mundane", 750)) + .fluidOutputs(getFluidStack("potion.purpledrink", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .hidden() + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.fermented_spider_eye, 1, 0)).noItemOutputs() - .fluidInputs(getFluidStack("potion.mundane", 750)) - .fluidOutputs(getFluidStack("potion.weakness", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.fermented_spider_eye, 1, 0)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.mundane", 750)) + .fluidOutputs(getFluidStack("potion.weakness", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.fermented_spider_eye, 1, 0)).noItemOutputs() - .fluidInputs(getFluidStack("potion.thick", 750)).fluidOutputs(getFluidStack("potion.weakness", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.fermented_spider_eye, 1, 0)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.thick", 750)) + .fluidOutputs(getFluidStack("potion.weakness", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); } // biomass recipes { - GT_Values.RA.stdBuilder().itemInputs(getModItem(Forestry.modID, "fertilizerBio", 4L, 0)).noItemOutputs() - .fluidInputs(getFluidStack(FluidRegistry.WATER.getUnlocalizedName(), 750)) - .fluidOutputs(getFluidStack("biomass", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Forestry.modID, "fertilizerBio", 4L, 0)) + .noItemOutputs() + .fluidInputs(getFluidStack(FluidRegistry.WATER.getUnlocalizedName(), 750)) + .fluidOutputs(getFluidStack("biomass", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Forestry.modID, "mulch", 16L, 0)).noItemOutputs() - .fluidInputs( - getFluidStack(GT_ModHandler.getDistilledWater(750L).getFluid().getUnlocalizedName(), 750)) - .fluidOutputs(getFluidStack("biomass", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Forestry.modID, "mulch", 16L, 0)) + .noItemOutputs() + .fluidInputs( + getFluidStack( + GT_ModHandler.getDistilledWater(750L) + .getFluid() + .getUnlocalizedName(), + 750)) + .fluidOutputs(getFluidStack("biomass", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Forestry.modID, "mulch", 8L, 0)).noItemOutputs() - .fluidInputs(getFluidStack("juice", 500)).fluidOutputs(getFluidStack("biomass", 750)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Forestry.modID, "mulch", 8L, 0)) + .noItemOutputs() + .fluidInputs(getFluidStack("juice", 500)) + .fluidOutputs(getFluidStack("biomass", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); } // ic2 biomass recipes { - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("biochaff", 1)).noItemOutputs() - .fluidInputs(GT_ModHandler.getWater(1000L)).fluidOutputs(getFluidStack("ic2biomass", 1000)) - .duration(8 * SECONDS + 10 * TICKS).eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("biochaff", 1)) + .noItemOutputs() + .fluidInputs(GT_ModHandler.getWater(1000L)) + .fluidOutputs(getFluidStack("ic2biomass", 1000)) + .duration(8 * SECONDS + 10 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); // Would add 2 different amount of water input if IC2 isn't loaded if (IndustrialCraft2.isModLoaded()) { - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("biochaff", 1)).noItemOutputs() - .fluidInputs(GT_ModHandler.getDistilledWater(500L)) - .fluidOutputs(getFluidStack("ic2biomass", 1000)).duration(10 * TICKS) - .eut((int) TierEU.RECIPE_LV).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("biochaff", 1)) + .noItemOutputs() + .fluidInputs(GT_ModHandler.getDistilledWater(500L)) + .fluidOutputs(getFluidStack("ic2biomass", 1000)) + .duration(10 * TICKS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sBrewingRecipes); } } @@ -335,20 +590,34 @@ public class BreweryRecipes implements Runnable { public void addPotionRecipes(String aName, ItemStack aItem) { // normal - GT_Values.RA.stdBuilder().itemInputs(aItem).noItemOutputs().fluidInputs(getFluidStack("potion.awkward", 750)) - .fluidOutputs(getFluidStack("potion." + aName, 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(aItem) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.awkward", 750)) + .fluidOutputs(getFluidStack("potion." + aName, 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); // strong - GT_Values.RA.stdBuilder().itemInputs(aItem).noItemOutputs().fluidInputs(getFluidStack("potion.thick", 750)) - .fluidOutputs(getFluidStack("potion." + aName + ".strong", 750)).duration(6 * SECONDS + 8 * TICKS) - .eut(4).addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(aItem) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.thick", 750)) + .fluidOutputs(getFluidStack("potion." + aName + ".strong", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); // long - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L)) - .noItemOutputs().fluidInputs(getFluidStack("potion." + aName, 750)) - .fluidOutputs(getFluidStack("potion." + aName + ".long", 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sBrewingRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion." + aName, 750)) + .fluidOutputs(getFluidStack("potion." + aName + ".long", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); MixerRecipes.addMixerPotionRecipes(aName); } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java index e9eb560168..b544eef76b 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java @@ -21,42 +21,66 @@ public class CannerRecipes implements Runnable { if (IndustrialCraft2.isModLoaded()) { // todo: remove tiny dust in this recipe GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getIC2Item("fuelRod", 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 1L)) - .itemOutputs(GT_ModHandler.getIC2Item("reactorLithiumCell", 1, 1)).noFluidInputs().noFluidOutputs() - .duration(16 * TICKS).eut(64).addTo(sCannerRecipes); + .itemInputs( + GT_ModHandler.getIC2Item("fuelRod", 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 1L)) + .itemOutputs(GT_ModHandler.getIC2Item("reactorLithiumCell", 1, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * TICKS) + .eut(64) + .addTo(sCannerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_ModHandler.getIC2Item("fuelRod", 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 3)) - .itemOutputs(ItemList.ThoriumCell_1.get(1L)).noFluidInputs().noFluidOutputs() - .duration(1 * SECONDS + 10 * TICKS).eut(16).addTo(sCannerRecipes); + .itemInputs( + GT_ModHandler.getIC2Item("fuelRod", 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 3)) + .itemOutputs(ItemList.ThoriumCell_1.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sCannerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("fuelRod", 1), GT_ModHandler.getIC2Item("UranFuel", 1)) - .itemOutputs(ItemList.Uraniumcell_1.get(1)).noFluidInputs().noFluidOutputs() - .duration(1 * SECONDS + 10 * TICKS).eut(16).addTo(sCannerRecipes); + .itemInputs(GT_ModHandler.getIC2Item("fuelRod", 1), GT_ModHandler.getIC2Item("UranFuel", 1)) + .itemOutputs(ItemList.Uraniumcell_1.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sCannerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("fuelRod", 1), GT_ModHandler.getIC2Item("MOXFuel", 1)) - .itemOutputs(ItemList.Moxcell_1.get(1)).noFluidInputs().noFluidOutputs() - .duration(1 * SECONDS + 10 * TICKS).eut(16).addTo(sCannerRecipes); + .itemInputs(GT_ModHandler.getIC2Item("fuelRod", 1), GT_ModHandler.getIC2Item("MOXFuel", 1)) + .itemOutputs(ItemList.Moxcell_1.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sCannerRecipes); } GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Large_Fluid_Cell_TungstenSteel.get(1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 3)) - .itemOutputs(ItemList.NaquadahCell_1.get(1L)).noFluidInputs().noFluidOutputs() - .duration(1 * SECONDS + 10 * TICKS).eut(16).addTo(sCannerRecipes); + .itemInputs( + ItemList.Large_Fluid_Cell_TungstenSteel.get(1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 3)) + .itemOutputs(ItemList.NaquadahCell_1.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sCannerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Large_Fluid_Cell_TungstenSteel.get(1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 3)) - .itemOutputs(ItemList.MNqCell_1.get(1L)).noFluidInputs().noFluidOutputs() - .duration(1 * SECONDS + 10 * TICKS).eut(16).addTo(sCannerRecipes); + .itemInputs( + ItemList.Large_Fluid_Cell_TungstenSteel.get(1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 3)) + .itemOutputs(ItemList.MNqCell_1.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sCannerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java index b2f41e3d32..6c4cebc91a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java @@ -23,590 +23,964 @@ public class CentrifugeRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedGold, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1), - getModItem(Thaumcraft.modID, "ItemResource", 2L, 14)) - .outputChances(10000, 10000, 9000).fluidInputs(Materials.Mercury.getFluid(200)).noFluidOutputs() - .duration(20 * SECONDS).eut((int) TierEU.RECIPE_MV).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Cell_Empty.get(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1)) - .fluidInputs(Materials.Air.getGas(10000)).fluidOutputs(Materials.Nitrogen.getGas(3900)) - .duration(1 * MINUTES + 20 * SECONDS).eut(8).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 9)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 3)) - .outputChances(10000, 10000, 10000, 9500, 9000, 8500).noFluidInputs().noFluidOutputs() - .duration(6 * MINUTES + 45 * SECONDS).eut(30).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().noItemInputs() - .itemOutputs( - Materials.Stone.getDust(1), - Materials.Iron.getDust(1), - Materials.Copper.getDust(1), - Materials.Tin.getDust(1), - Materials.Nickel.getDust(1), - Materials.Antimony.getDust(1)) - .outputChances(10000, 4000, 2000, 2000, 2000, 2000) - .fluidInputs(MaterialsOreAlum.SluiceJuice.getFluid(1000)).fluidOutputs(Materials.Water.getFluid(500)) - .duration(2 * SECONDS).eut((int) TierEU.RECIPE_MV).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedGold, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1), + getModItem(Thaumcraft.modID, "ItemResource", 2L, 14)) + .outputChances(10000, 10000, 9000) + .fluidInputs(Materials.Mercury.getFluid(200)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Cell_Empty.get(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1)) + .fluidInputs(Materials.Air.getGas(10000)) + .fluidOutputs(Materials.Nitrogen.getGas(3900)) + .duration(1 * MINUTES + 20 * SECONDS) + .eut(8) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 9)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 3)) + .outputChances(10000, 10000, 10000, 9500, 9000, 8500) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * MINUTES + 45 * SECONDS) + .eut(30) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs( + Materials.Stone.getDust(1), + Materials.Iron.getDust(1), + Materials.Copper.getDust(1), + Materials.Tin.getDust(1), + Materials.Nickel.getDust(1), + Materials.Antimony.getDust(1)) + .outputChances(10000, 4000, 2000, 2000, 2000, 2000) + .fluidInputs(MaterialsOreAlum.SluiceJuice.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(500)) + .duration(2 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .addTo(sCentrifugeRecipes); // food ->CH4 GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.golden_apple, 1, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(new ItemStack(Items.gold_ingot, 64)).noFluidInputs() - .fluidOutputs(Materials.Methane.getGas(4608)).duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS).eut(5) - .addTo(sCentrifugeRecipes); + .itemInputs(new ItemStack(Items.golden_apple, 1, 1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(new ItemStack(Items.gold_ingot, 64)) + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(4608)) + .duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.golden_apple, 1, 0), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(new ItemStack(Items.gold_ingot, 7)).noFluidInputs() - .fluidOutputs(Materials.Methane.getGas(576)).duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS).eut(5) - .addTo(sCentrifugeRecipes); + .itemInputs(new ItemStack(Items.golden_apple, 1, 0), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(new ItemStack(Items.gold_ingot, 7)) + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.golden_carrot, 1, 0), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(new ItemStack(Items.gold_nugget, 6)).noFluidInputs() - .fluidOutputs(Materials.Methane.getGas(576)).duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS).eut(5) - .addTo(sCentrifugeRecipes); + .itemInputs(new ItemStack(Items.golden_carrot, 1, 0), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(new ItemStack(Items.gold_nugget, 6)) + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.speckled_melon, 1, 0), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(new ItemStack(Items.gold_nugget, 6)).noFluidInputs() - .fluidOutputs(Materials.Methane.getGas(576)).duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS).eut(5) - .addTo(sCentrifugeRecipes); + .itemInputs(new ItemStack(Items.speckled_melon, 1, 0), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(new ItemStack(Items.gold_nugget, 6)) + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(7 * MINUTES + 40 * SECONDS + 16 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.mushroom_stew, 16, 0), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(new ItemStack(Items.bowl, 16, 0)).noFluidInputs() - .fluidOutputs(Materials.Methane.getGas(576)).duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5) - .addTo(sCentrifugeRecipes); + .itemInputs(new ItemStack(Items.mushroom_stew, 16, 0), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(new ItemStack(Items.bowl, 16, 0)) + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.apple, 32, 0), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.apple, 32, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.bread, 64, 0), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.bread, 64, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.porkchop, 12, 0), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.porkchop, 12, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.cooked_porkchop, 16, 0), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs(new ItemStack(Items.cooked_porkchop, 16, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.beef, 12, 0), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.beef, 12, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.cooked_beef, 16, 0), GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs(new ItemStack(Items.cooked_beef, 16, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.fish, 12, 32767), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.fish, 12, 32767), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.cooked_fished, 16, 32767), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs(new ItemStack(Items.cooked_fished, 16, 32767), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.chicken, 12, 0), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.chicken, 12, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.cooked_chicken, 16, 0), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs(new ItemStack(Items.cooked_chicken, 16, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.melon, 64, 0), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.melon, 64, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.pumpkin, 16, 0), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.pumpkin, 16, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.rotten_flesh, 16, 0), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs(new ItemStack(Items.rotten_flesh, 16, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.spider_eye, 32, 0), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.spider_eye, 32, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.carrot, 16, 0), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.carrot, 16, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Raw_Potato.get(16), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Raw_Potato.get(16), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Poisonous_Potato.get(12), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Poisonous_Potato.get(12), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Baked_Potato.get(24), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Baked_Potato.get(24), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.cookie, 64, 0), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.cookie, 64, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.cake, 8, 0), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.cake, 8, 0), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.brown_mushroom_block, 12, 32767), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs( + new ItemStack(Blocks.brown_mushroom_block, 12, 32767), + GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.red_mushroom_block, 12, 32767), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs(new ItemStack(Blocks.red_mushroom_block, 12, 32767), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.brown_mushroom, 32, 32767), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs(new ItemStack(Blocks.brown_mushroom, 32, 32767), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.red_mushroom, 32, 32767), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs(new ItemStack(Blocks.red_mushroom, 32, 32767), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.nether_wart, 32, 32767), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs(new ItemStack(Items.nether_wart, 32, 32767), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("terraWart", 16), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs(GT_ModHandler.getIC2Item("terraWart", 16), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(TwilightForest.modID, "item.meefRaw", 12L, 32767), - GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs( + getModItem(TwilightForest.modID, "item.meefRaw", 12L, 32767), + GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(TwilightForest.modID, "item.meefSteak", 16L, 32767), - GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs( + getModItem(TwilightForest.modID, "item.meefSteak", 16L, 32767), + GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(TwilightForest.modID, "item.venisonRaw", 12L, 32767), - GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs( + getModItem(TwilightForest.modID, "item.venisonRaw", 12L, 32767), + GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(TwilightForest.modID, "item.venisonCooked", 16L, 32767), - GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(576)) - .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS).eut(5).addTo(sCentrifugeRecipes); + .itemInputs( + getModItem(TwilightForest.modID, "item.venisonCooked", 16L, 32767), + GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(576)) + .duration(3 * MINUTES + 50 * SECONDS + 8 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1), - GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Methane.getGas(60)).duration(10 * SECONDS) - .eut(20).addTo(sCentrifugeRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1), + GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(60)) + .duration(10 * SECONDS) + .eut(20) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.sand, 1, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Diamond, 1), - new ItemStack(Blocks.sand, 1)) - .outputChances(5000, 100, 5000).noFluidInputs().noFluidOutputs().duration(30 * SECONDS) - .eut((int) TierEU.RECIPE_MV).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.sand, 1, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Diamond, 1), + new ItemStack(Blocks.sand, 1)) + .outputChances(5000, 100, 5000) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut((int) TierEU.RECIPE_MV) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.dirt, 1, 32767)) - .itemOutputs( - ItemList.IC2_Plantball.get(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Clay, 1), - new ItemStack(Blocks.sand, 1)) - .outputChances(1250, 5000, 5000).noFluidInputs().noFluidOutputs().duration(12 * SECONDS + 10 * TICKS) - .eut(30).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.dirt, 1, 32767)) + .itemOutputs( + ItemList.IC2_Plantball.get(1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Clay, 1), + new ItemStack(Blocks.sand, 1)) + .outputChances(1250, 5000, 5000) + .noFluidInputs() + .noFluidOutputs() + .duration(12 * SECONDS + 10 * TICKS) + .eut(30) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.grass, 1, 32767)) - .itemOutputs( - ItemList.IC2_Plantball.get(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Clay, 1), - new ItemStack(Blocks.sand, 1)) - .outputChances(2500, 5000, 5000).noFluidInputs().noFluidOutputs().duration(12 * SECONDS + 10 * TICKS) - .eut(30).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.grass, 1, 32767)) + .itemOutputs( + ItemList.IC2_Plantball.get(1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Clay, 1), + new ItemStack(Blocks.sand, 1)) + .outputChances(2500, 5000, 5000) + .noFluidInputs() + .noFluidOutputs() + .duration(12 * SECONDS + 10 * TICKS) + .eut(30) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.mycelium, 1, 32767)) - .itemOutputs( - new ItemStack(Blocks.brown_mushroom, 1), - new ItemStack(Blocks.red_mushroom, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Clay, 1), - new ItemStack(Blocks.sand, 1)) - .outputChances(2500, 2500, 5000, 5000).noFluidInputs().noFluidOutputs() - .duration(32 * SECONDS + 10 * TICKS).eut(30).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.mycelium, 1, 32767)) + .itemOutputs( + new ItemStack(Blocks.brown_mushroom, 1), + new ItemStack(Blocks.red_mushroom, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Clay, 1), + new ItemStack(Blocks.sand, 1)) + .outputChances(2500, 2500, 5000, 5000) + .noFluidInputs() + .noFluidOutputs() + .duration(32 * SECONDS + 10 * TICKS) + .eut(30) + .addTo(sCentrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Resin.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3), - ItemList.IC2_Plantball.get(1)) - .outputChances(10000, 1000).noFluidInputs().fluidOutputs(Materials.Glue.getFluid(100)) - .duration(15 * SECONDS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Resin.get(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3), + ItemList.IC2_Plantball.get(1)) + .outputChances(10000, 1000) + .noFluidInputs() + .fluidOutputs(Materials.Glue.getFluid(100)) + .duration(15 * SECONDS) + .eut(5) + .addTo(sCentrifugeRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1), - GT_Utility.getIntegratedCircuit(10)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1)) - .outputChances(1000, 500).noFluidInputs().noFluidOutputs().duration(1 * MINUTES + 40 * SECONDS) - .eut((int) TierEU.RECIPE_HV).addTo(sCentrifugeRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1), + GT_Utility.getIntegratedCircuit(10)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1)) + .outputChances(1000, 500) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 40 * SECONDS) + .eut((int) TierEU.RECIPE_HV) + .addTo(sCentrifugeRecipes); // Uranium Enrichment in Centrifuge by adding Fluorine (Uranium Hexafluoride) - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1)).outputChances(10000) - .fluidInputs(Materials.Fluorine.getGas(4000)).noFluidOutputs().duration(3 * MINUTES + 20 * SECONDS) - .eut((int) TierEU.RECIPE_EV).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium241, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1)) - .outputChances(2000, 3000).noFluidInputs().noFluidOutputs().duration(1 * MINUTES + 20 * SECONDS) - .eut(320).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 9)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1)) - .outputChances(5000, 1000).noFluidInputs().noFluidOutputs().duration(24 * MINUTES).eut(320) - .addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 4)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1)) - .outputChances(2000, 3000).noFluidInputs().noFluidOutputs().duration(21 * MINUTES + 20 * SECONDS) - .eut(640).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.Hydrogen.getGas(160)) - .fluidOutputs(Materials.Deuterium.getGas(40)).duration(8 * SECONDS).eut(20).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.Deuterium.getGas(160)) - .fluidOutputs(Materials.Tritium.getGas(40)).duration(8 * SECONDS).eut(80).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.Helium.getGas(80)) - .fluidOutputs(Materials.Helium_3.getGas(5)).duration(8 * SECONDS).eut(80).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 2)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1)) - .noFluidInputs().noFluidOutputs().duration(48 * SECONDS + 16 * TICKS).eut(80).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 36)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungstate, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1), - new ItemStack(Blocks.sand, 36)) - .outputChances(3750, 2500, 9000).noFluidInputs().fluidOutputs(Materials.Helium.getGas(4320)) - .duration(9 * MINUTES + 36 * SECONDS).eut(20).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Netherrack, 36)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1)) - .outputChances(5625, 9900, 5625, 2500).noFluidInputs().noFluidOutputs() - .duration(4 * MINUTES + 48 * SECONDS).eut(20).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)) - .itemOutputs( - Materials.SiliconDioxide.getDust(1), - Materials.Magnesia.getDust(1), - Materials.Quicklime.getDust(1), - Materials.Gold.getNuggets(4), - Materials.Sapphire.getDust(1), - Materials.Tantalite.getDust(1)) - .outputChances(5000, 1000, 1000, 250, 1250, 500).fluidInputs(Materials.Lava.getFluid(400)) - .noFluidOutputs().duration(16 * SECONDS).eut(80).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(20)) - .itemOutputs( - Materials.SiliconDioxide.getDust(5), - Materials.Magnesia.getDust(1), - Materials.Quicklime.getDust(1), - Materials.Gold.getIngots(1), - Materials.Sapphire.getDust(3), - Materials.Tantalite.getDust(1)) - .outputChances(9000, 9000, 9000, 1000, 3750, 4500).fluidInputs(Materials.Lava.getFluid(3600)) - .noFluidOutputs().duration(2 * MINUTES + 24 * SECONDS).eut(80).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.soul_sand, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1), - new ItemStack(Blocks.sand, 1)) - .outputChances(1000, 700, 9000).noFluidInputs().fluidOutputs(Materials.Oil.getFluid(200)) - .duration(10 * SECONDS).eut(12).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Copper, 1), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Silver, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Scheelite, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Bauxite, 1)) - .outputChances(2000, 1000, 250, 50, 250, 500).fluidInputs(getFluidStack("ic2pahoehoelava", 100)) - .noFluidOutputs().duration(2 * SECONDS).eut(1024).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(20)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Scheelite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bauxite, 1)) - .outputChances(8000, 4000, 1000, 450, 2250, 4500).fluidInputs(getFluidStack("ic2pahoehoelava", 3600)) - .noFluidOutputs().duration(16 * SECONDS + 8 * TICKS).eut(4096).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1)) + .outputChances(10000) + .fluidInputs(Materials.Fluorine.getGas(4000)) + .noFluidOutputs() + .duration(3 * MINUTES + 20 * SECONDS) + .eut((int) TierEU.RECIPE_EV) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium241, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1)) + .outputChances(2000, 3000) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 20 * SECONDS) + .eut(320) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 9)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1)) + .outputChances(5000, 1000) + .noFluidInputs() + .noFluidOutputs() + .duration(24 * MINUTES) + .eut(320) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 4)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1)) + .outputChances(2000, 3000) + .noFluidInputs() + .noFluidOutputs() + .duration(21 * MINUTES + 20 * SECONDS) + .eut(640) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Hydrogen.getGas(160)) + .fluidOutputs(Materials.Deuterium.getGas(40)) + .duration(8 * SECONDS) + .eut(20) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Deuterium.getGas(160)) + .fluidOutputs(Materials.Tritium.getGas(40)) + .duration(8 * SECONDS) + .eut(80) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Helium.getGas(80)) + .fluidOutputs(Materials.Helium_3.getGas(5)) + .duration(8 * SECONDS) + .eut(80) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(48 * SECONDS + 16 * TICKS) + .eut(80) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 36)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungstate, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1), + new ItemStack(Blocks.sand, 36)) + .outputChances(3750, 2500, 9000) + .noFluidInputs() + .fluidOutputs(Materials.Helium.getGas(4320)) + .duration(9 * MINUTES + 36 * SECONDS) + .eut(20) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Netherrack, 36)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1)) + .outputChances(5625, 9900, 5625, 2500) + .noFluidInputs() + .noFluidOutputs() + .duration(4 * MINUTES + 48 * SECONDS) + .eut(20) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(10)) + .itemOutputs( + Materials.SiliconDioxide.getDust(1), + Materials.Magnesia.getDust(1), + Materials.Quicklime.getDust(1), + Materials.Gold.getNuggets(4), + Materials.Sapphire.getDust(1), + Materials.Tantalite.getDust(1)) + .outputChances(5000, 1000, 1000, 250, 1250, 500) + .fluidInputs(Materials.Lava.getFluid(400)) + .noFluidOutputs() + .duration(16 * SECONDS) + .eut(80) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(20)) + .itemOutputs( + Materials.SiliconDioxide.getDust(5), + Materials.Magnesia.getDust(1), + Materials.Quicklime.getDust(1), + Materials.Gold.getIngots(1), + Materials.Sapphire.getDust(3), + Materials.Tantalite.getDust(1)) + .outputChances(9000, 9000, 9000, 1000, 3750, 4500) + .fluidInputs(Materials.Lava.getFluid(3600)) + .noFluidOutputs() + .duration(2 * MINUTES + 24 * SECONDS) + .eut(80) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.soul_sand, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1), + new ItemStack(Blocks.sand, 1)) + .outputChances(1000, 700, 9000) + .noFluidInputs() + .fluidOutputs(Materials.Oil.getFluid(200)) + .duration(10 * SECONDS) + .eut(12) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(10)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Copper, 1), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1), + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Silver, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Scheelite, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Bauxite, 1)) + .outputChances(2000, 1000, 250, 50, 250, 500) + .fluidInputs(getFluidStack("ic2pahoehoelava", 100)) + .noFluidOutputs() + .duration(2 * SECONDS) + .eut(1024) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(20)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Silver, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Scheelite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bauxite, 1)) + .outputChances(8000, 4000, 1000, 450, 2250, 4500) + .fluidInputs(getFluidStack("ic2pahoehoelava", 3600)) + .noFluidOutputs() + .duration(16 * SECONDS + 8 * TICKS) + .eut(4096) + .addTo(sCentrifugeRecipes); // rare earth ( why this still remain - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neodymium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Yttrium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lanthanum, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cerium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cadmium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Caesium, 1)) - .outputChances(2500, 2500, 2500, 2500, 2500, 2500).noFluidInputs().noFluidOutputs() - .duration(3 * SECONDS + 4 * TICKS).eut(20).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 45), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.BasalticMineralSand, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Olivine, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Obsidian, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Basalt, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Flint, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.RareEarth, 1)) - .outputChances(2000, 2000, 2000, 2000, 2000, 2000).noFluidInputs().noFluidOutputs() - .duration(3 * SECONDS + 4 * TICKS).eut(20).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 36L, 45), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BasalticMineralSand, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Olivine, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Basalt, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Flint, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 2)) - .outputChances(9000, 9000, 9000, 9000, 9000, 9000).noFluidInputs().noFluidOutputs() - .duration(25 * SECONDS + 18 * TICKS).eut(80).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neodymium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Yttrium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lanthanum, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cerium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cadmium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Caesium, 1)) + .outputChances(2500, 2500, 2500, 2500, 2500, 2500) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(20) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 45), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.BasalticMineralSand, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Olivine, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Obsidian, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Basalt, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Flint, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.RareEarth, 1)) + .outputChances(2000, 2000, 2000, 2000, 2000, 2000) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(20) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 36L, 45), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BasalticMineralSand, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Olivine, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Basalt, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Flint, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RareEarth, 2)) + .outputChances(9000, 9000, 9000, 9000, 9000, 9000) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS + 18 * TICKS) + .eut(80) + .addTo(sCentrifugeRecipes); // Ash centrifuge recipes - GT_Values.RA.stdBuilder().itemInputs(Materials.Ash.getDust(36)) - .itemOutputs( - Materials.Quicklime.getDust(18), - Materials.Potash.getDust(9), - Materials.Magnesia.getDust(1), - Materials.PhosphorousPentoxide.getDust(2), - Materials.SodaAsh.getDust(1), - Materials.BandedIron.getDust(4)) - .outputChances(6400, 6000, 4500, 10000, 10000, 10000).noFluidInputs().noFluidOutputs() - .duration(5 * MINUTES).eut(30).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ash.getDust(36)) + .itemOutputs( + Materials.Quicklime.getDust(18), + Materials.Potash.getDust(9), + Materials.Magnesia.getDust(1), + Materials.PhosphorousPentoxide.getDust(2), + Materials.SodaAsh.getDust(1), + Materials.BandedIron.getDust(4)) + .outputChances(6400, 6000, 4500, 10000, 10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * MINUTES) + .eut(30) + .addTo(sCentrifugeRecipes); // Stone Dust and Metal Mixture centrifuge recipes - GT_Values.RA.stdBuilder().itemInputs(Materials.Stone.getDust(36)) - .itemOutputs( - Materials.Quartzite.getDust(9), - Materials.PotassiumFeldspar.getDust(9), - Materials.Marble.getDust(8), - Materials.Biotite.getDust(4), - Materials.MetalMixture.getDust(3), - Materials.Sodalite.getDust(2)) - .outputChances(10000, 10000, 10000, 10000, 10000, 10000).noFluidInputs().noFluidOutputs() - .duration(7 * MINUTES + 12 * SECONDS).eut(30).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.MetalMixture.getDust(36)) - .itemOutputs( - Materials.BandedIron.getDust(9), - Materials.Bauxite.getDust(9), - Materials.Pyrolusite.getDust(8), - Materials.Barite.getDust(4), - Materials.Chromite.getDust(3), - Materials.Ilmenite.getDust(2)) - .outputChances(10000, 10000, 10000, 10000, 10000, 10000).noFluidInputs().noFluidOutputs() - .duration(10 * MINUTES + 56 * SECONDS + 5 * TICKS).eut((int) TierEU.RECIPE_EV) - .addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.Propane.getGas(320)) - .fluidOutputs(Materials.LPG.getFluid(290)).duration(20 * TICKS).eut(5).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.Butane.getGas(320)) - .fluidOutputs(Materials.LPG.getFluid(370)).duration(20 * TICKS).eut(5).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().noItemInputs() - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 8)) - .outputChances(10000, 10000).fluidInputs(Materials.EnrichedNaquadria.getFluid(9216)) - .fluidOutputs(Materials.FluidNaquadahFuel.getFluid(4806)).duration(30 * SECONDS).eut(2000000) - .addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1), - ItemList.TE_Slag.get(1L, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1))) - .noFluidInputs().noFluidOutputs().duration(12 * SECONDS + 10 * TICKS).eut(5).addTo(sCentrifugeRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.magma_cream, 1)) - .itemOutputs(new ItemStack(Items.blaze_powder, 1), new ItemStack(Items.slime_ball, 1)).noFluidInputs() - .noFluidOutputs().duration(25 * SECONDS).eut(5).addTo(sCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Stone.getDust(36)) + .itemOutputs( + Materials.Quartzite.getDust(9), + Materials.PotassiumFeldspar.getDust(9), + Materials.Marble.getDust(8), + Materials.Biotite.getDust(4), + Materials.MetalMixture.getDust(3), + Materials.Sodalite.getDust(2)) + .outputChances(10000, 10000, 10000, 10000, 10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(7 * MINUTES + 12 * SECONDS) + .eut(30) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.MetalMixture.getDust(36)) + .itemOutputs( + Materials.BandedIron.getDust(9), + Materials.Bauxite.getDust(9), + Materials.Pyrolusite.getDust(8), + Materials.Barite.getDust(4), + Materials.Chromite.getDust(3), + Materials.Ilmenite.getDust(2)) + .outputChances(10000, 10000, 10000, 10000, 10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * MINUTES + 56 * SECONDS + 5 * TICKS) + .eut((int) TierEU.RECIPE_EV) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Propane.getGas(320)) + .fluidOutputs(Materials.LPG.getFluid(290)) + .duration(20 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Butane.getGas(320)) + .fluidOutputs(Materials.LPG.getFluid(370)) + .duration(20 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 8)) + .outputChances(10000, 10000) + .fluidInputs(Materials.EnrichedNaquadria.getFluid(9216)) + .fluidOutputs(Materials.FluidNaquadahFuel.getFluid(4806)) + .duration(30 * SECONDS) + .eut(2000000) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1), + ItemList.TE_Slag.get(1L, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1))) + .noFluidInputs() + .noFluidOutputs() + .duration(12 * SECONDS + 10 * TICKS) + .eut(5) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.magma_cream, 1)) + .itemOutputs(new ItemStack(Items.blaze_powder, 1), new ItemStack(Items.slime_ball, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(5) + .addTo(sCentrifugeRecipes); if (Thaumcraft.isModLoaded()) { // air GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 144), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedAir, 1)).noFluidInputs() - .noFluidOutputs().duration(51 * SECONDS + 4 * TICKS).eut(12).addTo(sCentrifugeRecipes); + .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 144), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedAir, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(51 * SECONDS + 4 * TICKS) + .eut(12) + .addTo(sCentrifugeRecipes); // fire GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 146), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedFire, 1)).noFluidInputs() - .noFluidOutputs().duration(51 * SECONDS + 4 * TICKS).eut(12).addTo(sCentrifugeRecipes); + .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 146), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedFire, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(51 * SECONDS + 4 * TICKS) + .eut(12) + .addTo(sCentrifugeRecipes); // aqua GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 147), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedWater, 1)).noFluidInputs() - .noFluidOutputs().duration(51 * SECONDS + 4 * TICKS).eut(12).addTo(sCentrifugeRecipes); + .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 147), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedWater, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(51 * SECONDS + 4 * TICKS) + .eut(12) + .addTo(sCentrifugeRecipes); // terra GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 145), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEarth, 1)).noFluidInputs() - .noFluidOutputs().duration(51 * SECONDS + 4 * TICKS).eut(12).addTo(sCentrifugeRecipes); + .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 145), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEarth, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(51 * SECONDS + 4 * TICKS) + .eut(12) + .addTo(sCentrifugeRecipes); // ordo GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 148), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1)).noFluidInputs() - .noFluidOutputs().duration(51 * SECONDS + 4 * TICKS).eut(12).addTo(sCentrifugeRecipes); + .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 148), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(51 * SECONDS + 4 * TICKS) + .eut(12) + .addTo(sCentrifugeRecipes); // perditio GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 149), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1)).noFluidInputs() - .noFluidOutputs().duration(51 * SECONDS + 4 * TICKS).eut(12).addTo(sCentrifugeRecipes); + .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 149), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(51 * SECONDS + 4 * TICKS) + .eut(12) + .addTo(sCentrifugeRecipes); // Nethershard GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 152), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 6)).noFluidInputs() - .noFluidOutputs().duration(6 * SECONDS + 8 * TICKS).eut(512).addTo(sCentrifugeRecipes); + .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 152), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 6)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(512) + .addTo(sCentrifugeRecipes); // Endshard GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 153), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 7)).noFluidInputs() - .noFluidOutputs().duration(6 * SECONDS + 8 * TICKS).eut(512).addTo(sCentrifugeRecipes); + .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 153), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 7)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(512) + .addTo(sCentrifugeRecipes); } if (ExtraUtilities.isModLoaded()) { // Caelestis red GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 154), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 2), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 10), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 14), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 1), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 12), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 6)) - .noFluidInputs().noFluidOutputs().duration(25 * SECONDS + 12 * TICKS).eut(12) - .addTo(sCentrifugeRecipes); + .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 154), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 2), + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 10), + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 14), + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 1), + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 12), + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 6)) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS + 12 * TICKS) + .eut(12) + .addTo(sCentrifugeRecipes); // Caelestis green GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 155), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 13), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 5), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 4), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 8), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 0), - NI) - .noFluidInputs().noFluidOutputs().duration(25 * SECONDS + 12 * TICKS).eut(12) - .addTo(sCentrifugeRecipes); + .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 155), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 13), + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 5), + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 4), + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 8), + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 0), + NI) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS + 12 * TICKS) + .eut(12) + .addTo(sCentrifugeRecipes); // Caelestis blue GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 156), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 3), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 9), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 11), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 7), - getModItem(ExtraUtilities.modID, "greenscreen", 1L, 15), - NI) - .noFluidInputs().noFluidOutputs().duration(25 * SECONDS + 12 * TICKS).eut(12) - .addTo(sCentrifugeRecipes); + .itemInputs(getModItem(GregTech.modID, "gt.comb", 1L, 156), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 3), + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 9), + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 11), + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 7), + getModItem(ExtraUtilities.modID, "greenscreen", 1L, 15), + NI) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS + 12 * TICKS) + .eut(12) + .addTo(sCentrifugeRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java index b29df79b72..fbcada3e7a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java @@ -21,202 +21,359 @@ public class ChemicalBathRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Raw_Fries.get(1)).itemOutputs(ItemList.Food_Fries.get(1)) - .fluidInputs(Materials.FryingOilHot.getFluid(10)).noFluidOutputs().duration(16 * TICKS).eut(4) - .addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Raw_Fries.get(1)) + .itemOutputs(ItemList.Food_Fries.get(1)) + .fluidInputs(Materials.FryingOilHot.getFluid(10)) + .noFluidOutputs() + .duration(16 * TICKS) + .eut(4) + .addTo(sChemicalBathRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("dynamite", 1)) - .itemOutputs(GT_ModHandler.getIC2Item("stickyDynamite", 1)).fluidInputs(Materials.Glue.getFluid(10)) - .noFluidOutputs().duration(16 * TICKS).eut(4).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("dynamite", 1)) + .itemOutputs(GT_ModHandler.getIC2Item("stickyDynamite", 1)) + .fluidInputs(Materials.Glue.getFluid(10)) + .noFluidOutputs() + .duration(16 * TICKS) + .eut(4) + .addTo(sChemicalBathRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1)) - .itemOutputs(GT_ModHandler.getIC2Item("reinforcedStone", 1)) - .fluidInputs(Materials.Concrete.getMolten(144)).noFluidOutputs().duration(10 * SECONDS).eut(4) - .addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1)) + .itemOutputs(GT_ModHandler.getIC2Item("reinforcedStone", 1)) + .fluidInputs(Materials.Concrete.getMolten(144)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(4) + .addTo(sChemicalBathRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HydratedCoal, 1)) - .fluidInputs(Materials.Water.getFluid(125)).noFluidOutputs().duration(12 * TICKS).eut(4) - .addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HydratedCoal, 1)) + .fluidInputs(Materials.Water.getFluid(125)) + .noFluidOutputs() + .duration(12 * TICKS) + .eut(4) + .addTo(sChemicalBathRecipes); // paper creation recipes ItemStack[] paperSources = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 1L), new ItemStack(Items.reeds, 1, 32767) }; for (ItemStack paperSource : paperSources) { - GT_Values.RA.stdBuilder().itemInputs(paperSource).itemOutputs(new ItemStack(Items.paper, 1, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(4) - .addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(paperSource) + .itemOutputs(new ItemStack(Items.paper, 1, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(4) + .addTo(sChemicalBathRecipes); - GT_Values.RA.stdBuilder().itemInputs(paperSource).itemOutputs(new ItemStack(Items.paper, 1, 0)) - .fluidInputs(GT_ModHandler.getDistilledWater(100)).noFluidOutputs().duration(10 * SECONDS).eut(4) - .addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(paperSource) + .itemOutputs(new ItemStack(Items.paper, 1, 0)) + .fluidInputs(GT_ModHandler.getDistilledWater(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(4) + .addTo(sChemicalBathRecipes); } - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HydratedCoal, 1)) - .fluidInputs(GT_ModHandler.getDistilledWater(125)).noFluidOutputs().duration(12 * TICKS).eut(4) - .addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HydratedCoal, 1)) + .fluidInputs(GT_ModHandler.getDistilledWater(125)) + .noFluidOutputs() + .duration(12 * TICKS) + .eut(4) + .addTo(sChemicalBathRecipes); for (int i = 1; i < 16; i++) { // wool cleaning recipes - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.wool, 1, i)) - .itemOutputs(new ItemStack(Blocks.wool, 1, 0)).fluidInputs(Materials.Chlorine.getGas(50)) - .noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.wool, 1, i)) + .itemOutputs(new ItemStack(Blocks.wool, 1, 0)) + .fluidInputs(Materials.Chlorine.getGas(50)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sChemicalBathRecipes); // carpet cleaning recipes - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.carpet, 1, 32767)) - .itemOutputs(new ItemStack(Blocks.carpet, 1, 0)).fluidInputs(Materials.Chlorine.getGas(25)) - .noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.carpet, 1, 32767)) + .itemOutputs(new ItemStack(Blocks.carpet, 1, 0)) + .fluidInputs(Materials.Chlorine.getGas(25)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sChemicalBathRecipes); } // stained hardened clay cleaning - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.stained_hardened_clay, 1, 32767)) - .itemOutputs(new ItemStack(Blocks.hardened_clay, 1, 0)).fluidInputs(Materials.Chlorine.getGas(50)) - .noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.stained_hardened_clay, 1, 32767)) + .itemOutputs(new ItemStack(Blocks.hardened_clay, 1, 0)) + .fluidInputs(Materials.Chlorine.getGas(50)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sChemicalBathRecipes); // stained glass cleaning - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.stained_glass, 1, 32767)) - .itemOutputs(new ItemStack(Blocks.glass, 1, 0)).fluidInputs(Materials.Chlorine.getGas(50)) - .noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.stained_glass, 1, 32767)) + .itemOutputs(new ItemStack(Blocks.glass, 1, 0)) + .fluidInputs(Materials.Chlorine.getGas(50)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sChemicalBathRecipes); // stained glass pane cleaning - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.stained_glass_pane, 1, 32767)) - .itemOutputs(new ItemStack(Blocks.glass_pane, 1, 0)).fluidInputs(Materials.Chlorine.getGas(20)) - .noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.stained_glass_pane, 1, 32767)) + .itemOutputs(new ItemStack(Blocks.glass_pane, 1, 0)) + .fluidInputs(Materials.Chlorine.getGas(20)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sChemicalBathRecipes); // light -> dark concrete recipes for (int i = 0; i < 8; i++) { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(GregTech_API.sBlockConcretes, 1, i + 8)) - .itemOutputs(new ItemStack(GregTech_API.sBlockConcretes, 1, i)) - .fluidInputs(Materials.Water.getFluid(250)).noFluidOutputs().duration(10 * SECONDS).eut(4) - .addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(GregTech_API.sBlockConcretes, 1, i + 8)) + .itemOutputs(new ItemStack(GregTech_API.sBlockConcretes, 1, i)) + .fluidInputs(Materials.Water.getFluid(250)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(4) + .addTo(sChemicalBathRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(GregTech_API.sBlockConcretes, 1, i + 8)) - .itemOutputs(new ItemStack(GregTech_API.sBlockConcretes, 1, i)) - .fluidInputs(GT_ModHandler.getDistilledWater(250)).noFluidOutputs().duration(10 * SECONDS).eut(4) - .addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(GregTech_API.sBlockConcretes, 1, i + 8)) + .itemOutputs(new ItemStack(GregTech_API.sBlockConcretes, 1, i)) + .fluidInputs(GT_ModHandler.getDistilledWater(250)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(4) + .addTo(sChemicalBathRecipes); } // reinforced blocks { - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Bronze, 1)) - .itemOutputs(ItemList.Block_BronzePlate.get(1)).fluidInputs(Materials.Concrete.getMolten(144)) - .noFluidOutputs().duration(10 * SECONDS).eut(4).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Bronze, 1)) + .itemOutputs(ItemList.Block_BronzePlate.get(1)) + .fluidInputs(Materials.Concrete.getMolten(144)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(4) + .addTo(sChemicalBathRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1)) - .itemOutputs(ItemList.Block_SteelPlate.get(1)).fluidInputs(Materials.Steel.getMolten(288)) - .noFluidOutputs().duration(12 * SECONDS + 10 * TICKS).eut(16).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1)) + .itemOutputs(ItemList.Block_SteelPlate.get(1)) + .fluidInputs(Materials.Steel.getMolten(288)) + .noFluidOutputs() + .duration(12 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sChemicalBathRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1)) - .itemOutputs(ItemList.Block_TitaniumPlate.get(1)).fluidInputs(Materials.Titanium.getMolten(144)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1)) + .itemOutputs(ItemList.Block_TitaniumPlate.get(1)) + .fluidInputs(Materials.Titanium.getMolten(144)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sChemicalBathRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1)) - .itemOutputs(ItemList.Block_TungstenSteelReinforced.get(1)) - .fluidInputs(Materials.TungstenSteel.getMolten(144)).noFluidOutputs() - .duration(17 * SECONDS + 10 * TICKS).eut(64).addTo(sChemicalBathRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1)) + .itemOutputs(ItemList.Block_TungstenSteelReinforced.get(1)) + .fluidInputs(Materials.TungstenSteel.getMolten(144)) + .noFluidOutputs() + .duration(17 * SECONDS + 10 * TICKS) + .eut(64) + .addTo(sChemicalBathRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1)) - .itemOutputs(ItemList.Block_IridiumTungstensteel.get(1)) - .fluidInputs(Materials.Iridium.getMolten(144)).noFluidOutputs().duration(20 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1)) + .itemOutputs(ItemList.Block_IridiumTungstensteel.get(1)) + .fluidInputs(Materials.Iridium.getMolten(144)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sChemicalBathRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1)) - .itemOutputs(ItemList.Block_NaquadahPlate.get(1)).fluidInputs(Materials.Osmium.getMolten(144)) - .noFluidOutputs().duration(22 * SECONDS + 10 * TICKS).eut(256).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1)) + .itemOutputs(ItemList.Block_NaquadahPlate.get(1)) + .fluidInputs(Materials.Osmium.getMolten(144)) + .noFluidOutputs() + .duration(22 * SECONDS + 10 * TICKS) + .eut(256) + .addTo(sChemicalBathRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1)) - .itemOutputs(ItemList.Block_NeutroniumPlate.get(1)).fluidInputs(Materials.Naquadria.getMolten(144)) - .noFluidOutputs().duration(25 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1)) + .itemOutputs(ItemList.Block_NeutroniumPlate.get(1)) + .fluidInputs(Materials.Naquadria.getMolten(144)) + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sChemicalBathRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1)) - .itemOutputs(ItemList.Block_TungstenSteelReinforced.get(1)) - .fluidInputs(Materials.Concrete.getMolten(144)).noFluidOutputs().duration(10 * SECONDS).eut(4) - .addTo(sChemicalBathRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1)) + .itemOutputs(ItemList.Block_TungstenSteelReinforced.get(1)) + .fluidInputs(Materials.Concrete.getMolten(144)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(4) + .addTo(sChemicalBathRecipes); } for (int j = 0; j < Dyes.dyeRed.getSizeOfFluidList(); j++) { - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) - .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 0)) - .fluidInputs(Dyes.dyeRed.getFluidDye(j, 72)).noFluidOutputs().duration(1 * SECONDS + 12 * TICKS) - .eut(16).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) + .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 0)) + .fluidInputs(Dyes.dyeRed.getFluidDye(j, 72)) + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(16) + .addTo(sChemicalBathRecipes); } for (int j = 0; j < Dyes.dyeBlue.getSizeOfFluidList(); j++) { - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) - .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 1)) - .fluidInputs(Dyes.dyeBlue.getFluidDye(j, 72)).noFluidOutputs().duration(1 * SECONDS + 12 * TICKS) - .eut(16).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) + .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 1)) + .fluidInputs(Dyes.dyeBlue.getFluidDye(j, 72)) + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(16) + .addTo(sChemicalBathRecipes); } for (int j = 0; j < Dyes.dyeGreen.getSizeOfFluidList(); j++) { - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) - .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 2)) - .fluidInputs(Dyes.dyeGreen.getFluidDye(j, 72)).noFluidOutputs().duration(1 * SECONDS + 12 * TICKS) - .eut(16).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) + .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 2)) + .fluidInputs(Dyes.dyeGreen.getFluidDye(j, 72)) + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(16) + .addTo(sChemicalBathRecipes); } for (int j = 0; j < Dyes.dyeYellow.getSizeOfFluidList(); j++) { - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) - .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 3)) - .fluidInputs(Dyes.dyeYellow.getFluidDye(j, 72)).noFluidOutputs().duration(1 * SECONDS + 12 * TICKS) - .eut(16).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.RedAlloy, 1)) + .itemOutputs(getModItem(BuildCraftTransport.modID, "pipeWire", 4L, 3)) + .fluidInputs(Dyes.dyeYellow.getFluidDye(j, 72)) + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(16) + .addTo(sChemicalBathRecipes); } for (byte i = 0; i < 16; i = (byte) (i + 1)) { for (int j = 0; j < Dyes.VALUES[i].getSizeOfFluidList(); j++) { if (i != 15) { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.wool, 1, 0)) - .itemOutputs(new ItemStack(Blocks.wool, 1, 15 - i)) - .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 72)).noFluidOutputs() - .duration(3 * SECONDS + 4 * TICKS).eut(2).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.wool, 1, 0)) + .itemOutputs(new ItemStack(Blocks.wool, 1, 15 - i)) + .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 72)) + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sChemicalBathRecipes); } - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.glass, 1, 0)) - .itemOutputs(new ItemStack(Blocks.stained_glass, 1, 15 - i)) - .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 18)).noFluidOutputs() - .duration(3 * SECONDS + 4 * TICKS).eut(2).addTo(sChemicalBathRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.hardened_clay, 1, 0)) - .itemOutputs(new ItemStack(Blocks.stained_hardened_clay, 1, 15 - i)) - .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 18)).noFluidOutputs() - .duration(3 * SECONDS + 4 * TICKS).eut(2).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.glass, 1, 0)) + .itemOutputs(new ItemStack(Blocks.stained_glass, 1, 15 - i)) + .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 18)) + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sChemicalBathRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.hardened_clay, 1, 0)) + .itemOutputs(new ItemStack(Blocks.stained_hardened_clay, 1, 15 - i)) + .fluidInputs(Dyes.VALUES[i].getFluidDye(j, 18)) + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sChemicalBathRecipes); } } // Rn relate quantum recipe - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderEye, 1)) - .itemOutputs(ItemList.QuantumEye.get(1)).fluidInputs(Materials.Radon.getGas(250)).noFluidOutputs() - .duration(24 * SECONDS).eut(384).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderEye, 1)) + .itemOutputs(ItemList.QuantumEye.get(1)) + .fluidInputs(Materials.Radon.getGas(250)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(384) + .addTo(sChemicalBathRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1)) - .itemOutputs(ItemList.QuantumStar.get(1)).fluidInputs(Materials.Radon.getGas(1250)).noFluidOutputs() - .duration(1 * MINUTES + 36 * SECONDS).eut(384).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1)) + .itemOutputs(ItemList.QuantumStar.get(1)) + .fluidInputs(Materials.Radon.getGas(1250)) + .noFluidOutputs() + .duration(1 * MINUTES + 36 * SECONDS) + .eut(384) + .addTo(sChemicalBathRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.WovenKevlar.get(1)) - .itemOutputs(MaterialsKevlar.Kevlar.getPlates(1)) - .fluidInputs(MaterialsKevlar.PolyurethaneResin.getFluid(1000)).noFluidOutputs().duration(60 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.WovenKevlar.get(1)) + .itemOutputs(MaterialsKevlar.Kevlar.getPlates(1)) + .fluidInputs(MaterialsKevlar.PolyurethaneResin.getFluid(1000)) + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sChemicalBathRecipes); // Na + H2O = NaOH + H - GT_Values.RA.stdBuilder().itemInputs(Materials.Sodium.getDust(1)) - .itemOutputs(Materials.SodiumHydroxide.getDust(3)).fluidInputs(Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.Hydrogen.getGas(1000)).duration(5 * SECONDS).eut(4).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Sodium.getDust(1)) + .itemOutputs(Materials.SodiumHydroxide.getDust(3)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(1000)) + .duration(5 * SECONDS) + .eut(4) + .addTo(sChemicalBathRecipes); // Custom Sodium Persulfate Ore Processing Recipes Materials[] materialList = new Materials[] { Materials.Tantalite, Materials.Pyrolusite, Materials.Quartzite, Materials.CertusQuartz, Materials.Bauxite, Materials.Thorium, Materials.Stibnite }; for (Materials material : materialList) { - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, material, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, material, 1), - Materials.Tantalum.getDust(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1)) - .outputChances(10000, 3000, 4000).fluidInputs(Materials.SodiumPersulfate.getFluid(100)) - .noFluidOutputs().duration(40 * SECONDS).eut(8).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, material, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, material, 1), + Materials.Tantalum.getDust(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1)) + .outputChances(10000, 3000, 4000) + .fluidInputs(Materials.SodiumPersulfate.getFluid(100)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(8) + .addTo(sChemicalBathRecipes); } - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1)) - .itemOutputs(getModItem(Railcraft.modID, "cube", 1, 8)).fluidInputs(Materials.Creosote.getFluid(100)) - .noFluidOutputs().duration(5 * SECONDS).eut(4).addTo(sChemicalBathRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 1)) + .itemOutputs(getModItem(Railcraft.modID, "cube", 1, 8)) + .fluidInputs(Materials.Creosote.getFluid(100)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(4) + .addTo(sChemicalBathRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java index ce0560ca1b..3f590b5f6d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java @@ -35,2417 +35,3897 @@ public class ChemicalRecipes implements Runnable { } public void registerBoth() { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.paper, 1), new ItemStack(Items.string, 1)) - .itemOutputs(GT_ModHandler.getIC2Item("dynamite", 1)).fluidInputs(Materials.Glyceryl.getFluid(500)) - .noFluidOutputs().duration(8 * SECONDS).eut(4).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.paper, 1), new ItemStack(Items.string, 1)) + .itemOutputs(GT_ModHandler.getIC2Item("dynamite", 1)) + .fluidInputs(Materials.Glyceryl.getFluid(500)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(4) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Indium, 1)) - .fluidInputs(new FluidStack(ItemList.sIndiumConcentrate, 8000)) - .fluidOutputs(new FluidStack(ItemList.sLeadZincSolution, 8000)).duration(2 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_HV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Indium, 1)) + .fluidInputs(new FluidStack(ItemList.sIndiumConcentrate, 8000)) + .fluidOutputs(new FluidStack(ItemList.sLeadZincSolution, 8000)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 36), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 1)) - .fluidInputs(new FluidStack(ItemList.sIndiumConcentrate, 72000)) - .fluidOutputs(new FluidStack(ItemList.sLeadZincSolution, 72000)).duration(22 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_HV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 36), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 1)) + .fluidInputs(new FluidStack(ItemList.sIndiumConcentrate, 72000)) + .fluidOutputs(new FluidStack(ItemList.sLeadZincSolution, 72000)) + .duration(22 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // Platinum Group Sludge chain GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pentlandite, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.PlatinumGroupSludge, 1)) - .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) - .fluidOutputs(new FluidStack(ItemList.sNickelSulfate, 2000)).duration(2 * SECONDS + 10 * TICKS).eut(30) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pentlandite, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.PlatinumGroupSludge, 1)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .fluidOutputs(new FluidStack(ItemList.sNickelSulfate, 2000)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(30) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.PlatinumGroupSludge, 1)) - .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) - .fluidOutputs(new FluidStack(ItemList.sBlueVitriol, 2000)).duration(2 * SECONDS + 10 * TICKS).eut(30) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.PlatinumGroupSludge, 1)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .fluidOutputs(new FluidStack(ItemList.sBlueVitriol, 2000)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(30) + .addTo(UniversalChemical); // Fe + 3HCl = FeCl3 + 3H GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), ItemList.Cell_Empty.get(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3)) - .fluidInputs(Materials.HydrochloricAcid.getFluid(3000)) - .fluidOutputs(Materials.IronIIIChloride.getFluid(1000)).duration(20 * SECONDS).eut(30) - .addTo(UniversalChemical); - + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), + ItemList.Cell_Empty.get(3)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(3000)) + .fluidOutputs(Materials.IronIIIChloride.getFluid(1000)) + .duration(20 * SECONDS) + .eut(30) + .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedGold, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 8)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thaumium, 16)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000)).noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GalaxySpace.modID, "item.UnknowCrystal", 4), Materials.Osmiridium.getDust(2)) - .itemOutputs(ItemList.Circuit_Chip_Stemcell.get(64)) - .fluidInputs(Materials.GrowthMediumSterilized.getFluid(1000)) - .fluidOutputs(getFluidStack("bacterialsludge", 1000)).duration(30 * SECONDS).eut(TierEU.RECIPE_LuV) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedGold, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 8)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thaumium, 16)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2coolant"), 1000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Chip_Stemcell.get(32), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CosmicNeutronium, 4)) - .itemOutputs(ItemList.Circuit_Chip_Biocell.get(32)) - .fluidInputs(Materials.BioMediumSterilized.getFluid(2000)).fluidOutputs(getFluidStack("mutagen", 2000)) - .duration(60 * SECONDS).eut(500000).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(GalaxySpace.modID, "item.UnknowCrystal", 4), Materials.Osmiridium.getDust(2)) + .itemOutputs(ItemList.Circuit_Chip_Stemcell.get(64)) + .fluidInputs(Materials.GrowthMediumSterilized.getFluid(1000)) + .fluidOutputs(getFluidStack("bacterialsludge", 1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Items.sugar), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plastic, 1)) - .itemOutputs(ItemList.GelledToluene.get(2)).fluidInputs(new FluidStack(ItemList.sToluene, 133)) - .noFluidOutputs().duration(7 * SECONDS).eut(192).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Items.sugar, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1)) - .itemOutputs(ItemList.GelledToluene.get(18)).fluidInputs(new FluidStack(ItemList.sToluene, 1197)) - .noFluidOutputs().duration(1 * MINUTES + 3 * SECONDS).eut(192).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.GelledToluene.get(4), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(new ItemStack(Blocks.tnt, 1)).fluidInputs(Materials.SulfuricAcid.getFluid(250)) - .noFluidOutputs().duration(10 * SECONDS).eut(24).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.GelledToluene.get(4), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getIC2Item("industrialTnt", 1)) - .fluidInputs(new FluidStack(ItemList.sNitrationMixture, 200)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(150)).duration(4 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1), - Materials.Empty.getCells(1)) - .fluidInputs(Materials.NatruralGas.getGas(16000)).fluidOutputs(Materials.Gas.getGas(16000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NatruralGas, 16), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 16)) - .fluidInputs(Materials.Hydrogen.getGas(2000)).fluidOutputs(Materials.HydricSulfide.getGas(1000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1), - Materials.Empty.getCells(1)) - .fluidInputs(Materials.SulfuricGas.getGas(16000)).fluidOutputs(Materials.Gas.getGas(16000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricGas, 16), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 16)) - .fluidInputs(Materials.Hydrogen.getGas(2000)).fluidOutputs(Materials.HydricSulfide.getGas(1000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1), - Materials.Empty.getCells(1)) - .fluidInputs(Materials.SulfuricNaphtha.getFluid(12000)).fluidOutputs(Materials.Naphtha.getFluid(12000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricNaphtha, 12), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 12)) - .fluidInputs(Materials.Hydrogen.getGas(2000)).fluidOutputs(Materials.HydricSulfide.getGas(1000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1), - Materials.Empty.getCells(1)) - .fluidInputs(Materials.SulfuricLightFuel.getFluid(12000)) - .fluidOutputs(Materials.LightFuel.getFluid(12000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricLightFuel, 12), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 12)) - .fluidInputs(Materials.Hydrogen.getGas(2000)).fluidOutputs(Materials.HydricSulfide.getGas(1000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1), - Materials.Empty.getCells(1)) - .fluidInputs(Materials.SulfuricHeavyFuel.getFluid(8000)) - .fluidOutputs(Materials.HeavyFuel.getFluid(8000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricHeavyFuel, 8), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 8)) - .fluidInputs(Materials.Hydrogen.getGas(2000)).fluidOutputs(Materials.HydricSulfide.getGas(1000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Potassium, 1)) - .fluidInputs(Materials.Naphtha.getFluid(576)).fluidOutputs(Materials.Polycaprolactam.getMolten(1296)) - .duration(32 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 9), - GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1)) - .fluidInputs(Materials.Naphtha.getFluid(5184)).fluidOutputs(Materials.Polycaprolactam.getMolten(11664)) - .duration(4 * MINUTES + 48 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - for (Fluid tFluid : new Fluid[] { FluidRegistry.WATER, GT_ModHandler.getDistilledWater(1L).getFluid() }) { - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(2)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + ItemList.Circuit_Chip_Stemcell.get(32), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CosmicNeutronium, 4)) + .itemOutputs(ItemList.Circuit_Chip_Biocell.get(32)) + .fluidInputs(Materials.BioMediumSterilized.getFluid(2000)) + .fluidOutputs(getFluidStack("mutagen", 2000)) + .duration(60 * SECONDS) + .eut(500000) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(3)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + new ItemStack(Items.sugar), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plastic, 1)) + .itemOutputs(ItemList.GelledToluene.get(2)) + .fluidInputs(new FluidStack(ItemList.sToluene, 133)) + .noFluidOutputs() + .duration(7 * SECONDS) + .eut(192) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(2)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + new ItemStack(Items.sugar, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 1)) + .itemOutputs(ItemList.GelledToluene.get(18)) + .fluidInputs(new FluidStack(ItemList.sToluene, 1197)) + .noFluidOutputs() + .duration(1 * MINUTES + 3 * SECONDS) + .eut(192) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.GelledToluene.get(4), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(new ItemStack(Blocks.tnt, 1)) + .fluidInputs(Materials.SulfuricAcid.getFluid(250)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(24) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.GelledToluene.get(4), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getIC2Item("industrialTnt", 1)) + .fluidInputs(new FluidStack(ItemList.sNitrationMixture, 200)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(150)) + .duration(4 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) - .itemOutputs(ItemList.IC2_Fertilizer.get(1)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1), + Materials.Empty.getCells(1)) + .fluidInputs(Materials.NatruralGas.getGas(16000)) + .fluidOutputs(Materials.Gas.getGas(16000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(1)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NatruralGas, 16), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 16)) + .fluidInputs(Materials.Hydrogen.getGas(2000)) + .fluidOutputs(Materials.HydricSulfide.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(3)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1), + Materials.Empty.getCells(1)) + .fluidInputs(Materials.SulfuricGas.getGas(16000)) + .fluidOutputs(Materials.Gas.getGas(16000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(4)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricGas, 16), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 16)) + .fluidInputs(Materials.Hydrogen.getGas(2000)) + .fluidOutputs(Materials.HydricSulfide.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(3)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1), + Materials.Empty.getCells(1)) + .fluidInputs(Materials.SulfuricNaphtha.getFluid(12000)) + .fluidOutputs(Materials.Naphtha.getFluid(12000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) - .itemOutputs(ItemList.IC2_Fertilizer.get(2)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricNaphtha, 12), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 12)) + .fluidInputs(Materials.Hydrogen.getGas(2000)) + .fluidOutputs(Materials.HydricSulfide.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(2)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1), + Materials.Empty.getCells(1)) + .fluidInputs(Materials.SulfuricLightFuel.getFluid(12000)) + .fluidOutputs(Materials.LightFuel.getFluid(12000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(3)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricLightFuel, 12), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 12)) + .fluidInputs(Materials.Hydrogen.getGas(2000)) + .fluidOutputs(Materials.HydricSulfide.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(4)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1), + Materials.Empty.getCells(1)) + .fluidInputs(Materials.SulfuricHeavyFuel.getFluid(8000)) + .fluidOutputs(Materials.HeavyFuel.getFluid(8000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(3)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricHeavyFuel, 8), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 8)) + .fluidInputs(Materials.Hydrogen.getGas(2000)) + .fluidOutputs(Materials.HydricSulfide.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) - .itemOutputs(ItemList.IC2_Fertilizer.get(2)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Potassium, 1)) + .fluidInputs(Materials.Naphtha.getFluid(576)) + .fluidOutputs(Materials.Polycaprolactam.getMolten(1296)) + .duration(32 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(2)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 9), + GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1)) + .fluidInputs(Materials.Naphtha.getFluid(5184)) + .fluidOutputs(Materials.Polycaprolactam.getMolten(11664)) + .duration(4 * MINUTES + 48 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + for (Fluid tFluid : new Fluid[] { FluidRegistry.WATER, GT_ModHandler.getDistilledWater(1L) + .getFluid() }) { GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(3)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(2)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(4)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(3)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(3)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(2)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) - .itemOutputs(ItemList.IC2_Fertilizer.get(2)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) + .itemOutputs(ItemList.IC2_Fertilizer.get(1)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(2)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(1)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(3)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(3)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(4)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(4)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(3)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(3)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) - .itemOutputs(ItemList.IC2_Fertilizer.get(2)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) + .itemOutputs(ItemList.IC2_Fertilizer.get(2)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1)) - .itemOutputs(ItemList.IC2_Fertilizer.get(2)).fluidInputs(new FluidStack(tFluid, 1000)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(2)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(3)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(4)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(3)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) + .itemOutputs(ItemList.IC2_Fertilizer.get(2)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(2)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(3)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(4)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(3)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) + .itemOutputs(ItemList.IC2_Fertilizer.get(2)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(2)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(3)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(4)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(3)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) + .itemOutputs(ItemList.IC2_Fertilizer.get(2)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1)) + .itemOutputs(ItemList.IC2_Fertilizer.get(2)) + .fluidInputs(new FluidStack(tFluid, 1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); } // 3quartz dust + Na + H2O = 3quartz gem (Na loss GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 3)) - .fluidInputs(Materials.Water.getFluid(1000)).noFluidOutputs().duration(25 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 3)) + .fluidInputs(Materials.Water.getFluid(1000)) + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 3)) - .fluidInputs(Materials.Water.getFluid(1000)).noFluidOutputs().duration(25 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 3)) + .fluidInputs(Materials.Water.getFluid(1000)) + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Quartzite, 3)) - .fluidInputs(Materials.Water.getFluid(1000)).noFluidOutputs().duration(25 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Quartzite, 3)) + .fluidInputs(Materials.Water.getFluid(1000)) + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 3)) - .fluidInputs(GT_ModHandler.getDistilledWater(1000)).noFluidOutputs().duration(25 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 3)) + .fluidInputs(GT_ModHandler.getDistilledWater(1000)) + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 3)) - .fluidInputs(GT_ModHandler.getDistilledWater(1000)).noFluidOutputs().duration(25 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 3)) + .fluidInputs(GT_ModHandler.getDistilledWater(1000)) + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Quartzite, 3)) - .fluidInputs(GT_ModHandler.getDistilledWater(1000)).noFluidOutputs().duration(25 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Quartzite, 3)) + .fluidInputs(GT_ModHandler.getDistilledWater(1000)) + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // 3UO2 + 4Al = 3U + 2Al2O3 GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uraninite, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 10)) - .noFluidInputs().noFluidOutputs().duration(50 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uraninite, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 10)) + .noFluidInputs() + .noFluidOutputs() + .duration(50 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // UO2 + 2Mg = U + 2MgO GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uraninite, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4)) - .noFluidInputs().noFluidOutputs().duration(50 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uraninite, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(50 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // Ca + C + 3O = CaCO3 GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 5)) - .fluidInputs(Materials.Oxygen.getGas(3000)).noFluidOutputs().duration(25 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 5)) + .fluidInputs(Materials.Oxygen.getGas(3000)) + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // C + 4H = CH4 - GT_Values.RA.stdBuilder().itemInputs(Materials.Carbon.getDust(1), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().fluidInputs(Materials.Hydrogen.getGas(4000)) - .fluidOutputs(Materials.Methane.getGas(1000)).duration(10 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Carbon.getDust(1), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.Hydrogen.getGas(4000)) + .fluidOutputs(Materials.Methane.getGas(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // TiO2 + 2C + 4Cl = TiCl4 + 2CO GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Rutile, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Carbon, 2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.CarbonMonoxide, 2)) - .fluidInputs(Materials.Chlorine.getGas(4000)) - .fluidOutputs(Materials.Titaniumtetrachloride.getFluid(1000)).duration(20 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Rutile, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Carbon, 2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.CarbonMonoxide, 2)) + .fluidInputs(Materials.Chlorine.getGas(4000)) + .fluidOutputs(Materials.Titaniumtetrachloride.getFluid(1000)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Rutile, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 2)) - .noItemOutputs().fluidInputs(Materials.Chlorine.getGas(4000)) - .fluidOutputs(Materials.Titaniumtetrachloride.getFluid(1000)).duration(20 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Rutile, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 2)) + .noItemOutputs() + .fluidInputs(Materials.Chlorine.getGas(4000)) + .fluidOutputs(Materials.Titaniumtetrachloride.getFluid(1000)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // 4Na + 2MgCl2 = 2Mg + 4NaCl GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 6)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 8)) - .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 6)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 8)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // rubber GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Rubber.getMolten(1296)).duration(30 * SECONDS) - .eut(16).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Rubber.getMolten(1296)) + .duration(30 * SECONDS) + .eut(16) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Sulfur, 1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Rubber.getMolten(144)).duration(5 * SECONDS) - .eut(16).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Sulfur, 1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Rubber.getMolten(144)) + .duration(5 * SECONDS) + .eut(16) + .addTo(UniversalChemical); // vanilla recipe GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 8), - new ItemStack(Items.melon, 1, 32767)) - .itemOutputs(new ItemStack(Items.speckled_melon, 1, 0)).noFluidInputs().noFluidOutputs().duration(50) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 8), + new ItemStack(Items.melon, 1, 32767)) + .itemOutputs(new ItemStack(Items.speckled_melon, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(50) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 8), - new ItemStack(Items.carrot, 1, 32767)) - .itemOutputs(new ItemStack(Items.golden_carrot, 1, 0)).noFluidInputs().noFluidOutputs().duration(50) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Gold, 8), + new ItemStack(Items.carrot, 1, 32767)) + .itemOutputs(new ItemStack(Items.golden_carrot, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(50) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 8), - new ItemStack(Items.apple, 1, 32767)) - .itemOutputs(new ItemStack(Items.golden_apple, 1, 0)).noFluidInputs().noFluidOutputs().duration(50) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 8), + new ItemStack(Items.apple, 1, 32767)) + .itemOutputs(new ItemStack(Items.golden_apple, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(50) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Gold, 8), - new ItemStack(Items.apple, 1, 32767)) - .itemOutputs(new ItemStack(Items.golden_apple, 1, 1)).noFluidInputs().noFluidOutputs().duration(50) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Gold, 8), + new ItemStack(Items.apple, 1, 32767)) + .itemOutputs(new ItemStack(Items.golden_apple, 1, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(50) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderEye, 1)).noFluidInputs() - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderEye, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1), - new ItemStack(Items.slime_ball, 1, 32767)) - .itemOutputs(new ItemStack(Items.magma_cream, 1, 0)).noFluidInputs().noFluidOutputs().duration(50) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1), + new ItemStack(Items.slime_ball, 1, 32767)) + .itemOutputs(new ItemStack(Items.magma_cream, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(50) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // 1/9U +Air ==Pu== 0.1Rn GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Plutonium, 8), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 8)) - .fluidInputs(Materials.Air.getGas(1000)).fluidOutputs(Materials.Radon.getGas(100)) - .duration(10 * MINUTES).eut(8).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Plutonium, 8), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 8)) + .fluidInputs(Materials.Air.getGas(1000)) + .fluidOutputs(Materials.Radon.getGas(100)) + .duration(10 * MINUTES) + .eut(8) + .addTo(UniversalChemical); // Silicon Line // SiO2 + 2Mg = 2MgO + Si GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 6), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 6), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesia, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(UniversalChemical); // 3SiF4 + 4Al = 3Si + 4AlF3 GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.AluminiumFluoride, 16)) - .fluidInputs(Materials.SiliconTetrafluoride.getGas(3000)).noFluidOutputs().duration(30 * SECONDS) - .eut(30).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.AluminiumFluoride, 16)) + .fluidInputs(Materials.SiliconTetrafluoride.getGas(3000)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // SiO2 + 4HF = SiF4 + 2H2O GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3), - GT_Utility.getIntegratedCircuit(2)) - .noItemOutputs().fluidInputs(Materials.HydrofluoricAcid.getFluid(4000)) - .fluidOutputs(Materials.SiliconTetrafluoride.getGas(1000)).duration(15 * SECONDS).eut(30) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3), + GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000)) + .fluidOutputs(Materials.SiliconTetrafluoride.getGas(1000)) + .duration(15 * SECONDS) + .eut(30) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3), - GT_Utility.getIntegratedCircuit(2)) - .noItemOutputs().fluidInputs(Materials.HydrofluoricAcid.getFluid(4000)) - .fluidOutputs(Materials.SiliconTetrafluoride.getGas(1000)).duration(15 * SECONDS).eut(30) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 3), + GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000)) + .fluidOutputs(Materials.SiliconTetrafluoride.getGas(1000)) + .duration(15 * SECONDS) + .eut(30) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3), - GT_Utility.getIntegratedCircuit(2)) - .noItemOutputs().fluidInputs(Materials.HydrofluoricAcid.getFluid(4000)) - .fluidOutputs(Materials.SiliconTetrafluoride.getGas(1000)).duration(15 * SECONDS).eut(30) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 3), + GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000)) + .fluidOutputs(Materials.SiliconTetrafluoride.getGas(1000)) + .duration(15 * SECONDS) + .eut(30) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 6), - GT_Utility.getIntegratedCircuit(2)) - .noItemOutputs().fluidInputs(Materials.HydrofluoricAcid.getFluid(4000)) - .fluidOutputs(Materials.SiliconTetrafluoride.getGas(1000)).duration(15 * SECONDS).eut(30) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 6), + GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000)) + .fluidOutputs(Materials.SiliconTetrafluoride.getGas(1000)) + .duration(15 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // 4Na + SiCl4 = 4NaCl + Si GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 8)) - .fluidInputs(Materials.SiliconTetrachloride.getFluid(1000)).noFluidOutputs().duration(5 * SECONDS) - .eut(30).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Salt, 8)) + .fluidInputs(Materials.SiliconTetrachloride.getFluid(1000)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // HSiCl3 + 2H = 3HCl + Si GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), - ItemList.Cell_Empty.get(2)) - .fluidInputs(Materials.Trichlorosilane.getFluid(1000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(3000)).duration(15 * SECONDS).eut(30) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), + ItemList.Cell_Empty.get(2)) + .fluidInputs(Materials.Trichlorosilane.getFluid(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(3000)) + .duration(15 * SECONDS) + .eut(30) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Trichlorosilane, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), - ItemList.Cell_Empty.get(1)) - .fluidInputs(Materials.Hydrogen.getGas(2000)).fluidOutputs(Materials.HydrochloricAcid.getFluid(3000)) - .duration(15 * SECONDS).eut(30).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Trichlorosilane, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), + ItemList.Cell_Empty.get(1)) + .fluidInputs(Materials.Hydrogen.getGas(2000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(3000)) + .duration(15 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // 4HSiCl3 = 3SiCl4 + SiH4 - GT_Values.RA.stdBuilder().itemInputs(ItemList.Cell_Empty.get(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Silane, 1)) - .fluidInputs(Materials.Trichlorosilane.getFluid(4000)) - .fluidOutputs(Materials.SiliconTetrachloride.getFluid(3000)).duration(12 * SECONDS).eut(30) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Cell_Empty.get(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Silane, 1)) + .fluidInputs(Materials.Trichlorosilane.getFluid(4000)) + .fluidOutputs(Materials.SiliconTetrachloride.getFluid(3000)) + .duration(12 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // SiH4 = Si + 4H - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1)) - .fluidInputs(Materials.Silane.getGas(1000)).fluidOutputs(Materials.Hydrogen.getGas(4000)) - .duration(15 * SECONDS).eut(30).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1)) + .fluidInputs(Materials.Silane.getGas(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(4000)) + .duration(15 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // Ca + 2H = CaH2 GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calciumhydride, 3)) - .fluidInputs(Materials.Hydrogen.getGas(2000)).noFluidOutputs().duration(20 * SECONDS).eut(30) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calciumhydride, 3)) + .fluidInputs(Materials.Hydrogen.getGas(2000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // Si + 4Cl = SiCl4 GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), - GT_Utility.getIntegratedCircuit(2)) - .noItemOutputs().fluidInputs(Materials.Chlorine.getGas(4000)) - .fluidOutputs(Materials.SiliconTetrachloride.getFluid(1000)).duration(20 * SECONDS).eut(30) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), + GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs(Materials.Chlorine.getGas(4000)) + .fluidOutputs(Materials.SiliconTetrachloride.getFluid(1000)) + .duration(20 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // 2Na + S = Na2S - GT_Values.RA.stdBuilder().itemInputs(Materials.Sodium.getDust(2), Materials.Sulfur.getDust(1)) - .itemOutputs(Materials.SodiumSulfide.getDust(3)).noFluidInputs().noFluidOutputs().duration(60) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Sodium.getDust(2), Materials.Sulfur.getDust(1)) + .itemOutputs(Materials.SodiumSulfide.getDust(3)) + .noFluidInputs() + .noFluidOutputs() + .duration(60) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // H2S + H2O + (O2) = 0.5H2SO4(Diluted) ( S loss - GT_Values.RA.stdBuilder().itemInputs(Materials.HydricSulfide.getCells(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(750)).duration(3 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydricSulfide.getCells(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(750)) + .duration(3 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1)).itemOutputs(Materials.Empty.getCells(1)) - .fluidInputs(Materials.HydricSulfide.getGas(1000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(750)).duration(3 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Water.getCells(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.HydricSulfide.getGas(1000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(750)) + .duration(3 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // Ni + 4CO = Ni(CO)4 GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.CarbonMonoxide, 4)) - .itemOutputs(ItemList.Cell_Empty.get(4)).noFluidInputs() - .fluidOutputs(MaterialsKevlar.NickelTetracarbonyl.getFluid(1000)).duration(20 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.CarbonMonoxide, 4)) + .itemOutputs(ItemList.Cell_Empty.get(4)) + .noFluidInputs() + .fluidOutputs(MaterialsKevlar.NickelTetracarbonyl.getFluid(1000)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), - GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().fluidInputs(Materials.CarbonMonoxide.getGas(4000)) - .fluidOutputs(MaterialsKevlar.NickelTetracarbonyl.getFluid(1000)).duration(20 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), + GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.CarbonMonoxide.getGas(4000)) + .fluidOutputs(MaterialsKevlar.NickelTetracarbonyl.getFluid(1000)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), ItemList.Cell_Empty.get(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.NickelTetracarbonyl, 1)) - .fluidInputs(Materials.CarbonMonoxide.getGas(4000)).noFluidOutputs().duration(20 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), + ItemList.Cell_Empty.get(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.NickelTetracarbonyl, 1)) + .fluidInputs(Materials.CarbonMonoxide.getGas(4000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(UniversalChemical); // C2H4O + H2O = C2H6O2 GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.EthyleneOxide, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Cell_Empty.get(1)).fluidInputs(Materials.Water.getFluid(1000)) - .fluidOutputs(MaterialsKevlar.Ethyleneglycol.getFluid(1000)).duration(10 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.EthyleneOxide, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cell_Empty.get(1)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(MaterialsKevlar.Ethyleneglycol.getFluid(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // C2H4 + O = C2H4O GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethylene, 2), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(ItemList.Cell_Empty.get(2)).fluidInputs(Materials.Oxygen.getGas(1000)) - .fluidOutputs(MaterialsKevlar.Acetaldehyde.getGas(1000)).duration(10 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethylene, 2), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(ItemList.Cell_Empty.get(2)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .fluidOutputs(MaterialsKevlar.Acetaldehyde.getGas(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1), - GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(ItemList.Cell_Empty.get(1)).fluidInputs(Materials.Ethylene.getGas(2000)) - .fluidOutputs(MaterialsKevlar.Acetaldehyde.getGas(1000)).duration(10 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1), + GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(ItemList.Cell_Empty.get(1)) + .fluidInputs(Materials.Ethylene.getGas(2000)) + .fluidOutputs(MaterialsKevlar.Acetaldehyde.getGas(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // NiAl3 + 2NaOH + 2H2O = NiAl + 2NaAlO2 + 6H GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, MaterialsKevlar.NickelAluminide, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RaneyNickelActivated, 2), - Materials.SodiumAluminate.getDust(8)) - .fluidInputs(Materials.Water.getFluid(2000)).fluidOutputs(Materials.Hydrogen.getGas(6000)) - .duration(60 * SECONDS).eut(TierEU.RECIPE_EV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, MaterialsKevlar.NickelAluminide, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RaneyNickelActivated, 2), + Materials.SodiumAluminate.getDust(8)) + .fluidInputs(Materials.Water.getFluid(2000)) + .fluidOutputs(Materials.Hydrogen.getGas(6000)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(UniversalChemical); // Cu + O = CuO GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 2), - ItemList.Cell_Empty.get(1)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(30).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 2), + ItemList.Cell_Empty.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(30) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 2)) - .fluidInputs(Materials.Oxygen.getGas(1000)).noFluidOutputs().duration(5 * SECONDS).eut(30) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 2)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // 2Bi + 3O = Bi2O3 GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 4), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 6)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 10), - ItemList.Cell_Empty.get(6)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 4), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 6)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 10), + ItemList.Cell_Empty.get(6)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 10)) - .fluidInputs(Materials.Oxygen.getGas(6000)).noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 10)) + .fluidInputs(Materials.Oxygen.getGas(6000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // C4H6O2 + CNH5 = C5H9NO + H2O GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Methylamine, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.GammaButyrolactone, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.NMethylIIPyrrolidone, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1)) - .noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(TierEU.RECIPE_IV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Methylamine, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.GammaButyrolactone, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.NMethylIIPyrrolidone, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8), - GT_Utility.getIntegratedCircuit(2)) - .noItemOutputs().fluidInputs(Materials.Chlorine.getGas(16000)) - .fluidOutputs(MaterialsKevlar.SulfurDichloride.getFluid(8000)).duration(40 * SECONDS).eut(30) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8), + GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs(Materials.Chlorine.getGas(16000)) + .fluidOutputs(MaterialsKevlar.SulfurDichloride.getFluid(8000)) + .duration(40 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // SCl2 + SO3 = SO2 + SOCl2 GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfurTrioxide, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.ThionylChloride, 1), - ItemList.Cell_Empty.get(1)) - .noFluidInputs().fluidOutputs(Materials.SulfurDioxide.getGas(1000)).duration(7 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_HV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfurTrioxide, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.ThionylChloride, 1), + ItemList.Cell_Empty.get(1)) + .noFluidInputs() + .fluidOutputs(Materials.SulfurDioxide.getGas(1000)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // C8H10 + 6O =CoC22H14O4= C8H6O4 + 2H2O GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.IVDimethylbenzene, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIINaphthenate, 41)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.TerephthalicAcid, 1)) - .fluidInputs(Materials.Oxygen.getGas(6000)).fluidOutputs(Materials.Water.getFluid(2000)) - .duration(7 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.IVDimethylbenzene, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIINaphthenate, 41)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.TerephthalicAcid, 1)) + .fluidInputs(Materials.Oxygen.getGas(6000)) + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // 2CH4 + C6H6 = C8H10 + 4H - GT_Values.RA.stdBuilder().itemInputs(Materials.Methane.getCells(2), GT_Utility.getIntegratedCircuit(13)) - .itemOutputs(MaterialsKevlar.IIIDimethylbenzene.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Benzene.getFluid(1000)).fluidOutputs(Materials.Hydrogen.getGas(4000)) - .duration(3 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methane.getCells(2), GT_Utility.getIntegratedCircuit(13)) + .itemOutputs(MaterialsKevlar.IIIDimethylbenzene.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Benzene.getFluid(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(4000)) + .duration(3 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(14)) - .itemOutputs(MaterialsKevlar.IIIDimethylbenzene.getCells(1)).fluidInputs(Materials.Methane.getGas(2000)) - .fluidOutputs(Materials.Hydrogen.getGas(4000)).duration(3 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(14)) + .itemOutputs(MaterialsKevlar.IIIDimethylbenzene.getCells(1)) + .fluidInputs(Materials.Methane.getGas(2000)) + .fluidOutputs(Materials.Hydrogen.getGas(4000)) + .duration(3 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // 2CH4 + C6H6 = C8H10 + 4H - GT_Values.RA.stdBuilder().itemInputs(Materials.Methane.getCells(2), GT_Utility.getIntegratedCircuit(15)) - .itemOutputs(MaterialsKevlar.IVDimethylbenzene.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Benzene.getFluid(1000)).fluidOutputs(Materials.Hydrogen.getGas(4000)) - .duration(3 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methane.getCells(2), GT_Utility.getIntegratedCircuit(15)) + .itemOutputs(MaterialsKevlar.IVDimethylbenzene.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Benzene.getFluid(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(4000)) + .duration(3 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(16)) - .itemOutputs(MaterialsKevlar.IVDimethylbenzene.getCells(1)).fluidInputs(Materials.Methane.getGas(2000)) - .fluidOutputs(Materials.Hydrogen.getGas(4000)).duration(3 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(16)) + .itemOutputs(MaterialsKevlar.IVDimethylbenzene.getCells(1)) + .fluidInputs(Materials.Methane.getGas(2000)) + .fluidOutputs(Materials.Hydrogen.getGas(4000)) + .duration(3 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(MaterialsKevlar.CobaltIIHydroxide.getDust(5), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(MaterialsKevlar.CobaltIINaphthenate.getDust(41)) - .fluidInputs(MaterialsKevlar.NaphthenicAcid.getFluid(1000)).noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(UniversalChemical); + .itemInputs(MaterialsKevlar.CobaltIIHydroxide.getDust(5), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(MaterialsKevlar.CobaltIINaphthenate.getDust(41)) + .fluidInputs(MaterialsKevlar.NaphthenicAcid.getFluid(1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(MaterialsKevlar.CobaltIIAcetate.getDust(15), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(MaterialsKevlar.CobaltIINaphthenate.getDust(41)) - .fluidInputs(MaterialsKevlar.NaphthenicAcid.getFluid(1000)) - .fluidOutputs(Materials.AceticAcid.getFluid(1500)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(UniversalChemical); + .itemInputs(MaterialsKevlar.CobaltIIAcetate.getDust(15), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(MaterialsKevlar.CobaltIINaphthenate.getDust(41)) + .fluidInputs(MaterialsKevlar.NaphthenicAcid.getFluid(1000)) + .fluidOutputs(Materials.AceticAcid.getFluid(1500)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // Co + 2HNO3 = Co(NO3)2 + 2H - GT_Values.RA.stdBuilder().itemInputs(Materials.Cobalt.getDust(1), Materials.NitricAcid.getCells(2)) - .itemOutputs( - MaterialsKevlar.CobaltIINitrate.getDust(9), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Cobalt.getDust(1), Materials.NitricAcid.getCells(2)) + .itemOutputs( + MaterialsKevlar.CobaltIINitrate.getDust(9), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // Co(NO3)2 + 2KOH = CoH2O2 + 2KNO3 GT_Values.RA.stdBuilder() - .itemInputs( - MaterialsKevlar.CobaltIINitrate.getDust(9), - getModItem(NewHorizonsCoreMod.modID, "item.PotassiumHydroxideDust", 6L, 0)) - .itemOutputs(MaterialsKevlar.CobaltIIHydroxide.getDust(5), Materials.Saltpeter.getDust(10)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + .itemInputs( + MaterialsKevlar.CobaltIINitrate.getDust(9), + getModItem(NewHorizonsCoreMod.modID, "item.PotassiumHydroxideDust", 6L, 0)) + .itemOutputs(MaterialsKevlar.CobaltIIHydroxide.getDust(5), Materials.Saltpeter.getDust(10)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // CoO + 2C2H4O2 = CoC4H6O4 + 2H - GT_Values.RA.stdBuilder().itemInputs(Materials.CobaltOxide.getDust(2), Materials.AceticAcid.getCells(2)) - .itemOutputs(MaterialsKevlar.CobaltIIAcetate.getDust(15), ItemList.Cell_Empty.get(2)).noFluidInputs() - .fluidOutputs(Materials.Water.getFluid(2000)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.CobaltOxide.getDust(2), Materials.AceticAcid.getCells(2)) + .itemOutputs(MaterialsKevlar.CobaltIIAcetate.getDust(15), ItemList.Cell_Empty.get(2)) + .noFluidInputs() + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Phosphorus.getDust(1), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().fluidInputs(Materials.Chlorine.getGas(3000)) - .fluidOutputs(MaterialsKevlar.PhosphorusTrichloride.getFluid(1000)).duration(10 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Phosphorus.getDust(1), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.Chlorine.getGas(3000)) + .fluidOutputs(MaterialsKevlar.PhosphorusTrichloride.getFluid(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Phosphorus.getDust(9), GT_Utility.getIntegratedCircuit(9)) - .noItemOutputs().fluidInputs(Materials.Chlorine.getGas(27000)) - .fluidOutputs(MaterialsKevlar.PhosphorusTrichloride.getFluid(9000)).duration(1 * MINUTES + 15 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Phosphorus.getDust(9), GT_Utility.getIntegratedCircuit(9)) + .noItemOutputs() + .fluidInputs(Materials.Chlorine.getGas(27000)) + .fluidOutputs(MaterialsKevlar.PhosphorusTrichloride.getFluid(9000)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // Na + H = NaH - GT_Values.RA.stdBuilder().itemInputs(Materials.Sodium.getDust(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(MaterialsKevlar.SodiumHydride.getDust(2)).fluidInputs(Materials.Hydrogen.getGas(1000)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Sodium.getDust(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(MaterialsKevlar.SodiumHydride.getDust(2)) + .fluidInputs(Materials.Hydrogen.getGas(1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // CH3ONa + H2O = CH4O + NaOH GT_Values.RA.stdBuilder() - .itemInputs(MaterialsKevlar.SodiumMethoxide.getDust(6), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.SodiumHydroxide.getDust(3)).fluidInputs(Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.Methanol.getFluid(1000)).duration(10 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(UniversalChemical); + .itemInputs(MaterialsKevlar.SodiumMethoxide.getDust(6), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.SodiumHydroxide.getDust(3)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.Methanol.getFluid(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // K + HNO3 = KNO3 + H (not real, but gameplay - GT_Values.RA.stdBuilder().itemInputs(Materials.Potassium.getDust(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Saltpeter.getDust(5)).fluidInputs(Materials.NitricAcid.getFluid(1000)) - .fluidOutputs(Materials.Hydrogen.getGas(1000)).duration(5 * SECONDS).eut(30).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Potassium.getDust(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Saltpeter.getDust(5)) + .fluidInputs(Materials.NitricAcid.getFluid(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(1000)) + .duration(5 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // CH3COOH + CH3OH = CH3COOCH3 + H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Water.getCells(1)).fluidInputs(Materials.Methanol.getFluid(1000)) - .fluidOutputs(Materials.MethylAcetate.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Water.getCells(1)) + .fluidInputs(Materials.Methanol.getFluid(1000)) + .fluidOutputs(Materials.MethylAcetate.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Water.getCells(1)).fluidInputs(Materials.AceticAcid.getFluid(1000)) - .fluidOutputs(Materials.MethylAcetate.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Water.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(1000)) + .fluidOutputs(Materials.MethylAcetate.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Methanol.getFluid(1000)) - .fluidOutputs(Materials.MethylAcetate.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Methanol.getFluid(1000)) + .fluidOutputs(Materials.MethylAcetate.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.AceticAcid.getFluid(1000)) - .fluidOutputs(Materials.MethylAcetate.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(1000)) + .fluidOutputs(Materials.MethylAcetate.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.MethylAcetate.getCells(1)).fluidInputs(Materials.Methanol.getFluid(1000)) - .fluidOutputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.MethylAcetate.getCells(1)) + .fluidInputs(Materials.Methanol.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.MethylAcetate.getCells(1)).fluidInputs(Materials.AceticAcid.getFluid(1000)) - .fluidOutputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.MethylAcetate.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.MethylAcetate.getCells(1)).fluidInputs(Materials.Methanol.getFluid(1000)) - .noFluidOutputs().duration(12 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.MethylAcetate.getCells(1)) + .fluidInputs(Materials.Methanol.getFluid(1000)) + .noFluidOutputs() + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.MethylAcetate.getCells(1)).fluidInputs(Materials.AceticAcid.getFluid(1000)) - .noFluidOutputs().duration(12 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.MethylAcetate.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(1000)) + .noFluidOutputs() + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // CO and CO2 recipes - GT_Values.RA.stdBuilder().itemInputs(Materials.Carbon.getDust(1), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().fluidInputs(Materials.Oxygen.getGas(1000)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)).duration(2 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Coal.getGems(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Ash.getDustTiny(1)).fluidInputs(Materials.Oxygen.getGas(1000)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)).duration(4 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Coal.getDust(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Ash.getDustTiny(1)).fluidInputs(Materials.Oxygen.getGas(1000)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)).duration(4 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Charcoal.getGems(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Ash.getDustTiny(1)).fluidInputs(Materials.Oxygen.getGas(1000)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)).duration(4 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Charcoal.getDust(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Ash.getDustTiny(1)).fluidInputs(Materials.Oxygen.getGas(1000)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)).duration(4 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Carbon.getDust(1), GT_Utility.getIntegratedCircuit(2)) - .noItemOutputs().fluidInputs(Materials.Oxygen.getGas(2000)) - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(2 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Coal.getGems(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Ash.getDustTiny(1)).fluidInputs(Materials.Oxygen.getGas(2000)) - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(2 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Coal.getDust(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Ash.getDustTiny(1)).fluidInputs(Materials.Oxygen.getGas(2000)) - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(2 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Charcoal.getGems(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Ash.getDustTiny(1)).fluidInputs(Materials.Oxygen.getGas(2000)) - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(2 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Charcoal.getDust(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Ash.getDustTiny(1)).fluidInputs(Materials.Oxygen.getGas(2000)) - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(2 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Carbon.getDust(1)).noItemOutputs() - .fluidInputs(Materials.CarbonDioxide.getGas(1000)).fluidOutputs(Materials.CarbonMonoxide.getGas(2000)) - .duration(40 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Coal.getGems(9), GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(Materials.Ash.getDust(1)).fluidInputs(Materials.Oxygen.getGas(9000)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(9000)).duration(36 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Coal.getDust(9), GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(Materials.Ash.getDust(1)).fluidInputs(Materials.Oxygen.getGas(9000)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(9000)).duration(36 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Charcoal.getGems(9), GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(Materials.Ash.getDust(1)).fluidInputs(Materials.Oxygen.getGas(9000)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(9000)).duration(36 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Charcoal.getDust(9), GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(Materials.Ash.getDust(1)).fluidInputs(Materials.Oxygen.getGas(9000)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(9000)).duration(36 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Coal.getGems(9), GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(Materials.Ash.getDust(1)).fluidInputs(Materials.Oxygen.getGas(18000)) - .fluidOutputs(Materials.CarbonDioxide.getGas(9000)).duration(18 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Coal.getDust(9), GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(Materials.Ash.getDust(1)).fluidInputs(Materials.Oxygen.getGas(18000)) - .fluidOutputs(Materials.CarbonDioxide.getGas(9000)).duration(18 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Charcoal.getGems(9), GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(Materials.Ash.getDust(1)).fluidInputs(Materials.Oxygen.getGas(18000)) - .fluidOutputs(Materials.CarbonDioxide.getGas(9000)).duration(18 * SECONDS).eut(8) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Charcoal.getDust(9), GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(Materials.Ash.getDust(1)).fluidInputs(Materials.Oxygen.getGas(18000)) - .fluidOutputs(Materials.CarbonDioxide.getGas(9000)).duration(18 * SECONDS).eut(8) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Carbon.getDust(1), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.Oxygen.getGas(1000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)) + .duration(2 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Coal.getGems(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Ash.getDustTiny(1)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)) + .duration(4 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Coal.getDust(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Ash.getDustTiny(1)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)) + .duration(4 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Charcoal.getGems(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Ash.getDustTiny(1)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)) + .duration(4 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Charcoal.getDust(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Ash.getDustTiny(1)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)) + .duration(4 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Carbon.getDust(1), GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs(Materials.Oxygen.getGas(2000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(2 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Coal.getGems(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Ash.getDustTiny(1)) + .fluidInputs(Materials.Oxygen.getGas(2000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(2 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Coal.getDust(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Ash.getDustTiny(1)) + .fluidInputs(Materials.Oxygen.getGas(2000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(2 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Charcoal.getGems(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Ash.getDustTiny(1)) + .fluidInputs(Materials.Oxygen.getGas(2000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(2 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Charcoal.getDust(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Ash.getDustTiny(1)) + .fluidInputs(Materials.Oxygen.getGas(2000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(2 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Carbon.getDust(1)) + .noItemOutputs() + .fluidInputs(Materials.CarbonDioxide.getGas(1000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(2000)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Coal.getGems(9), GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(Materials.Ash.getDust(1)) + .fluidInputs(Materials.Oxygen.getGas(9000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(9000)) + .duration(36 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Coal.getDust(9), GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(Materials.Ash.getDust(1)) + .fluidInputs(Materials.Oxygen.getGas(9000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(9000)) + .duration(36 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Charcoal.getGems(9), GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(Materials.Ash.getDust(1)) + .fluidInputs(Materials.Oxygen.getGas(9000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(9000)) + .duration(36 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Charcoal.getDust(9), GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(Materials.Ash.getDust(1)) + .fluidInputs(Materials.Oxygen.getGas(9000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(9000)) + .duration(36 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Coal.getGems(9), GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(Materials.Ash.getDust(1)) + .fluidInputs(Materials.Oxygen.getGas(18000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(9000)) + .duration(18 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Coal.getDust(9), GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(Materials.Ash.getDust(1)) + .fluidInputs(Materials.Oxygen.getGas(18000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(9000)) + .duration(18 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Charcoal.getGems(9), GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(Materials.Ash.getDust(1)) + .fluidInputs(Materials.Oxygen.getGas(18000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(9000)) + .duration(18 * SECONDS) + .eut(8) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Charcoal.getDust(9), GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(Materials.Ash.getDust(1)) + .fluidInputs(Materials.Oxygen.getGas(18000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(9000)) + .duration(18 * SECONDS) + .eut(8) + .addTo(UniversalChemical); // CO + 4H = CH3OH - GT_Values.RA.stdBuilder().itemInputs(Materials.CarbonMonoxide.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Hydrogen.getGas(4000)) - .fluidOutputs(Materials.Methanol.getFluid(1000)).duration(6 * SECONDS).eut(96).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.CarbonMonoxide.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Hydrogen.getGas(4000)) + .fluidOutputs(Materials.Methanol.getFluid(1000)) + .duration(6 * SECONDS) + .eut(96) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Hydrogen.getCells(4), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(4)).fluidInputs(Materials.CarbonMonoxide.getGas(1000)) - .fluidOutputs(Materials.Methanol.getFluid(1000)).duration(6 * SECONDS).eut(96).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Hydrogen.getCells(4), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(4)) + .fluidInputs(Materials.CarbonMonoxide.getGas(1000)) + .fluidOutputs(Materials.Methanol.getFluid(1000)) + .duration(6 * SECONDS) + .eut(96) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.CarbonMonoxide.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Methanol.getCells(1)).fluidInputs(Materials.Hydrogen.getGas(4000)) - .noFluidOutputs().duration(6 * SECONDS).eut(96).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.CarbonMonoxide.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Methanol.getCells(1)) + .fluidInputs(Materials.Hydrogen.getGas(4000)) + .noFluidOutputs() + .duration(6 * SECONDS) + .eut(96) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Hydrogen.getCells(4), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Methanol.getCells(1), Materials.Empty.getCells(3)) - .fluidInputs(Materials.CarbonMonoxide.getGas(1000)).noFluidOutputs().duration(6 * SECONDS).eut(96) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Hydrogen.getCells(4), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Methanol.getCells(1), Materials.Empty.getCells(3)) + .fluidInputs(Materials.CarbonMonoxide.getGas(1000)) + .noFluidOutputs() + .duration(6 * SECONDS) + .eut(96) + .addTo(UniversalChemical); // CO2 + 6H = CH3OH + H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.CarbonDioxide.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Water.getCells(1)).fluidInputs(Materials.Hydrogen.getGas(6000)) - .fluidOutputs(Materials.Methanol.getFluid(1000)).duration(6 * SECONDS).eut(96).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.CarbonDioxide.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Water.getCells(1)) + .fluidInputs(Materials.Hydrogen.getGas(6000)) + .fluidOutputs(Materials.Methanol.getFluid(1000)) + .duration(6 * SECONDS) + .eut(96) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Hydrogen.getCells(6), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(5)) - .fluidInputs(Materials.CarbonDioxide.getGas(1000)).fluidOutputs(Materials.Methanol.getFluid(1000)) - .duration(6 * SECONDS).eut(96).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Hydrogen.getCells(6), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(5)) + .fluidInputs(Materials.CarbonDioxide.getGas(1000)) + .fluidOutputs(Materials.Methanol.getFluid(1000)) + .duration(6 * SECONDS) + .eut(96) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.CarbonDioxide.getCells(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Hydrogen.getGas(6000)) - .fluidOutputs(Materials.Methanol.getFluid(1000)).duration(6 * SECONDS).eut(96).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.CarbonDioxide.getCells(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Hydrogen.getGas(6000)) + .fluidOutputs(Materials.Methanol.getFluid(1000)) + .duration(6 * SECONDS) + .eut(96) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Hydrogen.getCells(6), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(6)).fluidInputs(Materials.CarbonDioxide.getGas(1000)) - .fluidOutputs(Materials.Methanol.getFluid(1000)).duration(6 * SECONDS).eut(96).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Hydrogen.getCells(6), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(6)) + .fluidInputs(Materials.CarbonDioxide.getGas(1000)) + .fluidOutputs(Materials.Methanol.getFluid(1000)) + .duration(6 * SECONDS) + .eut(96) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.CarbonDioxide.getCells(1), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.Methanol.getCells(1)).fluidInputs(Materials.Hydrogen.getGas(6000)) - .noFluidOutputs().duration(6 * SECONDS).eut(96).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.CarbonDioxide.getCells(1), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.Methanol.getCells(1)) + .fluidInputs(Materials.Hydrogen.getGas(6000)) + .noFluidOutputs() + .duration(6 * SECONDS) + .eut(96) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Hydrogen.getCells(6), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.Methanol.getCells(1), Materials.Empty.getCells(5)) - .fluidInputs(Materials.CarbonDioxide.getGas(1000)).noFluidOutputs().duration(6 * SECONDS).eut(96) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Hydrogen.getCells(6), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.Methanol.getCells(1), Materials.Empty.getCells(5)) + .fluidInputs(Materials.CarbonDioxide.getGas(1000)) + .noFluidOutputs() + .duration(6 * SECONDS) + .eut(96) + .addTo(UniversalChemical); // CH3OH + CO = CH3COOH - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.CarbonMonoxide.getGas(1000)) - .fluidOutputs(Materials.AceticAcid.getFluid(1000)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.CarbonMonoxide.getGas(1000)) + .fluidOutputs(Materials.AceticAcid.getFluid(1000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.CarbonMonoxide.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Methanol.getFluid(1000)) - .fluidOutputs(Materials.AceticAcid.getFluid(1000)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.CarbonMonoxide.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Methanol.getFluid(1000)) + .fluidOutputs(Materials.AceticAcid.getFluid(1000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.AceticAcid.getCells(1)).fluidInputs(Materials.CarbonMonoxide.getGas(1000)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.AceticAcid.getCells(1)) + .fluidInputs(Materials.CarbonMonoxide.getGas(1000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.CarbonMonoxide.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.AceticAcid.getCells(1)).fluidInputs(Materials.Methanol.getFluid(1000)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.CarbonMonoxide.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.AceticAcid.getCells(1)) + .fluidInputs(Materials.Methanol.getFluid(1000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // CH2CH2 + 2O = CH3COOH - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Oxygen.getGas(2000)) - .fluidOutputs(Materials.AceticAcid.getFluid(1000)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(2000)) + .fluidOutputs(Materials.AceticAcid.getFluid(1000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(9)) - .itemOutputs(Materials.Empty.getCells(2)).fluidInputs(Materials.Ethylene.getGas(1000)) - .fluidOutputs(Materials.AceticAcid.getFluid(1000)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(Materials.Empty.getCells(2)) + .fluidInputs(Materials.Ethylene.getGas(1000)) + .fluidOutputs(Materials.AceticAcid.getFluid(1000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(19)) - .itemOutputs(Materials.AceticAcid.getCells(1)).fluidInputs(Materials.Oxygen.getGas(2000)) - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(19)) + .itemOutputs(Materials.AceticAcid.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(2000)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(19)) - .itemOutputs(Materials.AceticAcid.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Ethylene.getGas(1000)).noFluidOutputs().duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(19)) + .itemOutputs(Materials.AceticAcid.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Ethylene.getGas(1000)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // O + C2H4O2 + C2H4 = C4H6O2 + H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethylene.getCells(1), Materials.AceticAcid.getCells(1)) - .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Oxygen.getGas(1000)).fluidOutputs(Materials.VinylAcetate.getFluid(1000)) - .duration(9 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethylene.getCells(1), Materials.AceticAcid.getCells(1)) + .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .fluidOutputs(Materials.VinylAcetate.getFluid(1000)) + .duration(9 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.AceticAcid.getCells(1), Materials.Oxygen.getCells(1)) - .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Ethylene.getGas(1000)).fluidOutputs(Materials.VinylAcetate.getFluid(1000)) - .duration(9 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.AceticAcid.getCells(1), Materials.Oxygen.getCells(1)) + .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Ethylene.getGas(1000)) + .fluidOutputs(Materials.VinylAcetate.getFluid(1000)) + .duration(9 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(1), Materials.Ethylene.getCells(1)) - .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.AceticAcid.getFluid(1000)).fluidOutputs(Materials.VinylAcetate.getFluid(1000)) - .duration(9 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(1), Materials.Ethylene.getCells(1)) + .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(1000)) + .fluidOutputs(Materials.VinylAcetate.getFluid(1000)) + .duration(9 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // Ethanol -> Ethylene (Intended loss for Sulfuric Acid) - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethanol.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Ethylene.getCells(1)).fluidInputs(Materials.SulfuricAcid.getFluid(1000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)).duration(60 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethanol.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Ethylene.getCells(1)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.SulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Ethylene.getCells(1)).fluidInputs(Materials.Ethanol.getFluid(1000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)).duration(60 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Ethylene.getCells(1)) + .fluidInputs(Materials.Ethanol.getFluid(1000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethanol.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1)) - .fluidInputs(Materials.SulfuricAcid.getFluid(1000)).fluidOutputs(Materials.Ethylene.getGas(1000)) - .duration(60 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethanol.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .fluidOutputs(Materials.Ethylene.getGas(1000)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.SulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1)).fluidInputs(Materials.Ethanol.getFluid(1000)) - .fluidOutputs(Materials.Ethylene.getGas(1000)).duration(60 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1)) + .fluidInputs(Materials.Ethanol.getFluid(1000)) + .fluidOutputs(Materials.Ethylene.getGas(1000)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // H2O + Na = NaOH + H - GT_Values.RA.stdBuilder().itemInputs(Materials.Sodium.getDust(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.SodiumHydroxide.getDust(3)).fluidInputs(Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.Hydrogen.getGas(1000)).duration(10 * SECONDS).eut(30).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Sodium.getDust(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.SodiumHydroxide.getDust(3)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(1000)) + .duration(10 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // H + Cl = HCl - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Hydrogen.getGas(1000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)).duration(3 * SECONDS).eut(8) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Hydrogen.getGas(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(3 * SECONDS) + .eut(8) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Hydrogen.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Chlorine.getGas(1000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)).duration(3 * SECONDS).eut(8) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Hydrogen.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Chlorine.getGas(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(3 * SECONDS) + .eut(8) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.HydrochloricAcid.getCells(1)).fluidInputs(Materials.Hydrogen.getGas(1000)) - .noFluidOutputs().duration(3 * SECONDS).eut(8).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.HydrochloricAcid.getCells(1)) + .fluidInputs(Materials.Hydrogen.getGas(1000)) + .noFluidOutputs() + .duration(3 * SECONDS) + .eut(8) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Hydrogen.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.HydrochloricAcid.getCells(1)).fluidInputs(Materials.Chlorine.getGas(1000)) - .noFluidOutputs().duration(3 * SECONDS).eut(8).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Hydrogen.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.HydrochloricAcid.getCells(1)) + .fluidInputs(Materials.Chlorine.getGas(1000)) + .noFluidOutputs() + .duration(3 * SECONDS) + .eut(8) + .addTo(UniversalChemical); // C3H6 + 2Cl = HCl + C3H5Cl - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Propene.getGas(1000)).fluidOutputs(Materials.AllylChloride.getFluid(1000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Propene.getGas(1000)) + .fluidOutputs(Materials.AllylChloride.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Propene.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.HydrochloricAcid.getCells(1)).fluidInputs(Materials.Chlorine.getGas(2000)) - .fluidOutputs(Materials.AllylChloride.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Propene.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.HydrochloricAcid.getCells(1)) + .fluidInputs(Materials.Chlorine.getGas(2000)) + .fluidOutputs(Materials.AllylChloride.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.AllylChloride.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Propene.getGas(1000)).fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.AllylChloride.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Propene.getGas(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Propene.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.AllylChloride.getCells(1)).fluidInputs(Materials.Chlorine.getGas(2000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Propene.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.AllylChloride.getCells(1)) + .fluidInputs(Materials.Chlorine.getGas(2000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // 2Cl + H2O = HCl + HClO (Intended loss) - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.DilutedHydrochloricAcid.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Water.getFluid(1000)).fluidOutputs(Materials.HypochlorousAcid.getFluid(1000)) - .duration(6 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.DilutedHydrochloricAcid.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.HypochlorousAcid.getFluid(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.DilutedHydrochloricAcid.getCells(1)).fluidInputs(Materials.Chlorine.getGas(2000)) - .fluidOutputs(Materials.HypochlorousAcid.getFluid(1000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.DilutedHydrochloricAcid.getCells(1)) + .fluidInputs(Materials.Chlorine.getGas(2000)) + .fluidOutputs(Materials.HypochlorousAcid.getFluid(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.HypochlorousAcid.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)).duration(6 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.HypochlorousAcid.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.HypochlorousAcid.getCells(1)).fluidInputs(Materials.Chlorine.getGas(2000)) - .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)).duration(6 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.HypochlorousAcid.getCells(1)) + .fluidInputs(Materials.Chlorine.getGas(2000)) + .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // HClO + NaOH + C3H5Cl = C3H5ClO + NaCl·H2O GT_Values.RA.stdBuilder() - .itemInputs(Materials.HypochlorousAcid.getCells(1), Materials.SodiumHydroxide.getDust(3)) - .itemOutputs(Materials.SaltWater.getCells(1)).fluidInputs(Materials.AllylChloride.getFluid(1000)) - .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)).duration(24 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + .itemInputs(Materials.HypochlorousAcid.getCells(1), Materials.SodiumHydroxide.getDust(3)) + .itemOutputs(Materials.SaltWater.getCells(1)) + .fluidInputs(Materials.AllylChloride.getFluid(1000)) + .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(3), Materials.AllylChloride.getCells(1)) - .itemOutputs(Materials.SaltWater.getCells(1)).fluidInputs(Materials.HypochlorousAcid.getFluid(1000)) - .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)).duration(24 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(3), Materials.AllylChloride.getCells(1)) + .itemOutputs(Materials.SaltWater.getCells(1)) + .fluidInputs(Materials.HypochlorousAcid.getFluid(1000)) + .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1)) - .itemOutputs(Materials.Water.getCells(2)).fluidInputs(Materials.Glycerol.getFluid(1000)) - .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)).duration(24 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1)) + .itemOutputs(Materials.Water.getCells(2)) + .fluidInputs(Materials.Glycerol.getFluid(1000)) + .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Glycerol.getCells(1), Materials.Empty.getCells(1)) - .itemOutputs(Materials.Water.getCells(2)).fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) - .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)).duration(24 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Glycerol.getCells(1), Materials.Empty.getCells(1)) + .itemOutputs(Materials.Water.getCells(2)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Epichlorohydrin.getCells(1)).fluidInputs(Materials.Glycerol.getFluid(1000)) - .fluidOutputs(Materials.Water.getFluid(2000)).duration(24 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Epichlorohydrin.getCells(1)) + .fluidInputs(Materials.Glycerol.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Glycerol.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Epichlorohydrin.getCells(1)) - .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)).fluidOutputs(Materials.Water.getFluid(2000)) - .duration(24 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Glycerol.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Epichlorohydrin.getCells(1)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Glycerol.getFluid(1000)) - .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)).duration(24 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Glycerol.getFluid(1000)) + .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Glycerol.getCells(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) - .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)).duration(24 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Glycerol.getCells(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.Epichlorohydrin.getCells(1)).fluidInputs(Materials.Glycerol.getFluid(1000)) - .noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.Epichlorohydrin.getCells(1)) + .fluidInputs(Materials.Glycerol.getFluid(1000)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Glycerol.getCells(1), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.Epichlorohydrin.getCells(1)) - .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Glycerol.getCells(1), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.Epichlorohydrin.getCells(1)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // P4O10 + 6H2O = 4H3PO4 - GT_Values.RA.stdBuilder().itemInputs(Materials.PhosphorousPentoxide.getDust(14)).noItemOutputs() - .fluidInputs(Materials.Water.getFluid(6000)).fluidOutputs(Materials.PhosphoricAcid.getFluid(4000)) - .duration(2 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.PhosphorousPentoxide.getDust(14)) + .noItemOutputs() + .fluidInputs(Materials.Water.getFluid(6000)) + .fluidOutputs(Materials.PhosphoricAcid.getFluid(4000)) + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // C9H12 + 2O = C6H6O + C3H6O - GT_Values.RA.stdBuilder().itemInputs(Materials.Cumene.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Phenol.getCells(1)).fluidInputs(Materials.Oxygen.getGas(2000)) - .fluidOutputs(Materials.Acetone.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Cumene.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Phenol.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(2000)) + .fluidOutputs(Materials.Acetone.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Phenol.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Cumene.getFluid(1000)).fluidOutputs(Materials.Acetone.getFluid(1000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Phenol.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Cumene.getFluid(1000)) + .fluidOutputs(Materials.Acetone.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Cumene.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Acetone.getCells(1)).fluidInputs(Materials.Oxygen.getGas(2000)) - .fluidOutputs(Materials.Phenol.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Cumene.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Acetone.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(2000)) + .fluidOutputs(Materials.Phenol.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Acetone.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Cumene.getFluid(1000)).fluidOutputs(Materials.Phenol.getFluid(1000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Acetone.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Cumene.getFluid(1000)) + .fluidOutputs(Materials.Phenol.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // C15H16O2 + 2C3H5ClO + 2NaOH = C15H14O2(C3H5O)2 + 2NaCl·H2O GT_Values.RA.stdBuilder() - .itemInputs(Materials.SodiumHydroxide.getDust(6), Materials.Epichlorohydrin.getCells(2)) - .itemOutputs(Materials.SaltWater.getCells(2)).fluidInputs(Materials.BisphenolA.getFluid(1000)) - .fluidOutputs(Materials.Epoxid.getMolten(1000)).duration(10 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + .itemInputs(Materials.SodiumHydroxide.getDust(6), Materials.Epichlorohydrin.getCells(2)) + .itemOutputs(Materials.SaltWater.getCells(2)) + .fluidInputs(Materials.BisphenolA.getFluid(1000)) + .fluidOutputs(Materials.Epoxid.getMolten(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // CH4O + HCl = CH3Cl + H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Water.getCells(1)).fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) - .fluidOutputs(Materials.Chloromethane.getGas(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Water.getCells(1)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(Materials.Chloromethane.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Water.getCells(1)).fluidInputs(Materials.Methanol.getFluid(1000)) - .fluidOutputs(Materials.Chloromethane.getGas(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Water.getCells(1)) + .fluidInputs(Materials.Methanol.getFluid(1000)) + .fluidOutputs(Materials.Chloromethane.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Chloromethane.getCells(1)).fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) - .fluidOutputs(Materials.Water.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Chloromethane.getCells(1)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Chloromethane.getCells(1)).fluidInputs(Materials.Methanol.getFluid(1000)) - .fluidOutputs(Materials.Water.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Chloromethane.getCells(1)) + .fluidInputs(Materials.Methanol.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) - .fluidOutputs(Materials.Chloromethane.getGas(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(Materials.Chloromethane.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Methanol.getFluid(1000)) - .fluidOutputs(Materials.Chloromethane.getGas(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Methanol.getFluid(1000)) + .fluidOutputs(Materials.Chloromethane.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.Chloromethane.getCells(1)).fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) - .noFluidOutputs().duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(1), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.Chloromethane.getCells(1)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.Chloromethane.getCells(1)).fluidInputs(Materials.Methanol.getFluid(1000)) - .noFluidOutputs().duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.Chloromethane.getCells(1)) + .fluidInputs(Materials.Methanol.getFluid(1000)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Methane.getGas(1000)).fluidOutputs(Materials.Chloromethane.getGas(1000)) - .duration(4 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Methane.getGas(1000)) + .fluidOutputs(Materials.Chloromethane.getGas(1000)) + .duration(4 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methane.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.HydrochloricAcid.getCells(1)).fluidInputs(Materials.Chlorine.getGas(2000)) - .fluidOutputs(Materials.Chloromethane.getGas(1000)).duration(4 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methane.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.HydrochloricAcid.getCells(1)) + .fluidInputs(Materials.Chlorine.getGas(2000)) + .fluidOutputs(Materials.Chloromethane.getGas(1000)) + .duration(4 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Chloromethane.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Methane.getGas(1000)).fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) - .duration(4 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Chloromethane.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Methane.getGas(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(4 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methane.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Chloromethane.getCells(1)).fluidInputs(Materials.Chlorine.getGas(2000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)).duration(4 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methane.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Chloromethane.getCells(1)) + .fluidInputs(Materials.Chlorine.getGas(2000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(4 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // Cl6 + CH4 = CHCl3 + 3HCl - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(6), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(Materials.HydrochloricAcid.getCells(3), Materials.Empty.getCells(3)) - .fluidInputs(Materials.Methane.getGas(1000)).fluidOutputs(Materials.Chloroform.getFluid(1000)) - .duration(4 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(6), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(Materials.HydrochloricAcid.getCells(3), Materials.Empty.getCells(3)) + .fluidInputs(Materials.Methane.getGas(1000)) + .fluidOutputs(Materials.Chloroform.getFluid(1000)) + .duration(4 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(6), GT_Utility.getIntegratedCircuit(13)) - .itemOutputs(Materials.Chloroform.getCells(1), Materials.Empty.getCells(5)) - .fluidInputs(Materials.Methane.getGas(1000)).fluidOutputs(Materials.HydrochloricAcid.getFluid(3000)) - .duration(4 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(6), GT_Utility.getIntegratedCircuit(13)) + .itemOutputs(Materials.Chloroform.getCells(1), Materials.Empty.getCells(5)) + .fluidInputs(Materials.Methane.getGas(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(3000)) + .duration(4 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methane.getCells(1), GT_Utility.getIntegratedCircuit(13)) - .itemOutputs(Materials.Chloroform.getCells(1)).fluidInputs(Materials.Chlorine.getGas(6000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(3000)).duration(4 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methane.getCells(1), GT_Utility.getIntegratedCircuit(13)) + .itemOutputs(Materials.Chloroform.getCells(1)) + .fluidInputs(Materials.Chlorine.getGas(6000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(3000)) + .duration(4 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // H + F = HF - GT_Values.RA.stdBuilder().itemInputs(Materials.Fluorine.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Hydrogen.getGas(1000)) - .fluidOutputs(Materials.HydrofluoricAcid.getFluid(1000)).duration(3 * SECONDS).eut(8) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Fluorine.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Hydrogen.getGas(1000)) + .fluidOutputs(Materials.HydrofluoricAcid.getFluid(1000)) + .duration(3 * SECONDS) + .eut(8) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Hydrogen.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Fluorine.getGas(1000)) - .fluidOutputs(Materials.HydrofluoricAcid.getFluid(1000)).duration(3 * SECONDS).eut(8) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Hydrogen.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Fluorine.getGas(1000)) + .fluidOutputs(Materials.HydrofluoricAcid.getFluid(1000)) + .duration(3 * SECONDS) + .eut(8) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Fluorine.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.HydrofluoricAcid.getCells(1)).fluidInputs(Materials.Hydrogen.getGas(1000)) - .noFluidOutputs().duration(3 * SECONDS).eut(8).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Fluorine.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.HydrofluoricAcid.getCells(1)) + .fluidInputs(Materials.Hydrogen.getGas(1000)) + .noFluidOutputs() + .duration(3 * SECONDS) + .eut(8) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Hydrogen.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.HydrofluoricAcid.getCells(1)).fluidInputs(Materials.Fluorine.getGas(1000)) - .noFluidOutputs().duration(3 * SECONDS).eut(8).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Hydrogen.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.HydrofluoricAcid.getCells(1)) + .fluidInputs(Materials.Fluorine.getGas(1000)) + .noFluidOutputs() + .duration(3 * SECONDS) + .eut(8) + .addTo(UniversalChemical); // 4HF + 2CHCl3 = C2F4 + 6HCl - GT_Values.RA.stdBuilder().itemInputs(Materials.Chloroform.getCells(2), Materials.HydrofluoricAcid.getCells(4)) - .itemOutputs(Materials.HydrochloricAcid.getCells(6)).noFluidInputs() - .fluidOutputs(Materials.Tetrafluoroethylene.getGas(1000)).duration(24 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chloroform.getCells(2), Materials.HydrofluoricAcid.getCells(4)) + .itemOutputs(Materials.HydrochloricAcid.getCells(6)) + .noFluidInputs() + .fluidOutputs(Materials.Tetrafluoroethylene.getGas(1000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chloroform.getCells(2), Materials.Empty.getCells(4)) - .itemOutputs(Materials.HydrochloricAcid.getCells(6)) - .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000)) - .fluidOutputs(Materials.Tetrafluoroethylene.getGas(1000)).duration(24 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chloroform.getCells(2), Materials.Empty.getCells(4)) + .itemOutputs(Materials.HydrochloricAcid.getCells(6)) + .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000)) + .fluidOutputs(Materials.Tetrafluoroethylene.getGas(1000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.HydrofluoricAcid.getCells(4), Materials.Empty.getCells(2)) - .itemOutputs(Materials.HydrochloricAcid.getCells(6)).fluidInputs(Materials.Chloroform.getFluid(2000)) - .fluidOutputs(Materials.Tetrafluoroethylene.getGas(1000)).duration(24 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydrofluoricAcid.getCells(4), Materials.Empty.getCells(2)) + .itemOutputs(Materials.HydrochloricAcid.getCells(6)) + .fluidInputs(Materials.Chloroform.getFluid(2000)) + .fluidOutputs(Materials.Tetrafluoroethylene.getGas(1000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(Materials.HydrofluoricAcid.getCells(4), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Tetrafluoroethylene.getCells(1), Materials.Empty.getCells(3)) - .fluidInputs(Materials.Chloroform.getFluid(2000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(6000)).duration(24 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + .itemInputs(Materials.HydrofluoricAcid.getCells(4), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Tetrafluoroethylene.getCells(1), Materials.Empty.getCells(3)) + .fluidInputs(Materials.Chloroform.getFluid(2000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(6000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chloroform.getCells(2), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Tetrafluoroethylene.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(6000)).duration(24 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chloroform.getCells(2), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Tetrafluoroethylene.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(6000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // Si + 2CH3Cl = C2H6Cl2Si - GT_Values.RA.stdBuilder().itemInputs(Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().fluidInputs(Materials.Chloromethane.getGas(2000)) - .fluidOutputs(Materials.Dimethyldichlorosilane.getFluid(1000)).duration(12 * SECONDS).eut(96) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.Chloromethane.getGas(2000)) + .fluidOutputs(Materials.Dimethyldichlorosilane.getFluid(1000)) + .duration(12 * SECONDS) + .eut(96) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(Materials.Dimethyldichlorosilane.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Polydimethylsiloxane.getDust(3), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)).duration(12 * SECONDS).eut(96) - .addTo(UniversalChemical); + .itemInputs(Materials.Dimethyldichlorosilane.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Polydimethylsiloxane.getDust(3), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)) + .duration(12 * SECONDS) + .eut(96) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Polydimethylsiloxane.getDust(3), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Dimethyldichlorosilane.getFluid(1000)) - .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)).duration(12 * SECONDS).eut(96) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Polydimethylsiloxane.getDust(3), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Dimethyldichlorosilane.getFluid(1000)) + .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)) + .duration(12 * SECONDS) + .eut(96) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(Materials.Dimethyldichlorosilane.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Polydimethylsiloxane.getDust(3), Materials.DilutedHydrochloricAcid.getCells(1)) - .fluidInputs(Materials.Water.getFluid(1000)).noFluidOutputs().duration(12 * SECONDS).eut(96) - .addTo(UniversalChemical); + .itemInputs(Materials.Dimethyldichlorosilane.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs( + Materials.Polydimethylsiloxane.getDust(3), + Materials.DilutedHydrochloricAcid.getCells(1)) + .fluidInputs(Materials.Water.getFluid(1000)) + .noFluidOutputs() + .duration(12 * SECONDS) + .eut(96) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Polydimethylsiloxane.getDust(3), Materials.DilutedHydrochloricAcid.getCells(1)) - .fluidInputs(Materials.Dimethyldichlorosilane.getFluid(1000)).noFluidOutputs().duration(12 * SECONDS) - .eut(96).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs( + Materials.Polydimethylsiloxane.getDust(3), + Materials.DilutedHydrochloricAcid.getCells(1)) + .fluidInputs(Materials.Dimethyldichlorosilane.getFluid(1000)) + .noFluidOutputs() + .duration(12 * SECONDS) + .eut(96) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Polydimethylsiloxane.getDust(9), Materials.Sulfur.getDust(1)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Silicone.getMolten(1296)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Polydimethylsiloxane.getDust(9), Materials.Sulfur.getDust(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Silicone.getMolten(1296)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // Potassium Nitride // K + HNO3 = KNO3 + H - GT_Values.RA.stdBuilder().itemInputs(Materials.Potassium.getDust(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.PotassiumNitrade.getDust(5)).fluidInputs(Materials.NitricAcid.getFluid(1000)) - .fluidOutputs(Materials.Hydrogen.getGas(1000)).duration(5 * SECONDS).eut(30).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Potassium.getDust(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.PotassiumNitrade.getDust(5)) + .fluidInputs(Materials.NitricAcid.getFluid(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(1000)) + .duration(5 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // Chromium Trioxide // CrO2 + O = CrO3 - GT_Values.RA.stdBuilder().itemInputs(Materials.ChromiumDioxide.getDust(3), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.ChromiumTrioxide.getDust(4)).fluidInputs(Materials.Oxygen.getGas(1000)) - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.ChromiumDioxide.getDust(3), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.ChromiumTrioxide.getDust(4)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // Nitrochlorobenzene // C6H5Cl + HNO3 = C6H4ClNO2 + H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorobenzene.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Nitrochlorobenzene.getCells(1)) - .fluidInputs(Materials.NitrationMixture.getFluid(2000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorobenzene.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Nitrochlorobenzene.getCells(1)) + .fluidInputs(Materials.NitrationMixture.getFluid(2000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorobenzene.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1)) - .fluidInputs(Materials.NitrationMixture.getFluid(2000)) - .fluidOutputs(Materials.Nitrochlorobenzene.getFluid(1000)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorobenzene.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1)) + .fluidInputs(Materials.NitrationMixture.getFluid(2000)) + .fluidOutputs(Materials.Nitrochlorobenzene.getFluid(1000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.NitrationMixture.getCells(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Nitrochlorobenzene.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Chlorobenzene.getFluid(1000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.NitrationMixture.getCells(2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Nitrochlorobenzene.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Chlorobenzene.getFluid(1000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(Materials.NitrationMixture.getCells(2), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Chlorobenzene.getFluid(1000)) - .fluidOutputs(Materials.Nitrochlorobenzene.getFluid(1000)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(UniversalChemical); + .itemInputs(Materials.NitrationMixture.getCells(2), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Chlorobenzene.getFluid(1000)) + .fluidOutputs(Materials.Nitrochlorobenzene.getFluid(1000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // C6H6 + 2CH4 = C8H10 + 4H - GT_Values.RA.stdBuilder().itemInputs(Materials.Methane.getCells(2), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Dimethylbenzene.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Benzene.getFluid(1000)).fluidOutputs(Materials.Hydrogen.getGas(4000)) - .duration(3 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methane.getCells(2), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Dimethylbenzene.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Benzene.getFluid(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(4000)) + .duration(3 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.Dimethylbenzene.getCells(1)).fluidInputs(Materials.Methane.getGas(2000)) - .fluidOutputs(Materials.Hydrogen.getGas(4000)).duration(3 * MINUTES + 20 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.Dimethylbenzene.getCells(1)) + .fluidInputs(Materials.Methane.getGas(2000)) + .fluidOutputs(Materials.Hydrogen.getGas(4000)) + .duration(3 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // Phthalic Acid // C8H10 + 6O =K2Cr2O7= C8H6O4 + 2H2O GT_Values.RA.stdBuilder() - .itemInputs(Materials.Dimethylbenzene.getCells(1), Materials.Potassiumdichromate.getDustTiny(1)) - .itemOutputs(Materials.PhthalicAcid.getCells(1)).fluidInputs(Materials.Oxygen.getGas(6000)) - .fluidOutputs(Materials.Water.getFluid(2000)).duration(5 * SECONDS).eut(TierEU.RECIPE_EV) - .addTo(UniversalChemical); + .itemInputs(Materials.Dimethylbenzene.getCells(1), Materials.Potassiumdichromate.getDustTiny(1)) + .itemOutputs(Materials.PhthalicAcid.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(6000)) + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(6), Materials.Potassiumdichromate.getDustTiny(1)) - .itemOutputs(Materials.PhthalicAcid.getCells(1), ItemList.Cell_Empty.get(5)) - .fluidInputs(Materials.Dimethylbenzene.getFluid(1000)).fluidOutputs(Materials.Water.getFluid(2000)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_EV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(6), Materials.Potassiumdichromate.getDustTiny(1)) + .itemOutputs(Materials.PhthalicAcid.getCells(1), ItemList.Cell_Empty.get(5)) + .fluidInputs(Materials.Dimethylbenzene.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(Materials.Dimethylbenzene.getCells(9), Materials.Potassiumdichromate.getDust(1)) - .itemOutputs(Materials.PhthalicAcid.getCells(9)).fluidInputs(Materials.Oxygen.getGas(54000)) - .fluidOutputs(Materials.Water.getFluid(18000)).duration(45 * SECONDS).eut(TierEU.RECIPE_EV) - .addTo(UniversalChemical); + .itemInputs(Materials.Dimethylbenzene.getCells(9), Materials.Potassiumdichromate.getDust(1)) + .itemOutputs(Materials.PhthalicAcid.getCells(9)) + .fluidInputs(Materials.Oxygen.getGas(54000)) + .fluidOutputs(Materials.Water.getFluid(18000)) + .duration(45 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(54), Materials.Potassiumdichromate.getDust(1)) - .itemOutputs(Materials.PhthalicAcid.getCells(9), ItemList.Cell_Empty.get(45)) - .fluidInputs(Materials.Dimethylbenzene.getFluid(9000)).fluidOutputs(Materials.Water.getFluid(18000)) - .duration(45 * SECONDS).eut(TierEU.RECIPE_EV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(54), Materials.Potassiumdichromate.getDust(1)) + .itemOutputs(Materials.PhthalicAcid.getCells(9), ItemList.Cell_Empty.get(45)) + .fluidInputs(Materials.Dimethylbenzene.getFluid(9000)) + .fluidOutputs(Materials.Water.getFluid(18000)) + .duration(45 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(UniversalChemical); // These following recipes are broken in element term. // But they are kept in gamewise, too much existed setup will be broken. // Dichlorobenzidine - GT_Values.RA.stdBuilder().itemInputs(Materials.Copper.getDustTiny(1), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().fluidInputs(Materials.Nitrochlorobenzene.getFluid(2000)) - .fluidOutputs(Materials.Dichlorobenzidine.getFluid(1000)).duration(10 * SECONDS).eut(TierEU.RECIPE_EV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Copper.getDustTiny(1), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.Nitrochlorobenzene.getFluid(2000)) + .fluidOutputs(Materials.Dichlorobenzidine.getFluid(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Copper.getDust(1), GT_Utility.getIntegratedCircuit(9)) - .noItemOutputs().fluidInputs(Materials.Nitrochlorobenzene.getFluid(18000)) - .fluidOutputs(Materials.Dichlorobenzidine.getFluid(9000)).duration(1 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Copper.getDust(1), GT_Utility.getIntegratedCircuit(9)) + .noItemOutputs() + .fluidInputs(Materials.Nitrochlorobenzene.getFluid(18000)) + .fluidOutputs(Materials.Dichlorobenzidine.getFluid(9000)) + .duration(1 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(UniversalChemical); // Diphenyl Isophthalate - GT_Values.RA.stdBuilder().itemInputs(Materials.PhthalicAcid.getCells(1), Materials.SulfuricAcid.getCells(1)) - .itemOutputs(Materials.Diphenylisophthalate.getCells(1), ItemList.Cell_Empty.get(1)) - .fluidInputs(Materials.Phenol.getFluid(2000)).fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_IV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.PhthalicAcid.getCells(1), Materials.SulfuricAcid.getCells(1)) + .itemOutputs(Materials.Diphenylisophthalate.getCells(1), ItemList.Cell_Empty.get(1)) + .fluidInputs(Materials.Phenol.getFluid(2000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.PhthalicAcid.getCells(1), Materials.Phenol.getCells(2)) - .itemOutputs(Materials.Diphenylisophthalate.getCells(1), ItemList.Cell_Empty.get(2)) - .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)).duration(5 * SECONDS).eut(TierEU.RECIPE_IV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.PhthalicAcid.getCells(1), Materials.Phenol.getCells(2)) + .itemOutputs(Materials.Diphenylisophthalate.getCells(1), ItemList.Cell_Empty.get(2)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.SulfuricAcid.getCells(1), Materials.Phenol.getCells(2)) - .itemOutputs(Materials.Diphenylisophthalate.getCells(1), ItemList.Cell_Empty.get(2)) - .fluidInputs(Materials.PhthalicAcid.getFluid(1000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)).duration(5 * SECONDS).eut(TierEU.RECIPE_IV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SulfuricAcid.getCells(1), Materials.Phenol.getCells(2)) + .itemOutputs(Materials.Diphenylisophthalate.getCells(1), ItemList.Cell_Empty.get(2)) + .fluidInputs(Materials.PhthalicAcid.getFluid(1000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(UniversalChemical); // Diaminobenzidin - GT_Values.RA.stdBuilder().itemInputs(Materials.Ammonia.getCells(2), Materials.Zinc.getDust(1)) - .itemOutputs(Materials.Diaminobenzidin.getCells(1), ItemList.Cell_Empty.get(1)) - .fluidInputs(Materials.Dichlorobenzidine.getFluid(1000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(2000)).duration(5 * SECONDS).eut(TierEU.RECIPE_IV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ammonia.getCells(2), Materials.Zinc.getDust(1)) + .itemOutputs(Materials.Diaminobenzidin.getCells(1), ItemList.Cell_Empty.get(1)) + .fluidInputs(Materials.Dichlorobenzidine.getFluid(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(2000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(UniversalChemical); // Polybenzimidazole // C12H14N4 + C20H14O4 = C20H12N4 + 2C6H6O + 2H2O GT_Values.RA.stdBuilder() - .itemInputs(Materials.Diphenylisophthalate.getCells(1), Materials.Diaminobenzidin.getCells(1)) - .itemOutputs(Materials.Phenol.getCells(2)).noFluidInputs() - .fluidOutputs(Materials.Polybenzimidazole.getMolten(1000)).duration(5 * SECONDS).eut(TierEU.RECIPE_IV) - .addTo(UniversalChemical); + .itemInputs(Materials.Diphenylisophthalate.getCells(1), Materials.Diaminobenzidin.getCells(1)) + .itemOutputs(Materials.Phenol.getCells(2)) + .noFluidInputs() + .fluidOutputs(Materials.Polybenzimidazole.getMolten(1000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1)) - .itemOutputs(getModItem(Railcraft.modID, "tile.railcraft.glass", 6)) - .fluidInputs(Materials.Glass.getMolten(864)).noFluidOutputs().duration(2 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 1)) + .itemOutputs(getModItem(Railcraft.modID, "tile.railcraft.glass", 6)) + .fluidInputs(Materials.Glass.getMolten(864)) + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // NH3 + 2CH4O = C2H7N + 2H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Water.getCells(2)).fluidInputs(Materials.Ammonia.getGas(1000)) - .fluidOutputs(Materials.Dimethylamine.getGas(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Water.getCells(2)) + .fluidInputs(Materials.Ammonia.getGas(1000)) + .fluidOutputs(Materials.Dimethylamine.getGas(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(2), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Dimethylamine.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Ammonia.getGas(1000)).fluidOutputs(Materials.Water.getFluid(1000)) - .duration(12 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(2), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Dimethylamine.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Ammonia.getGas(1000)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Dimethylamine.getCells(1)).fluidInputs(Materials.Methanol.getFluid(2000)) - .fluidOutputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Dimethylamine.getCells(1)) + .fluidInputs(Materials.Methanol.getFluid(2000)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(2), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(2)).fluidInputs(Materials.Ammonia.getGas(1000)) - .fluidOutputs(Materials.Dimethylamine.getGas(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(2), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(2)) + .fluidInputs(Materials.Ammonia.getGas(1000)) + .fluidOutputs(Materials.Dimethylamine.getGas(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(2), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.Dimethylamine.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Ammonia.getGas(1000)).noFluidOutputs().duration(12 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(2), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.Dimethylamine.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Ammonia.getGas(1000)) + .noFluidOutputs() + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.Dimethylamine.getCells(1)).fluidInputs(Materials.Methanol.getFluid(2000)) - .noFluidOutputs().duration(12 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.Dimethylamine.getCells(1)) + .fluidInputs(Materials.Methanol.getFluid(2000)) + .noFluidOutputs() + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // NH3 + HClO = NH2Cl + H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Water.getCells(1)).fluidInputs(Materials.HypochlorousAcid.getFluid(1000)) - .fluidOutputs(Materials.Chloramine.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Water.getCells(1)) + .fluidInputs(Materials.HypochlorousAcid.getFluid(1000)) + .fluidOutputs(Materials.Chloramine.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.HypochlorousAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Water.getCells(1)).fluidInputs(Materials.Ammonia.getGas(1000)) - .fluidOutputs(Materials.Chloramine.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HypochlorousAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Water.getCells(1)) + .fluidInputs(Materials.Ammonia.getGas(1000)) + .fluidOutputs(Materials.Chloramine.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Chloramine.getCells(1)).fluidInputs(Materials.HypochlorousAcid.getFluid(1000)) - .fluidOutputs(Materials.Water.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Chloramine.getCells(1)) + .fluidInputs(Materials.HypochlorousAcid.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(Materials.HypochlorousAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Chloramine.getCells(1)).fluidInputs(Materials.Ammonia.getGas(1000)) - .fluidOutputs(Materials.Water.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + .itemInputs(Materials.HypochlorousAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Chloramine.getCells(1)) + .fluidInputs(Materials.Ammonia.getGas(1000)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.HypochlorousAcid.getFluid(1000)) - .fluidOutputs(Materials.Chloramine.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.HypochlorousAcid.getFluid(1000)) + .fluidOutputs(Materials.Chloramine.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.HypochlorousAcid.getCells(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Ammonia.getGas(1000)) - .fluidOutputs(Materials.Chloramine.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HypochlorousAcid.getCells(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Ammonia.getGas(1000)) + .fluidOutputs(Materials.Chloramine.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.Chloramine.getCells(1)).fluidInputs(Materials.HypochlorousAcid.getFluid(1000)) - .noFluidOutputs().duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.Chloramine.getCells(1)) + .fluidInputs(Materials.HypochlorousAcid.getFluid(1000)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(Materials.HypochlorousAcid.getCells(1), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.Chloramine.getCells(1)).fluidInputs(Materials.Ammonia.getGas(1000)) - .noFluidOutputs().duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs(Materials.HypochlorousAcid.getCells(1), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.Chloramine.getCells(1)) + .fluidInputs(Materials.Ammonia.getGas(1000)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // 2NO2 = N2O4 - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)).noItemOutputs() - .fluidInputs(Materials.NitrogenDioxide.getGas(2000)) - .fluidOutputs(Materials.DinitrogenTetroxide.getGas(1000)).duration(32 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs(Materials.NitrogenDioxide.getGas(2000)) + .fluidOutputs(Materials.DinitrogenTetroxide.getGas(1000)) + .duration(32 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.NitrogenDioxide.getCells(2), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(2)).noFluidInputs() - .fluidOutputs(Materials.DinitrogenTetroxide.getGas(1000)).duration(32 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.NitrogenDioxide.getCells(2), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(2)) + .noFluidInputs() + .fluidOutputs(Materials.DinitrogenTetroxide.getGas(1000)) + .duration(32 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.NitrogenDioxide.getCells(2), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.DinitrogenTetroxide.getCells(1), Materials.Empty.getCells(1)).noFluidInputs() - .noFluidOutputs().duration(32 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.NitrogenDioxide.getCells(2), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.DinitrogenTetroxide.getCells(1), Materials.Empty.getCells(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(32 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // 2NH3 + 5O = 2NO + 3H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.Ammonia.getCells(4), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.NitricOxide.getCells(4)).fluidInputs(Materials.Oxygen.getGas(10000)) - .fluidOutputs(Materials.Water.getFluid(6000)).duration(16 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ammonia.getCells(4), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.NitricOxide.getCells(4)) + .fluidInputs(Materials.Oxygen.getGas(10000)) + .fluidOutputs(Materials.Water.getFluid(6000)) + .duration(16 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(10), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.NitricOxide.getCells(4), Materials.Empty.getCells(6)) - .fluidInputs(Materials.Ammonia.getGas(4000)).fluidOutputs(Materials.Water.getFluid(6000)) - .duration(16 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(10), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.NitricOxide.getCells(4), Materials.Empty.getCells(6)) + .fluidInputs(Materials.Ammonia.getGas(4000)) + .fluidOutputs(Materials.Water.getFluid(6000)) + .duration(16 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(10), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Water.getCells(6), Materials.Empty.getCells(4)) - .fluidInputs(Materials.Ammonia.getGas(4000)).fluidOutputs(Materials.NitricOxide.getGas(4000)) - .duration(16 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(10), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Water.getCells(6), Materials.Empty.getCells(4)) + .fluidInputs(Materials.Ammonia.getGas(4000)) + .fluidOutputs(Materials.NitricOxide.getGas(4000)) + .duration(16 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Ammonia.getCells(4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.NitricOxide.getCells(4)).fluidInputs(Materials.Oxygen.getGas(10000)) - .noFluidOutputs().duration(16 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ammonia.getCells(4), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.NitricOxide.getCells(4)) + .fluidInputs(Materials.Oxygen.getGas(10000)) + .noFluidOutputs() + .duration(16 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(10), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.NitricOxide.getCells(4), Materials.Empty.getCells(6)) - .fluidInputs(Materials.Ammonia.getGas(4000)).noFluidOutputs().duration(16 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(10), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.NitricOxide.getCells(4), Materials.Empty.getCells(6)) + .fluidInputs(Materials.Ammonia.getGas(4000)) + .noFluidOutputs() + .duration(16 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(10), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.Empty.getCells(10)).fluidInputs(Materials.Ammonia.getGas(4000)) - .fluidOutputs(Materials.NitricOxide.getGas(4000)).duration(16 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(10), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.Empty.getCells(10)) + .fluidInputs(Materials.Ammonia.getGas(4000)) + .fluidOutputs(Materials.NitricOxide.getGas(4000)) + .duration(16 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // NO + O = NO2 - GT_Values.RA.stdBuilder().itemInputs(Materials.NitricOxide.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Oxygen.getGas(1000)) - .fluidOutputs(Materials.NitrogenDioxide.getGas(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.NitricOxide.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .fluidOutputs(Materials.NitrogenDioxide.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.NitricOxide.getGas(1000)) - .fluidOutputs(Materials.NitrogenDioxide.getGas(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.NitricOxide.getGas(1000)) + .fluidOutputs(Materials.NitrogenDioxide.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.NitricOxide.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.NitrogenDioxide.getCells(1)).fluidInputs(Materials.Oxygen.getGas(1000)) - .noFluidOutputs().duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.NitricOxide.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.NitrogenDioxide.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.NitrogenDioxide.getCells(1)).fluidInputs(Materials.NitricOxide.getGas(1000)) - .noFluidOutputs().duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.NitrogenDioxide.getCells(1)) + .fluidInputs(Materials.NitricOxide.getGas(1000)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // H2O + 3NO2 = 2HNO3 + NO - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.NitricOxide.getCells(1)).fluidInputs(Materials.NitrogenDioxide.getGas(3000)) - .fluidOutputs(Materials.NitricAcid.getFluid(2000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.NitricOxide.getCells(1)) + .fluidInputs(Materials.NitrogenDioxide.getGas(3000)) + .fluidOutputs(Materials.NitricAcid.getFluid(2000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.NitrogenDioxide.getCells(3), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.NitricOxide.getCells(1), Materials.Empty.getCells(2)) - .fluidInputs(Materials.Water.getFluid(1000)).fluidOutputs(Materials.NitricAcid.getFluid(2000)) - .duration(12 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.NitrogenDioxide.getCells(3), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.NitricOxide.getCells(1), Materials.Empty.getCells(2)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.NitricAcid.getFluid(2000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.NitrogenDioxide.getCells(3), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.NitricAcid.getCells(2), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Water.getFluid(1000)).fluidOutputs(Materials.NitricOxide.getGas(1000)) - .duration(12 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.NitrogenDioxide.getCells(3), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.NitricAcid.getCells(2), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.NitricOxide.getGas(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // S + 2H = H2S - GT_Values.RA.stdBuilder().itemInputs(Materials.Sulfur.getDust(1), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().fluidInputs(Materials.Hydrogen.getGas(2000)) - .fluidOutputs(Materials.HydricSulfide.getGas(1000)).duration(3 * SECONDS).eut(8) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Sulfur.getDust(1), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.Hydrogen.getGas(2000)) + .fluidOutputs(Materials.HydricSulfide.getGas(1000)) + .duration(3 * SECONDS) + .eut(8) + .addTo(UniversalChemical); // S + 2O = SO2 - GT_Values.RA.stdBuilder().itemInputs(Materials.Sulfur.getDust(1), GT_Utility.getIntegratedCircuit(3)) - .noItemOutputs().fluidInputs(Materials.Oxygen.getGas(2000)) - .fluidOutputs(Materials.SulfurDioxide.getGas(1000)).duration(3 * SECONDS).eut(8) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Sulfur.getDust(1), GT_Utility.getIntegratedCircuit(3)) + .noItemOutputs() + .fluidInputs(Materials.Oxygen.getGas(2000)) + .fluidOutputs(Materials.SulfurDioxide.getGas(1000)) + .duration(3 * SECONDS) + .eut(8) + .addTo(UniversalChemical); // H2S + 3O = SO2 + H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.HydricSulfide.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Water.getCells(1)).fluidInputs(Materials.Oxygen.getGas(3000)) - .fluidOutputs(Materials.SulfurDioxide.getGas(1000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(3), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(2)) - .fluidInputs(Materials.HydricSulfide.getGas(1000)).fluidOutputs(Materials.SulfurDioxide.getGas(1000)) - .duration(6 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.HydricSulfide.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.SulfurDioxide.getCells(1)).fluidInputs(Materials.Oxygen.getGas(3000)) - .fluidOutputs(Materials.Water.getFluid(1000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(3), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.SulfurDioxide.getCells(1), Materials.Empty.getCells(2)) - .fluidInputs(Materials.HydricSulfide.getGas(1000)).fluidOutputs(Materials.Water.getFluid(1000)) - .duration(6 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.HydricSulfide.getCells(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Oxygen.getGas(3000)) - .fluidOutputs(Materials.SulfurDioxide.getGas(1000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(3), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Empty.getCells(3)).fluidInputs(Materials.HydricSulfide.getGas(1000)) - .fluidOutputs(Materials.SulfurDioxide.getGas(1000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.HydricSulfide.getCells(1), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.SulfurDioxide.getCells(1)).fluidInputs(Materials.Oxygen.getGas(3000)) - .noFluidOutputs().duration(6 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(3), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.SulfurDioxide.getCells(1), Materials.Empty.getCells(2)) - .fluidInputs(Materials.HydricSulfide.getGas(1000)).noFluidOutputs().duration(6 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydricSulfide.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Water.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(3000)) + .fluidOutputs(Materials.SulfurDioxide.getGas(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(3), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(2)) + .fluidInputs(Materials.HydricSulfide.getGas(1000)) + .fluidOutputs(Materials.SulfurDioxide.getGas(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydricSulfide.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.SulfurDioxide.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(3000)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(3), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.SulfurDioxide.getCells(1), Materials.Empty.getCells(2)) + .fluidInputs(Materials.HydricSulfide.getGas(1000)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydricSulfide.getCells(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(3000)) + .fluidOutputs(Materials.SulfurDioxide.getGas(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(3), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Empty.getCells(3)) + .fluidInputs(Materials.HydricSulfide.getGas(1000)) + .fluidOutputs(Materials.SulfurDioxide.getGas(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydricSulfide.getCells(1), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.SulfurDioxide.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(3000)) + .noFluidOutputs() + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(3), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.SulfurDioxide.getCells(1), Materials.Empty.getCells(2)) + .fluidInputs(Materials.HydricSulfide.getGas(1000)) + .noFluidOutputs() + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // 2H2S + SO2 = 3S + 2H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.SulfurDioxide.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Sulfur.getDust(3), Materials.Empty.getCells(1)) - .fluidInputs(Materials.HydricSulfide.getGas(2000)).fluidOutputs(Materials.Water.getFluid(2000)) - .duration(6 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SulfurDioxide.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Sulfur.getDust(3), Materials.Empty.getCells(1)) + .fluidInputs(Materials.HydricSulfide.getGas(2000)) + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.HydricSulfide.getCells(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Sulfur.getDust(3), Materials.Empty.getCells(2)) - .fluidInputs(Materials.SulfurDioxide.getGas(1000)).fluidOutputs(Materials.Water.getFluid(2000)) - .duration(6 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydricSulfide.getCells(2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Sulfur.getDust(3), Materials.Empty.getCells(2)) + .fluidInputs(Materials.SulfurDioxide.getGas(1000)) + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.SulfurDioxide.getCells(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Sulfur.getDust(3), Materials.Empty.getCells(1)) - .fluidInputs(Materials.HydricSulfide.getGas(2000)).noFluidOutputs().duration(6 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SulfurDioxide.getCells(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Sulfur.getDust(3), Materials.Empty.getCells(1)) + .fluidInputs(Materials.HydricSulfide.getGas(2000)) + .noFluidOutputs() + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.HydricSulfide.getCells(2), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Sulfur.getDust(3), Materials.Empty.getCells(2)) - .fluidInputs(Materials.SulfurDioxide.getGas(1000)).noFluidOutputs().duration(6 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydricSulfide.getCells(2), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Sulfur.getDust(3), Materials.Empty.getCells(2)) + .fluidInputs(Materials.SulfurDioxide.getGas(1000)) + .noFluidOutputs() + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // SO2 + O = SO3 - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.SulfurDioxide.getGas(1000)) - .fluidOutputs(Materials.SulfurTrioxide.getGas(1000)).duration(10 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.SulfurDioxide.getGas(1000)) + .fluidOutputs(Materials.SulfurTrioxide.getGas(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.SulfurDioxide.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Oxygen.getGas(1000)) - .fluidOutputs(Materials.SulfurTrioxide.getGas(1000)).duration(10 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SulfurDioxide.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .fluidOutputs(Materials.SulfurTrioxide.getGas(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.SulfurTrioxide.getCells(1)).fluidInputs(Materials.SulfurDioxide.getGas(1000)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.SulfurTrioxide.getCells(1)) + .fluidInputs(Materials.SulfurDioxide.getGas(1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.SulfurDioxide.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.SulfurTrioxide.getCells(1)).fluidInputs(Materials.Oxygen.getGas(1000)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SulfurDioxide.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.SulfurTrioxide.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // SO3 + H2O = H2SO4 - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.SulfurTrioxide.getGas(1000)) - .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)).duration(16 * SECONDS).eut(8) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.SulfurTrioxide.getGas(1000)) + .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) + .duration(16 * SECONDS) + .eut(8) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.SulfurTrioxide.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)).duration(16 * SECONDS).eut(8) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SulfurTrioxide.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) + .duration(16 * SECONDS) + .eut(8) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.SulfuricAcid.getCells(1)).fluidInputs(Materials.SulfurTrioxide.getGas(1000)) - .noFluidOutputs().duration(16 * SECONDS).eut(8).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.SulfuricAcid.getCells(1)) + .fluidInputs(Materials.SulfurTrioxide.getGas(1000)) + .noFluidOutputs() + .duration(16 * SECONDS) + .eut(8) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.SulfurTrioxide.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.SulfuricAcid.getCells(1)).fluidInputs(Materials.Water.getFluid(1000)) - .noFluidOutputs().duration(16 * SECONDS).eut(8).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SulfurTrioxide.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.SulfuricAcid.getCells(1)) + .fluidInputs(Materials.Water.getFluid(1000)) + .noFluidOutputs() + .duration(16 * SECONDS) + .eut(8) + .addTo(UniversalChemical); // C2H4 + 2Cl = C2H3Cl + HCl - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Ethylene.getGas(1000)).fluidOutputs(Materials.VinylChloride.getGas(1000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Ethylene.getGas(1000)) + .fluidOutputs(Materials.VinylChloride.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.HydrochloricAcid.getCells(1)).fluidInputs(Materials.Chlorine.getGas(2000)) - .fluidOutputs(Materials.VinylChloride.getGas(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.HydrochloricAcid.getCells(1)) + .fluidInputs(Materials.Chlorine.getGas(2000)) + .fluidOutputs(Materials.VinylChloride.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.VinylChloride.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Ethylene.getGas(1000)).fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.VinylChloride.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Ethylene.getGas(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.VinylChloride.getCells(1)).fluidInputs(Materials.Chlorine.getGas(2000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.VinylChloride.getCells(1)) + .fluidInputs(Materials.Chlorine.getGas(2000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // C2H4O2 =H2SO4= C2H2O + H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Ethenone.getCells(1)).fluidInputs(Materials.SulfuricAcid.getFluid(1000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Ethenone.getCells(1)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.SulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Ethenone.getCells(1)).fluidInputs(Materials.AceticAcid.getFluid(1000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Ethenone.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(1000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1)) - .fluidInputs(Materials.SulfuricAcid.getFluid(1000)).fluidOutputs(Materials.Ethenone.getGas(1000)) - .duration(8 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.AceticAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .fluidOutputs(Materials.Ethenone.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.SulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1)).fluidInputs(Materials.AceticAcid.getFluid(1000)) - .fluidOutputs(Materials.Ethenone.getGas(1000)).duration(8 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SulfuricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.DilutedSulfuricAcid.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(1000)) + .fluidOutputs(Materials.Ethenone.getGas(1000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // C2H2O + 8HNO3 = 2CN4O8 + 9H2O // Chemically this recipe is wrong, but kept for minimizing breaking change. - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethenone.getCells(1), Materials.Empty.getCells(1)) - .itemOutputs(Materials.Tetranitromethane.getCells(2)).fluidInputs(Materials.NitricAcid.getFluid(8000)) - .fluidOutputs(Materials.Water.getFluid(9000)).duration(24 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethenone.getCells(1), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.NitricAcid.getFluid(8000)) - .fluidOutputs(Materials.Tetranitromethane.getFluid(2000)).duration(24 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.NitricAcid.getCells(8), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Tetranitromethane.getCells(2), Materials.Empty.getCells(6)) - .fluidInputs(Materials.Ethenone.getGas(1000)).fluidOutputs(Materials.Water.getFluid(9000)) - .duration(24 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.NitricAcid.getCells(8), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Tetranitromethane.getCells(2), Materials.Empty.getCells(6)) - .fluidInputs(Materials.Ethenone.getGas(1000)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.NitricAcid.getCells(8), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.Empty.getCells(8)).fluidInputs(Materials.Ethenone.getGas(1000)) - .fluidOutputs(Materials.Tetranitromethane.getFluid(2000)).duration(24 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.NitricAcid.getCells(8), Materials.Empty.getCells(1)) - .itemOutputs(Materials.Water.getCells(9)).fluidInputs(Materials.Ethenone.getGas(1000)) - .fluidOutputs(Materials.Tetranitromethane.getFluid(2000)).duration(24 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethenone.getCells(1), Materials.NitricAcid.getCells(8)) - .itemOutputs(Materials.Water.getCells(9)).noFluidInputs() - .fluidOutputs(Materials.Tetranitromethane.getFluid(2000)).duration(24 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethenone.getCells(1), Materials.Empty.getCells(1)) + .itemOutputs(Materials.Tetranitromethane.getCells(2)) + .fluidInputs(Materials.NitricAcid.getFluid(8000)) + .fluidOutputs(Materials.Water.getFluid(9000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethenone.getCells(1), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.NitricAcid.getFluid(8000)) + .fluidOutputs(Materials.Tetranitromethane.getFluid(2000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.NitricAcid.getCells(8), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Tetranitromethane.getCells(2), Materials.Empty.getCells(6)) + .fluidInputs(Materials.Ethenone.getGas(1000)) + .fluidOutputs(Materials.Water.getFluid(9000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.NitricAcid.getCells(8), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Tetranitromethane.getCells(2), Materials.Empty.getCells(6)) + .fluidInputs(Materials.Ethenone.getGas(1000)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.NitricAcid.getCells(8), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.Empty.getCells(8)) + .fluidInputs(Materials.Ethenone.getGas(1000)) + .fluidOutputs(Materials.Tetranitromethane.getFluid(2000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.NitricAcid.getCells(8), Materials.Empty.getCells(1)) + .itemOutputs(Materials.Water.getCells(9)) + .fluidInputs(Materials.Ethenone.getGas(1000)) + .fluidOutputs(Materials.Tetranitromethane.getFluid(2000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethenone.getCells(1), Materials.NitricAcid.getCells(8)) + .itemOutputs(Materials.Water.getCells(9)) + .noFluidInputs() + .fluidOutputs(Materials.Tetranitromethane.getFluid(2000)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // C3H6 + C2H4 = C5H8 + 2H - GT_Values.RA.stdBuilder().itemInputs(Materials.Propene.getCells(1), Materials.Empty.getCells(1)) - .itemOutputs(Materials.Hydrogen.getCells(2)).fluidInputs(Materials.Ethylene.getGas(1000)) - .fluidOutputs(Materials.Isoprene.getFluid(1000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethylene.getCells(1), Materials.Empty.getCells(1)) - .itemOutputs(Materials.Hydrogen.getCells(2)).fluidInputs(Materials.Propene.getGas(1000)) - .fluidOutputs(Materials.Isoprene.getFluid(1000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Propene.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Isoprene.getCells(1)).fluidInputs(Materials.Ethylene.getGas(1000)) - .fluidOutputs(Materials.Hydrogen.getGas(2000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Isoprene.getCells(1)).fluidInputs(Materials.Propene.getGas(1000)) - .fluidOutputs(Materials.Hydrogen.getGas(2000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(Materials.Methane.getCells(1)).fluidInputs(Materials.Propene.getGas(2000)) - .fluidOutputs(Materials.Isoprene.getFluid(1000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Propene.getCells(2), GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(Materials.Methane.getCells(1), Materials.Empty.getCells(1)).noFluidInputs() - .fluidOutputs(Materials.Isoprene.getFluid(1000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(15)) - .itemOutputs(Materials.Isoprene.getCells(1)).fluidInputs(Materials.Propene.getGas(2000)) - .fluidOutputs(Materials.Methane.getGas(1000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Propene.getCells(2), GT_Utility.getIntegratedCircuit(15)) - .itemOutputs(Materials.Isoprene.getCells(1), Materials.Empty.getCells(1)).noFluidInputs() - .fluidOutputs(Materials.Methane.getGas(1000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Cell_Air.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.RawRubber.getDust(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Isoprene.getFluid(144)).noFluidOutputs().duration(8 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.RawRubber.getDust(3), Materials.Empty.getCells(2)) - .fluidInputs(Materials.Isoprene.getFluid(288)).noFluidOutputs().duration(16 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Isoprene.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.RawRubber.getDust(7), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Air.getGas(14000)).noFluidOutputs().duration(56 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Isoprene.getCells(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.RawRubber.getDust(21), Materials.Empty.getCells(2)) - .fluidInputs(Materials.Oxygen.getGas(14000)).noFluidOutputs().duration(1 * MINUTES + 52 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Styrene.getCells(1)).fluidInputs(Materials.Ethylene.getGas(1000)) - .fluidOutputs(Materials.Hydrogen.getGas(2000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Styrene.getCells(1)).fluidInputs(Materials.Benzene.getFluid(1000)) - .fluidOutputs(Materials.Hydrogen.getGas(2000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Benzene.getCells(1), Materials.Empty.getCells(1)) - .itemOutputs(Materials.Hydrogen.getCells(2)).fluidInputs(Materials.Ethylene.getGas(1000)) - .fluidOutputs(Materials.Styrene.getFluid(1000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethylene.getCells(1), Materials.Empty.getCells(1)) - .itemOutputs(Materials.Hydrogen.getCells(2)).fluidInputs(Materials.Benzene.getFluid(1000)) - .fluidOutputs(Materials.Styrene.getFluid(1000)).duration(6 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs(Materials.RawStyreneButadieneRubber.getDust(9), Materials.Sulfur.getDust(1)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.StyreneButadieneRubber.getMolten(1296)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Propene.getCells(1), Materials.Empty.getCells(1)) + .itemOutputs(Materials.Hydrogen.getCells(2)) + .fluidInputs(Materials.Ethylene.getGas(1000)) + .fluidOutputs(Materials.Isoprene.getFluid(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethylene.getCells(1), Materials.Empty.getCells(1)) + .itemOutputs(Materials.Hydrogen.getCells(2)) + .fluidInputs(Materials.Propene.getGas(1000)) + .fluidOutputs(Materials.Isoprene.getFluid(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Propene.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Isoprene.getCells(1)) + .fluidInputs(Materials.Ethylene.getGas(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(2000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Isoprene.getCells(1)) + .fluidInputs(Materials.Propene.getGas(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(2000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(Materials.Methane.getCells(1)) + .fluidInputs(Materials.Propene.getGas(2000)) + .fluidOutputs(Materials.Isoprene.getFluid(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Propene.getCells(2), GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(Materials.Methane.getCells(1), Materials.Empty.getCells(1)) + .noFluidInputs() + .fluidOutputs(Materials.Isoprene.getFluid(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(15)) + .itemOutputs(Materials.Isoprene.getCells(1)) + .fluidInputs(Materials.Propene.getGas(2000)) + .fluidOutputs(Materials.Methane.getGas(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Propene.getCells(2), GT_Utility.getIntegratedCircuit(15)) + .itemOutputs(Materials.Isoprene.getCells(1), Materials.Empty.getCells(1)) + .noFluidInputs() + .fluidOutputs(Materials.Methane.getGas(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Cell_Air.get(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.RawRubber.getDust(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Isoprene.getFluid(144)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.RawRubber.getDust(3), Materials.Empty.getCells(2)) + .fluidInputs(Materials.Isoprene.getFluid(288)) + .noFluidOutputs() + .duration(16 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Isoprene.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.RawRubber.getDust(7), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Air.getGas(14000)) + .noFluidOutputs() + .duration(56 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Isoprene.getCells(2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.RawRubber.getDust(21), Materials.Empty.getCells(2)) + .fluidInputs(Materials.Oxygen.getGas(14000)) + .noFluidOutputs() + .duration(1 * MINUTES + 52 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Styrene.getCells(1)) + .fluidInputs(Materials.Ethylene.getGas(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(2000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Styrene.getCells(1)) + .fluidInputs(Materials.Benzene.getFluid(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(2000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Benzene.getCells(1), Materials.Empty.getCells(1)) + .itemOutputs(Materials.Hydrogen.getCells(2)) + .fluidInputs(Materials.Ethylene.getGas(1000)) + .fluidOutputs(Materials.Styrene.getFluid(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethylene.getCells(1), Materials.Empty.getCells(1)) + .itemOutputs(Materials.Hydrogen.getCells(2)) + .fluidInputs(Materials.Benzene.getFluid(1000)) + .fluidOutputs(Materials.Styrene.getFluid(1000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.RawStyreneButadieneRubber.getDust(9), Materials.Sulfur.getDust(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.StyreneButadieneRubber.getMolten(1296)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // C6H6 + 4Cl = C6H4Cl2 + 2HCl - GT_Values.RA.stdBuilder().itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Dichlorobenzene.getCells(1)).fluidInputs(Materials.Chlorine.getGas(4000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(2000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(4), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Dichlorobenzene.getCells(1), Materials.Empty.getCells(3)) - .fluidInputs(Materials.Benzene.getFluid(1000)).fluidOutputs(Materials.HydrochloricAcid.getFluid(2000)) - .duration(12 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(4), GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(Materials.HydrochloricAcid.getCells(2), Materials.Empty.getCells(2)) - .fluidInputs(Materials.Benzene.getFluid(1000)).fluidOutputs(Materials.Dichlorobenzene.getFluid(1000)) - .duration(12 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumSulfide.getDust(3), ItemList.Cell_Air.get(8)) - .itemOutputs(Materials.Salt.getDust(2), Materials.Empty.getCells(8)) - .fluidInputs(Materials.Dichlorobenzene.getFluid(1000)) - .fluidOutputs(Materials.PolyphenyleneSulfide.getMolten(1000)).duration(12 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumSulfide.getDust(3), Materials.Oxygen.getCells(8)) - .itemOutputs(Materials.Salt.getDust(2), Materials.Empty.getCells(8)) - .fluidInputs(Materials.Dichlorobenzene.getFluid(1000)) - .fluidOutputs(Materials.PolyphenyleneSulfide.getMolten(1500)).duration(12 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Dichlorobenzene.getCells(1)) + .fluidInputs(Materials.Chlorine.getGas(4000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(2000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(4), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Dichlorobenzene.getCells(1), Materials.Empty.getCells(3)) + .fluidInputs(Materials.Benzene.getFluid(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(2000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(4), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(Materials.HydrochloricAcid.getCells(2), Materials.Empty.getCells(2)) + .fluidInputs(Materials.Benzene.getFluid(1000)) + .fluidOutputs(Materials.Dichlorobenzene.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumSulfide.getDust(3), ItemList.Cell_Air.get(8)) + .itemOutputs(Materials.Salt.getDust(2), Materials.Empty.getCells(8)) + .fluidInputs(Materials.Dichlorobenzene.getFluid(1000)) + .fluidOutputs(Materials.PolyphenyleneSulfide.getMolten(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumSulfide.getDust(3), Materials.Oxygen.getCells(8)) + .itemOutputs(Materials.Salt.getDust(2), Materials.Empty.getCells(8)) + .fluidInputs(Materials.Dichlorobenzene.getFluid(1000)) + .fluidOutputs(Materials.PolyphenyleneSulfide.getMolten(1500)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // NaCl + H2SO4 = NaHSO4 + HCl - GT_Values.RA.stdBuilder().itemInputs(Materials.Salt.getDust(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.SodiumBisulfate.getDust(7)).fluidInputs(Materials.SulfuricAcid.getFluid(1000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)).duration(3 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Salt.getDust(2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.SodiumBisulfate.getDust(7)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(3 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // NaOH + H2SO4 = NaHSO4 + H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.SodiumBisulfate.getDust(7)).fluidInputs(Materials.SulfuricAcid.getFluid(1000)) - .fluidOutputs(Materials.Water.getFluid(1000)).duration(3 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.SodiumBisulfate.getDust(7)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(3 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // Biodiesel recipes - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Methanol.getCells(1)) - .itemOutputs(Materials.Glycerol.getCells(1)).fluidInputs(Materials.SeedOil.getFluid(6000)) - .fluidOutputs(Materials.BioDiesel.getFluid(6000)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.SeedOil.getCells(6)) - .itemOutputs(Materials.BioDiesel.getCells(6)).fluidInputs(Materials.Methanol.getFluid(1000)) - .fluidOutputs(Materials.Glycerol.getFluid(1000)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Methanol.getCells(1)) - .itemOutputs(Materials.Glycerol.getCells(1)).fluidInputs(Materials.FishOil.getFluid(6000)) - .fluidOutputs(Materials.BioDiesel.getFluid(6000)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.FishOil.getCells(6)) - .itemOutputs(Materials.BioDiesel.getCells(6)).fluidInputs(Materials.Methanol.getFluid(1000)) - .fluidOutputs(Materials.Glycerol.getFluid(1000)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Ethanol.getCells(1)) - .itemOutputs(Materials.Glycerol.getCells(1)).fluidInputs(Materials.SeedOil.getFluid(6000)) - .fluidOutputs(Materials.BioDiesel.getFluid(6000)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.SeedOil.getCells(6)) - .itemOutputs(Materials.BioDiesel.getCells(6)).fluidInputs(Materials.Ethanol.getFluid(1000)) - .fluidOutputs(Materials.Glycerol.getFluid(1000)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Ethanol.getCells(1)) - .itemOutputs(Materials.Glycerol.getCells(1)).fluidInputs(Materials.FishOil.getFluid(6000)) - .fluidOutputs(Materials.BioDiesel.getFluid(6000)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.FishOil.getCells(6)) - .itemOutputs(Materials.BioDiesel.getCells(6)).fluidInputs(Materials.Ethanol.getFluid(1000)) - .fluidOutputs(Materials.Glycerol.getFluid(1000)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Methanol.getCells(9)) - .itemOutputs(Materials.Glycerol.getCells(9)).fluidInputs(Materials.SeedOil.getFluid(54000)) - .fluidOutputs(Materials.BioDiesel.getFluid(54000)).duration(4 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.SeedOil.getCells(54)) - .itemOutputs(Materials.BioDiesel.getCells(54)).fluidInputs(Materials.Methanol.getFluid(9000)) - .fluidOutputs(Materials.Glycerol.getFluid(9000)).duration(4 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Methanol.getCells(9)) - .itemOutputs(Materials.Glycerol.getCells(9)).fluidInputs(Materials.FishOil.getFluid(54000)) - .fluidOutputs(Materials.BioDiesel.getFluid(54000)).duration(4 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.FishOil.getCells(54)) - .itemOutputs(Materials.BioDiesel.getCells(54)).fluidInputs(Materials.Methanol.getFluid(9000)) - .fluidOutputs(Materials.Glycerol.getFluid(9000)).duration(4 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Ethanol.getCells(9)) - .itemOutputs(Materials.Glycerol.getCells(9)).fluidInputs(Materials.SeedOil.getFluid(54000)) - .fluidOutputs(Materials.BioDiesel.getFluid(54000)).duration(4 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.SeedOil.getCells(54)) - .itemOutputs(Materials.BioDiesel.getCells(54)).fluidInputs(Materials.Ethanol.getFluid(9000)) - .fluidOutputs(Materials.Glycerol.getFluid(9000)).duration(4 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Ethanol.getCells(9)) - .itemOutputs(Materials.Glycerol.getCells(9)).fluidInputs(Materials.FishOil.getFluid(54000)) - .fluidOutputs(Materials.BioDiesel.getFluid(54000)).duration(4 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.FishOil.getCells(54)) - .itemOutputs(Materials.BioDiesel.getCells(54)).fluidInputs(Materials.Ethanol.getFluid(9000)) - .fluidOutputs(Materials.Glycerol.getFluid(9000)).duration(4 * MINUTES + 30 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Methanol.getCells(1)) + .itemOutputs(Materials.Glycerol.getCells(1)) + .fluidInputs(Materials.SeedOil.getFluid(6000)) + .fluidOutputs(Materials.BioDiesel.getFluid(6000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.SeedOil.getCells(6)) + .itemOutputs(Materials.BioDiesel.getCells(6)) + .fluidInputs(Materials.Methanol.getFluid(1000)) + .fluidOutputs(Materials.Glycerol.getFluid(1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Methanol.getCells(1)) + .itemOutputs(Materials.Glycerol.getCells(1)) + .fluidInputs(Materials.FishOil.getFluid(6000)) + .fluidOutputs(Materials.BioDiesel.getFluid(6000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.FishOil.getCells(6)) + .itemOutputs(Materials.BioDiesel.getCells(6)) + .fluidInputs(Materials.Methanol.getFluid(1000)) + .fluidOutputs(Materials.Glycerol.getFluid(1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Ethanol.getCells(1)) + .itemOutputs(Materials.Glycerol.getCells(1)) + .fluidInputs(Materials.SeedOil.getFluid(6000)) + .fluidOutputs(Materials.BioDiesel.getFluid(6000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.SeedOil.getCells(6)) + .itemOutputs(Materials.BioDiesel.getCells(6)) + .fluidInputs(Materials.Ethanol.getFluid(1000)) + .fluidOutputs(Materials.Glycerol.getFluid(1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.Ethanol.getCells(1)) + .itemOutputs(Materials.Glycerol.getCells(1)) + .fluidInputs(Materials.FishOil.getFluid(6000)) + .fluidOutputs(Materials.BioDiesel.getFluid(6000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDustTiny(1), Materials.FishOil.getCells(6)) + .itemOutputs(Materials.BioDiesel.getCells(6)) + .fluidInputs(Materials.Ethanol.getFluid(1000)) + .fluidOutputs(Materials.Glycerol.getFluid(1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Methanol.getCells(9)) + .itemOutputs(Materials.Glycerol.getCells(9)) + .fluidInputs(Materials.SeedOil.getFluid(54000)) + .fluidOutputs(Materials.BioDiesel.getFluid(54000)) + .duration(4 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.SeedOil.getCells(54)) + .itemOutputs(Materials.BioDiesel.getCells(54)) + .fluidInputs(Materials.Methanol.getFluid(9000)) + .fluidOutputs(Materials.Glycerol.getFluid(9000)) + .duration(4 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Methanol.getCells(9)) + .itemOutputs(Materials.Glycerol.getCells(9)) + .fluidInputs(Materials.FishOil.getFluid(54000)) + .fluidOutputs(Materials.BioDiesel.getFluid(54000)) + .duration(4 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.FishOil.getCells(54)) + .itemOutputs(Materials.BioDiesel.getCells(54)) + .fluidInputs(Materials.Methanol.getFluid(9000)) + .fluidOutputs(Materials.Glycerol.getFluid(9000)) + .duration(4 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Ethanol.getCells(9)) + .itemOutputs(Materials.Glycerol.getCells(9)) + .fluidInputs(Materials.SeedOil.getFluid(54000)) + .fluidOutputs(Materials.BioDiesel.getFluid(54000)) + .duration(4 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.SeedOil.getCells(54)) + .itemOutputs(Materials.BioDiesel.getCells(54)) + .fluidInputs(Materials.Ethanol.getFluid(9000)) + .fluidOutputs(Materials.Glycerol.getFluid(9000)) + .duration(4 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.Ethanol.getCells(9)) + .itemOutputs(Materials.Glycerol.getCells(9)) + .fluidInputs(Materials.FishOil.getFluid(54000)) + .fluidOutputs(Materials.BioDiesel.getFluid(54000)) + .duration(4 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(1), Materials.FishOil.getCells(54)) + .itemOutputs(Materials.BioDiesel.getCells(54)) + .fluidInputs(Materials.Ethanol.getFluid(9000)) + .fluidOutputs(Materials.Glycerol.getFluid(9000)) + .duration(4 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // C3H8O3 + 3HNO3 =H2SO4= C3H5N3O9 + 3H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.Glycerol.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Glyceryl.getCells(1)).fluidInputs(Materials.NitrationMixture.getFluid(6000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(3000)).duration(9 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Glycerol.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Glyceryl.getCells(1)) + .fluidInputs(Materials.NitrationMixture.getFluid(6000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(3000)) + .duration(9 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.NitrationMixture.getCells(6), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Glyceryl.getCells(1), Materials.Empty.getCells(5)) - .fluidInputs(Materials.Glycerol.getFluid(1000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(3000)).duration(9 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.NitrationMixture.getCells(6), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Glyceryl.getCells(1), Materials.Empty.getCells(5)) + .fluidInputs(Materials.Glycerol.getFluid(1000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(3000)) + .duration(9 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs(Materials.NitrationMixture.getCells(6), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.DilutedSulfuricAcid.getCells(3), Materials.Empty.getCells(3)) - .fluidInputs(Materials.Glycerol.getFluid(1000)).fluidOutputs(Materials.Glyceryl.getFluid(1000)) - .duration(9 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + .itemInputs(Materials.NitrationMixture.getCells(6), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.DilutedSulfuricAcid.getCells(3), Materials.Empty.getCells(3)) + .fluidInputs(Materials.Glycerol.getFluid(1000)) + .fluidOutputs(Materials.Glyceryl.getFluid(1000)) + .duration(9 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // CaO + CO2 = CaCO3 - GT_Values.RA.stdBuilder().itemInputs(Materials.Quicklime.getDust(2)).itemOutputs(Materials.Calcite.getDust(5)) - .fluidInputs(Materials.CarbonDioxide.getGas(1000)).noFluidOutputs().duration(4 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Quicklime.getDust(2)) + .itemOutputs(Materials.Calcite.getDust(5)) + .fluidInputs(Materials.CarbonDioxide.getGas(1000)) + .noFluidOutputs() + .duration(4 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Calcite.getDust(5), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Quicklime.getDust(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Calcite.getDust(5), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Quicklime.getDust(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // MgO + CO2 = MgCO3 - GT_Values.RA.stdBuilder().itemInputs(Materials.Magnesia.getDust(2)).itemOutputs(Materials.Magnesite.getDust(5)) - .fluidInputs(Materials.CarbonDioxide.getGas(1000)).noFluidOutputs().duration(4 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Magnesia.getDust(2)) + .itemOutputs(Materials.Magnesite.getDust(5)) + .fluidInputs(Materials.CarbonDioxide.getGas(1000)) + .noFluidOutputs() + .duration(4 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Magnesite.getDust(5), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Magnesia.getDust(2)).noFluidInputs() - .fluidOutputs(Materials.CarbonDioxide.getGas(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Magnesite.getDust(5), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Magnesia.getDust(2)) + .noFluidInputs() + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // C6H6 + 2Cl = C6H5Cl + HCl - GT_Values.RA.stdBuilder().itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Chlorobenzene.getCells(1)).fluidInputs(Materials.Chlorine.getGas(2000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Benzene.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Chlorobenzene.getCells(1)) + .fluidInputs(Materials.Chlorine.getGas(2000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Chlorobenzene.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Benzene.getFluid(1000)).fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) - .duration(12 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Chlorobenzene.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Benzene.getFluid(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Benzene.getFluid(1000)).fluidOutputs(Materials.Chlorobenzene.getFluid(1000)) - .duration(12 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(2), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Benzene.getFluid(1000)) + .fluidOutputs(Materials.Chlorobenzene.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // C6H5Cl + H2O = C6H6O + HCl - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.DilutedHydrochloricAcid.getCells(1)) - .fluidInputs(Materials.Chlorobenzene.getFluid(1000)).fluidOutputs(Materials.Phenol.getFluid(1000)) - .duration(12 * SECONDS).eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.DilutedHydrochloricAcid.getCells(1)) + .fluidInputs(Materials.Chlorobenzene.getFluid(1000)) + .fluidOutputs(Materials.Phenol.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorobenzene.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.DilutedHydrochloricAcid.getCells(1)).fluidInputs(Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.Phenol.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorobenzene.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.DilutedHydrochloricAcid.getCells(1)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.Phenol.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Phenol.getCells(1)).fluidInputs(Materials.Chlorobenzene.getFluid(1000)) - .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)).duration(12 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Water.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Phenol.getCells(1)) + .fluidInputs(Materials.Chlorobenzene.getFluid(1000)) + .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorobenzene.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Phenol.getCells(1)).fluidInputs(Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)).duration(12 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorobenzene.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Phenol.getCells(1)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // C6H5Cl + NaOH = C6H6O + NaCl - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(12), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Salt.getDust(8)).fluidInputs(Materials.Chlorobenzene.getFluid(4000)) - .fluidOutputs(Materials.Phenol.getFluid(4000)).duration(48 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(12), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Salt.getDust(8)) + .fluidInputs(Materials.Chlorobenzene.getFluid(4000)) + .fluidOutputs(Materials.Phenol.getFluid(4000)) + .duration(48 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(Materials.GasolineRaw.getCells(10), Materials.Toluene.getCells(1)) - .itemOutputs(Materials.GasolineRegular.getCells(11)).noFluidInputs().noFluidOutputs() - .duration(10 * TICKS).eut(TierEU.RECIPE_HV).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.GasolineRaw.getCells(10), Materials.Toluene.getCells(1)) + .itemOutputs(Materials.GasolineRegular.getCells(11)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // Oxide Recipe - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Antimony.getDust(2)) - .itemOutputs(Materials.AntimonyTrioxide.getDust(5)).fluidInputs(Materials.Oxygen.getGas(3000)) - .noFluidOutputs().duration(20 * TICKS).eut(30).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Antimony.getDust(2)) + .itemOutputs(Materials.AntimonyTrioxide.getDust(5)) + .fluidInputs(Materials.Oxygen.getGas(3000)) + .noFluidOutputs() + .duration(20 * TICKS) + .eut(30) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Lead.getDust(1)) - .itemOutputs(Materials.Massicot.getDust(2)).fluidInputs(Materials.Oxygen.getGas(1000)).noFluidOutputs() - .duration(20 * TICKS).eut(30).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Lead.getDust(1)) + .itemOutputs(Materials.Massicot.getDust(2)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .noFluidOutputs() + .duration(20 * TICKS) + .eut(30) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Arsenic.getDust(2)) - .itemOutputs(Materials.ArsenicTrioxide.getDust(5)).fluidInputs(Materials.Oxygen.getGas(3000)) - .noFluidOutputs().duration(20 * TICKS).eut(30).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Arsenic.getDust(2)) + .itemOutputs(Materials.ArsenicTrioxide.getDust(5)) + .fluidInputs(Materials.Oxygen.getGas(3000)) + .noFluidOutputs() + .duration(20 * TICKS) + .eut(30) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Cobalt.getDust(1)) - .itemOutputs(Materials.CobaltOxide.getDust(2)).fluidInputs(Materials.Oxygen.getGas(1000)) - .noFluidOutputs().duration(20 * TICKS).eut(30).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Cobalt.getDust(1)) + .itemOutputs(Materials.CobaltOxide.getDust(2)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .noFluidOutputs() + .duration(20 * TICKS) + .eut(30) + .addTo(UniversalChemical); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Zinc.getDust(1)) - .itemOutputs(Materials.Zincite.getDust(2)).fluidInputs(Materials.Oxygen.getGas(1000)).noFluidOutputs() - .duration(20 * TICKS).eut(30).addTo(UniversalChemical); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2), Materials.Zinc.getDust(1)) + .itemOutputs(Materials.Zincite.getDust(2)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .noFluidOutputs() + .duration(20 * TICKS) + .eut(30) + .addTo(UniversalChemical); if (BartWorks.isModLoaded()) { // CaSi2 + 2HCl = 2Si + CaCl2 + 2H GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2), - getModItem(BartWorks.modID, "gt.bwMetaGenerateddust", 3L, 63)) - .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) - .fluidOutputs(Materials.Hydrogen.getGas(2000)).duration(45 * SECONDS).eut(30) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2), + getModItem(BartWorks.modID, "gt.bwMetaGenerateddust", 3L, 63)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) + .fluidOutputs(Materials.Hydrogen.getGas(2000)) + .duration(45 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // SiCl4 + 2Zn = 2ZnCl2 + Si GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), - getModItem(BartWorks.modID, "gt.bwMetaGenerateddust", 6L, 10052)) - .fluidInputs(Materials.SiliconTetrachloride.getFluid(1000)).noFluidOutputs().duration(20 * SECONDS) - .eut(30).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), + getModItem(BartWorks.modID, "gt.bwMetaGenerateddust", 6L, 10052)) + .fluidInputs(Materials.SiliconTetrachloride.getFluid(1000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(30) + .addTo(UniversalChemical); } if (GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded()) { @@ -2453,100 +3933,137 @@ public class ChemicalRecipes implements Runnable { // C4H8O + 2H =Pd= C4H10O GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Butyraldehyde, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Palladium, 1)) - .itemOutputs(ItemList.Cell_Empty.get(1)).fluidInputs(Materials.Hydrogen.getGas(2000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("butanol"), 1000)).duration(10 * SECONDS) - .eut(30).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Butyraldehyde, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Palladium, 1)) + .itemOutputs(ItemList.Cell_Empty.get(1)) + .fluidInputs(Materials.Hydrogen.getGas(2000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("butanol"), 1000)) + .duration(10 * SECONDS) + .eut(30) + .addTo(UniversalChemical); // 4CH2O + C2H4O =NaOH= C5H12O4 + CO GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(GTPlusPlus.modID, "Formaldehyde", 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21), - Materials.Empty.getCells(4)) - .fluidInputs(MaterialsKevlar.Acetaldehyde.getGas(1000)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)).duration(30 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(UniversalChemical); + .itemInputs( + getModItem(GTPlusPlus.modID, "Formaldehyde", 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21), + Materials.Empty.getCells(4)) + .fluidInputs(MaterialsKevlar.Acetaldehyde.getGas(1000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // 4CH2O + C2H4O =NaOH= C5H12O4 + CO GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Acetaldehyde, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21), - Materials.Empty.getCells(1)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("formaldehyde"), 4000)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)).duration(30 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.Acetaldehyde, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21), + Materials.Empty.getCells(1)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("formaldehyde"), 4000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // CaC2 + 2H2O = Ca(OH)2 + C2H2 GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CalciumCarbide, 3), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(GTPlusPlus.modID, "itemDustCalciumHydroxide", 5)) - .fluidInputs(Materials.Water.getFluid(2000)).fluidOutputs(MaterialsKevlar.Acetylene.getGas(1000)) - .duration(15 * SECONDS).eut(TierEU.RECIPE_HV).addTo(UniversalChemical); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CalciumCarbide, 3), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(GTPlusPlus.modID, "itemDustCalciumHydroxide", 5)) + .fluidInputs(Materials.Water.getFluid(2000)) + .fluidOutputs(MaterialsKevlar.Acetylene.getGas(1000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // Co(NO3)2 + 2NaOH = Co(OH)2 + 2NaNO3 GT_Values.RA.stdBuilder() - .itemInputs( - MaterialsKevlar.CobaltIINitrate.getDust(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6)) - .itemOutputs( - MaterialsKevlar.CobaltIIHydroxide.getDust(5), - getModItem(GTPlusPlus.modID, "itemDustSodiumNitrate", 10)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(UniversalChemical); + .itemInputs( + MaterialsKevlar.CobaltIINitrate.getDust(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6)) + .itemOutputs( + MaterialsKevlar.CobaltIIHydroxide.getDust(5), + getModItem(GTPlusPlus.modID, "itemDustSodiumNitrate", 10)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); } } public void addDefaultPolymerizationRecipes(Fluid aBasicMaterial, ItemStack aBasicMaterialCell, Fluid aPolymer) { // Oxygen/Titaniumtetrafluoride -> +50% Output each - GT_Values.RA.stdBuilder().itemInputs(ItemList.Cell_Air.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(new GT_FluidStack(aBasicMaterial, 144)) - .fluidOutputs(new GT_FluidStack(aPolymer, 144)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(new GT_FluidStack(aBasicMaterial, 144)) - .fluidOutputs(new GT_FluidStack(aPolymer, 216)).duration(8 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(aBasicMaterialCell, GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Air.getGas(14000)) - .fluidOutputs(new GT_FluidStack(aPolymer, 1000)).duration(56 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(aBasicMaterialCell, GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Oxygen.getGas(7000)) - .fluidOutputs(new GT_FluidStack(aPolymer, 1500)).duration(56 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)).noItemOutputs() - .fluidInputs( - new GT_FluidStack(aBasicMaterial, 2160), - Materials.Air.getGas(7500), - Materials.Titaniumtetrachloride.getFluid(100)) - .fluidOutputs(new GT_FluidStack(aPolymer, 3240)).duration(40 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)).noItemOutputs() - .fluidInputs( - new GT_FluidStack(aBasicMaterial, 2160), - Materials.Oxygen.getGas(7500), - Materials.Titaniumtetrachloride.getFluid(100)) - .fluidOutputs(new GT_FluidStack(aPolymer, 4320)).duration(40 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Cell_Air.get(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(new GT_FluidStack(aBasicMaterial, 144)) + .fluidOutputs(new GT_FluidStack(aPolymer, 144)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(new GT_FluidStack(aBasicMaterial, 144)) + .fluidOutputs(new GT_FluidStack(aPolymer, 216)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(aBasicMaterialCell, GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Air.getGas(14000)) + .fluidOutputs(new GT_FluidStack(aPolymer, 1000)) + .duration(56 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(aBasicMaterialCell, GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(7000)) + .fluidOutputs(new GT_FluidStack(aPolymer, 1500)) + .duration(56 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs( + new GT_FluidStack(aBasicMaterial, 2160), + Materials.Air.getGas(7500), + Materials.Titaniumtetrachloride.getFluid(100)) + .fluidOutputs(new GT_FluidStack(aPolymer, 3240)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs( + new GT_FluidStack(aBasicMaterial, 2160), + Materials.Oxygen.getGas(7500), + Materials.Titaniumtetrachloride.getFluid(100)) + .fluidOutputs(new GT_FluidStack(aPolymer, 4320)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sMultiblockChemicalRecipes); } @@ -2578,1531 +4095,2244 @@ public class ChemicalRecipes implements Runnable { } public void singleBlockOnly() { - GT_Values.RA.stdBuilder().itemInputs(Materials.Methane.getCells(1), Materials.Empty.getCells(2)) - .itemOutputs(Materials.HydrochloricAcid.getCells(3)).fluidInputs(Materials.Chlorine.getGas(6000)) - .fluidOutputs(Materials.Chloroform.getFluid(1000)).duration(4 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methane.getCells(1), Materials.Empty.getCells(2)) + .itemOutputs(Materials.HydrochloricAcid.getCells(3)) + .fluidInputs(Materials.Chlorine.getGas(6000)) + .fluidOutputs(Materials.Chloroform.getFluid(1000)) + .duration(4 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Silicon.getDust(1), Materials.Chloromethane.getCells(2)) - .itemOutputs(Materials.Empty.getCells(2)).noFluidInputs() - .fluidOutputs(Materials.Dimethyldichlorosilane.getFluid(1000)).duration(12 * SECONDS).eut(96) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Silicon.getDust(1), Materials.Chloromethane.getCells(2)) + .itemOutputs(Materials.Empty.getCells(2)) + .noFluidInputs() + .fluidOutputs(Materials.Dimethyldichlorosilane.getFluid(1000)) + .duration(12 * SECONDS) + .eut(96) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Dimethyldichlorosilane.getCells(1), Materials.Water.getCells(1)) - .itemOutputs(Materials.Polydimethylsiloxane.getDust(3), Materials.Empty.getCells(2)).noFluidInputs() - .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)).duration(12 * SECONDS).eut(96) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Dimethyldichlorosilane.getCells(1), Materials.Water.getCells(1)) + .itemOutputs(Materials.Polydimethylsiloxane.getDust(3), Materials.Empty.getCells(2)) + .noFluidInputs() + .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(1000)) + .duration(12 * SECONDS) + .eut(96) + .addTo(sChemicalRecipes); // Ca5(PO4)3Cl + 5H2SO4 + 10H2O = 5CaSO4(H2O)2 + HCl + 3H3PO4 - GT_Values.RA.stdBuilder().itemInputs(Materials.Apatite.getDust(9), Materials.SulfuricAcid.getCells(5)) - .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(4)) - .fluidInputs(Materials.Water.getFluid(10000)).fluidOutputs(Materials.PhosphoricAcid.getFluid(3000)) - .duration(16 * SECONDS).eut(30).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Apatite.getDust(9), Materials.SulfuricAcid.getCells(5)) + .itemOutputs(Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(4)) + .fluidInputs(Materials.Water.getFluid(10000)) + .fluidOutputs(Materials.PhosphoricAcid.getFluid(3000)) + .duration(16 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); // 10O + 4P = P4O10 - GT_Values.RA.stdBuilder().itemInputs(Materials.Phosphorus.getDust(4)) - .itemOutputs(Materials.PhosphorousPentoxide.getDust(14)).fluidInputs(Materials.Oxygen.getGas(10000)) - .noFluidOutputs().duration(2 * SECONDS).eut(30).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Phosphorus.getDust(4)) + .itemOutputs(Materials.PhosphorousPentoxide.getDust(14)) + .fluidInputs(Materials.Oxygen.getGas(10000)) + .noFluidOutputs() + .duration(2 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); // HCl + C3H8O3 = C3H5ClO + 2H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Glycerol.getCells(1)) - .itemOutputs(Materials.Water.getCells(2)).noFluidInputs() - .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)).duration(24 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Glycerol.getCells(1)) + .itemOutputs(Materials.Water.getCells(2)) + .noFluidInputs() + .fluidOutputs(Materials.Epichlorohydrin.getFluid(1000)) + .duration(24 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); // H2O + Cl =Hg= HClO + H - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(10), Materials.Mercury.getCells(1)) - .itemOutputs(Materials.Hydrogen.getCells(10), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Water.getFluid(10000)).fluidOutputs(Materials.HypochlorousAcid.getFluid(10000)) - .duration(30 * SECONDS).eut(8).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(10), Materials.Mercury.getCells(1)) + .itemOutputs(Materials.Hydrogen.getCells(10), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Water.getFluid(10000)) + .fluidOutputs(Materials.HypochlorousAcid.getFluid(10000)) + .duration(30 * SECONDS) + .eut(8) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(10), Materials.Mercury.getCells(1)) - .itemOutputs(Materials.Hydrogen.getCells(10), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Chlorine.getGas(10000)).fluidOutputs(Materials.HypochlorousAcid.getFluid(10000)) - .duration(30 * SECONDS).eut(8).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Water.getCells(10), Materials.Mercury.getCells(1)) + .itemOutputs(Materials.Hydrogen.getCells(10), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Chlorine.getGas(10000)) + .fluidOutputs(Materials.HypochlorousAcid.getFluid(10000)) + .duration(30 * SECONDS) + .eut(8) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Chlorine.getCells(1), Materials.Water.getCells(1)) - .itemOutputs(Materials.Hydrogen.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Mercury.getFluid(100)).fluidOutputs(Materials.HypochlorousAcid.getFluid(1000)) - .duration(3 * SECONDS).eut(8).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Chlorine.getCells(1), Materials.Water.getCells(1)) + .itemOutputs(Materials.Hydrogen.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Mercury.getFluid(100)) + .fluidOutputs(Materials.HypochlorousAcid.getFluid(1000)) + .duration(3 * SECONDS) + .eut(8) + .addTo(sChemicalRecipes); // P + 3Cl = PCl3 - GT_Values.RA.stdBuilder().itemInputs(Materials.Phosphorus.getDust(1), Materials.Chlorine.getCells(3)) - .itemOutputs(ItemList.Cell_Empty.get(3)).noFluidInputs() - .fluidOutputs(MaterialsKevlar.PhosphorusTrichloride.getFluid(1000)).duration(10 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Phosphorus.getDust(1), Materials.Chlorine.getCells(3)) + .itemOutputs(ItemList.Cell_Empty.get(3)) + .noFluidInputs() + .fluidOutputs(MaterialsKevlar.PhosphorusTrichloride.getFluid(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.EthyleneOxide, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 5)) - .itemOutputs(ItemList.Cell_Empty.get(6)).fluidInputs(Materials.Dimethyldichlorosilane.getFluid(4000)) - .fluidOutputs(MaterialsKevlar.SiliconOil.getFluid(5000)).duration(30 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.EthyleneOxide, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 5)) + .itemOutputs(ItemList.Cell_Empty.get(6)) + .fluidInputs(Materials.Dimethyldichlorosilane.getFluid(4000)) + .fluidOutputs(MaterialsKevlar.SiliconOil.getFluid(5000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.EthyleneOxide, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Dimethyldichlorosilane, 4)) - .itemOutputs(ItemList.Cell_Empty.get(5)).fluidInputs(Materials.Water.getFluid(5000)) - .fluidOutputs(MaterialsKevlar.SiliconOil.getFluid(5000)).duration(30 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.EthyleneOxide, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Dimethyldichlorosilane, 4)) + .itemOutputs(ItemList.Cell_Empty.get(5)) + .fluidInputs(Materials.Water.getFluid(5000)) + .fluidOutputs(MaterialsKevlar.SiliconOil.getFluid(5000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Cell_Empty.get(1)).fluidInputs(MaterialsKevlar.EthyleneOxide.getGas(1000)) - .fluidOutputs(MaterialsKevlar.Ethyleneglycol.getFluid(1000)).duration(10 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sChemicalRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(ItemList.Cell_Empty.get(1)) + .fluidInputs(MaterialsKevlar.EthyleneOxide.getGas(1000)) + .fluidOutputs(MaterialsKevlar.Ethyleneglycol.getFluid(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs(MaterialsKevlar.CobaltIIHydroxide.getDust(5), MaterialsKevlar.NaphthenicAcid.getCells(1)) - .itemOutputs(MaterialsKevlar.CobaltIINaphthenate.getDust(41), ItemList.Cell_Empty.get(1)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sChemicalRecipes); + .itemInputs( + MaterialsKevlar.CobaltIIHydroxide.getDust(5), + MaterialsKevlar.NaphthenicAcid.getCells(1)) + .itemOutputs(MaterialsKevlar.CobaltIINaphthenate.getDust(41), ItemList.Cell_Empty.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs(MaterialsKevlar.CobaltIIAcetate.getDust(15), MaterialsKevlar.NaphthenicAcid.getCells(1)) - .itemOutputs(MaterialsKevlar.CobaltIINaphthenate.getDust(41), ItemList.Cell_Empty.get(1)) - .noFluidInputs().fluidOutputs(Materials.AceticAcid.getFluid(1500)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sChemicalRecipes); + .itemInputs(MaterialsKevlar.CobaltIIAcetate.getDust(15), MaterialsKevlar.NaphthenicAcid.getCells(1)) + .itemOutputs(MaterialsKevlar.CobaltIINaphthenate.getDust(41), ItemList.Cell_Empty.get(1)) + .noFluidInputs() + .fluidOutputs(Materials.AceticAcid.getFluid(1500)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 4)) - .itemOutputs(ItemList.Cell_Empty.get(4)).noFluidInputs() - .fluidOutputs(Materials.SiliconTetrachloride.getFluid(1000)).duration(20 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 4)) + .itemOutputs(ItemList.Cell_Empty.get(4)) + .noFluidInputs() + .fluidOutputs(Materials.SiliconTetrachloride.getFluid(1000)) + .duration(20 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 3), - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 1)) - .noItemOutputs().fluidInputs(Materials.SulfuricAcid.getFluid(4000)) - .fluidOutputs(new FluidStack(ItemList.sIndiumConcentrate, 8000)).duration(3 * SECONDS).eut(150) - .addTo(sChemicalRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 3), + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 1)) + .noItemOutputs() + .fluidInputs(Materials.SulfuricAcid.getFluid(4000)) + .fluidOutputs(new FluidStack(ItemList.sIndiumConcentrate, 8000)) + .duration(3 * SECONDS) + .eut(150) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Carbon.getDust(1), Materials.Empty.getCells(1)) - .itemOutputs(Materials.Methane.getCells(1)).fluidInputs(Materials.Hydrogen.getGas(4000)) - .noFluidOutputs().duration(10 * SECONDS).eut(30).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Carbon.getDust(1), Materials.Empty.getCells(1)) + .itemOutputs(Materials.Methane.getCells(1)) + .fluidInputs(Materials.Hydrogen.getGas(4000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); // O + 2H = H2O GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(ItemList.Cell_Empty.get(1)).fluidInputs(Materials.Hydrogen.getGas(2000)) - .fluidOutputs(GT_ModHandler.getDistilledWater(1000)).duration(10 * TICKS).eut(30) - .addTo(sChemicalRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(ItemList.Cell_Empty.get(1)) + .fluidInputs(Materials.Hydrogen.getGas(2000)) + .fluidOutputs(GT_ModHandler.getDistilledWater(1000)) + .duration(10 * TICKS) + .eut(30) + .addTo(sChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1), - GT_Utility.getIntegratedCircuit(22)) - .itemOutputs(ItemList.Cell_Empty.get(1)).fluidInputs(Materials.Oxygen.getGas(500)) - .fluidOutputs(GT_ModHandler.getDistilledWater(500)).duration(5 * TICKS).eut(30).addTo(sChemicalRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1), + GT_Utility.getIntegratedCircuit(22)) + .itemOutputs(ItemList.Cell_Empty.get(1)) + .fluidInputs(Materials.Oxygen.getGas(500)) + .fluidOutputs(GT_ModHandler.getDistilledWater(500)) + .duration(5 * TICKS) + .eut(30) + .addTo(sChemicalRecipes); // Si + 4Cl = SiCl4 GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), - ItemList.Cell_Empty.get(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2)) - .fluidInputs(Materials.HydrochloricAcid.getFluid(3000)) - .fluidOutputs(Materials.Trichlorosilane.getFluid(1000)).duration(15 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), + ItemList.Cell_Empty.get(2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(3000)) + .fluidOutputs(Materials.Trichlorosilane.getFluid(1000)) + .duration(15 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Silane, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), - ItemList.Cell_Empty.get(1)) - .noFluidInputs().fluidOutputs(Materials.Hydrogen.getGas(4000)).duration(15 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Silane, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), + ItemList.Cell_Empty.get(1)) + .noFluidInputs() + .fluidOutputs(Materials.Hydrogen.getGas(4000)) + .duration(15 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Silane, 1), ItemList.Cell_Empty.get(3)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 4)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(30).addTo(sChemicalRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Silane, 1), + ItemList.Cell_Empty.get(3)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); // S + 2Cl = SCl2 GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 16)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 8), - ItemList.Cell_Empty.get(8)) - .noFluidInputs().noFluidOutputs().duration(40 * SECONDS).eut(30).addTo(sChemicalRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 16)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 8), + ItemList.Cell_Empty.get(8)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8), ItemList.Cell_Empty.get(8)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 8)) - .fluidInputs(Materials.Chlorine.getGas(16000)).noFluidOutputs().duration(40 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 8), + ItemList.Cell_Empty.get(8)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsKevlar.SulfurDichloride, 8)) + .fluidInputs(Materials.Chlorine.getGas(16000)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); // C6H6 + C3H6 = C9H12 - GT_Values.RA.stdBuilder().itemInputs(Materials.Propene.getCells(8), Materials.PhosphoricAcid.getCells(1)) - .itemOutputs(Materials.Empty.getCells(9)).fluidInputs(Materials.Benzene.getFluid(8000)) - .fluidOutputs(Materials.Cumene.getFluid(8000)).duration(1 * MINUTES + 36 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Propene.getCells(8), Materials.PhosphoricAcid.getCells(1)) + .itemOutputs(Materials.Empty.getCells(9)) + .fluidInputs(Materials.Benzene.getFluid(8000)) + .fluidOutputs(Materials.Cumene.getFluid(8000)) + .duration(1 * MINUTES + 36 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.PhosphoricAcid.getCells(1), Materials.Benzene.getCells(8)) - .itemOutputs(Materials.Empty.getCells(9)).fluidInputs(Materials.Propene.getGas(8000)) - .fluidOutputs(Materials.Cumene.getFluid(8000)).duration(1 * MINUTES + 36 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.PhosphoricAcid.getCells(1), Materials.Benzene.getCells(8)) + .itemOutputs(Materials.Empty.getCells(9)) + .fluidInputs(Materials.Propene.getGas(8000)) + .fluidOutputs(Materials.Cumene.getFluid(8000)) + .duration(1 * MINUTES + 36 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Benzene.getCells(1), Materials.Propene.getCells(1)) - .itemOutputs(Materials.Empty.getCells(2)).fluidInputs(Materials.PhosphoricAcid.getFluid(125)) - .fluidOutputs(Materials.Cumene.getFluid(1000)).duration(12 * SECONDS).eut(30).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Benzene.getCells(1), Materials.Propene.getCells(1)) + .itemOutputs(Materials.Empty.getCells(2)) + .fluidInputs(Materials.PhosphoricAcid.getFluid(125)) + .fluidOutputs(Materials.Cumene.getFluid(1000)) + .duration(12 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); // C3H6O + 2C6H6O =HCl= C15H16O2 + H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.Acetone.getCells(1), Materials.Phenol.getCells(2)) - .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(2)) - .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) - .fluidOutputs(Materials.BisphenolA.getFluid(1000)).duration(8 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Acetone.getCells(1), Materials.Phenol.getCells(2)) + .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(2)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(Materials.BisphenolA.getFluid(1000)) + .duration(8 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Acetone.getCells(1)) - .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Phenol.getFluid(2000)).fluidOutputs(Materials.BisphenolA.getFluid(1000)) - .duration(8 * SECONDS).eut(30).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Acetone.getCells(1)) + .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Phenol.getFluid(2000)) + .fluidOutputs(Materials.BisphenolA.getFluid(1000)) + .duration(8 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Phenol.getCells(2), Materials.HydrochloricAcid.getCells(1)) - .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(2)) - .fluidInputs(Materials.Acetone.getFluid(1000)).fluidOutputs(Materials.BisphenolA.getFluid(1000)) - .duration(8 * SECONDS).eut(30).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Phenol.getCells(2), Materials.HydrochloricAcid.getCells(1)) + .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(2)) + .fluidInputs(Materials.Acetone.getFluid(1000)) + .fluidOutputs(Materials.BisphenolA.getFluid(1000)) + .duration(8 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); // N + 3H = NH3 - GT_Values.RA.stdBuilder().itemInputs(Materials.Nitrogen.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Hydrogen.getGas(3000)) - .fluidOutputs(Materials.Ammonia.getGas(1000)).duration(16 * SECONDS).eut(384).addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Hydrogen.getCells(3), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(3)).fluidInputs(Materials.Nitrogen.getGas(1000)) - .fluidOutputs(Materials.Ammonia.getGas(1000)).duration(16 * SECONDS).eut(384).addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Nitrogen.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Ammonia.getCells(1)).fluidInputs(Materials.Hydrogen.getGas(3000)) - .noFluidOutputs().duration(16 * SECONDS).eut(384).addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Hydrogen.getCells(3), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Ammonia.getCells(1), Materials.Empty.getCells(2)) - .fluidInputs(Materials.Nitrogen.getGas(1000)).noFluidOutputs().duration(16 * SECONDS).eut(384) - .addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Ammonia.getCells(1), Materials.Empty.getCells(1)) - .itemOutputs(Materials.Water.getCells(2)).fluidInputs(Materials.Methanol.getFluid(2000)) - .fluidOutputs(Materials.Dimethylamine.getGas(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Ammonia.getCells(4), Materials.Empty.getCells(2)) - .itemOutputs(Materials.Water.getCells(6)).fluidInputs(Materials.Oxygen.getGas(10000)) - .fluidOutputs(Materials.NitricOxide.getGas(4000)).duration(16 * SECONDS).eut(30) - .addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) - .itemOutputs(Materials.NitricAcid.getCells(2)).fluidInputs(Materials.NitrogenDioxide.getGas(3000)) - .fluidOutputs(Materials.NitricOxide.getGas(1000)).duration(12 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Nitrogen.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Hydrogen.getGas(3000)) + .fluidOutputs(Materials.Ammonia.getGas(1000)) + .duration(16 * SECONDS) + .eut(384) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Hydrogen.getCells(3), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(3)) + .fluidInputs(Materials.Nitrogen.getGas(1000)) + .fluidOutputs(Materials.Ammonia.getGas(1000)) + .duration(16 * SECONDS) + .eut(384) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Nitrogen.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Ammonia.getCells(1)) + .fluidInputs(Materials.Hydrogen.getGas(3000)) + .noFluidOutputs() + .duration(16 * SECONDS) + .eut(384) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Hydrogen.getCells(3), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Ammonia.getCells(1), Materials.Empty.getCells(2)) + .fluidInputs(Materials.Nitrogen.getGas(1000)) + .noFluidOutputs() + .duration(16 * SECONDS) + .eut(384) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ammonia.getCells(1), Materials.Empty.getCells(1)) + .itemOutputs(Materials.Water.getCells(2)) + .fluidInputs(Materials.Methanol.getFluid(2000)) + .fluidOutputs(Materials.Dimethylamine.getGas(1000)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ammonia.getCells(4), Materials.Empty.getCells(2)) + .itemOutputs(Materials.Water.getCells(6)) + .fluidInputs(Materials.Oxygen.getGas(10000)) + .fluidOutputs(Materials.NitricOxide.getGas(4000)) + .duration(16 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) + .itemOutputs(Materials.NitricAcid.getCells(2)) + .fluidInputs(Materials.NitrogenDioxide.getGas(3000)) + .fluidOutputs(Materials.NitricOxide.getGas(1000)) + .duration(12 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); // 2NO2 + O + H2O = 2HNO3 - GT_Values.RA.stdBuilder().itemInputs(Materials.NitrogenDioxide.getCells(2), Materials.Oxygen.getCells(1)) - .itemOutputs(Materials.Empty.getCells(3)).fluidInputs(Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.NitricAcid.getFluid(2000)).duration(12 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.NitrogenDioxide.getCells(2), Materials.Oxygen.getCells(1)) + .itemOutputs(Materials.Empty.getCells(3)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.NitricAcid.getFluid(2000)) + .duration(12 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(1), Materials.Water.getCells(1)) - .itemOutputs(Materials.Empty.getCells(2)).fluidInputs(Materials.NitrogenDioxide.getGas(2000)) - .fluidOutputs(Materials.NitricAcid.getFluid(2000)).duration(12 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(1), Materials.Water.getCells(1)) + .itemOutputs(Materials.Empty.getCells(2)) + .fluidInputs(Materials.NitrogenDioxide.getGas(2000)) + .fluidOutputs(Materials.NitricAcid.getFluid(2000)) + .duration(12 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), Materials.NitrogenDioxide.getCells(2)) - .itemOutputs(Materials.Empty.getCells(3)).fluidInputs(Materials.Oxygen.getGas(1000)) - .fluidOutputs(Materials.NitricAcid.getFluid(2000)).duration(12 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Water.getCells(1), Materials.NitrogenDioxide.getCells(2)) + .itemOutputs(Materials.Empty.getCells(3)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .fluidOutputs(Materials.NitricAcid.getFluid(2000)) + .duration(12 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Sulfur.getDust(1), Materials.Empty.getCells(1)) - .itemOutputs(Materials.HydricSulfide.getCells(1)).fluidInputs(Materials.Hydrogen.getGas(2000)) - .noFluidOutputs().duration(3 * SECONDS).eut(8).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Sulfur.getDust(1), Materials.Empty.getCells(1)) + .itemOutputs(Materials.HydricSulfide.getCells(1)) + .fluidInputs(Materials.Hydrogen.getGas(2000)) + .noFluidOutputs() + .duration(3 * SECONDS) + .eut(8) + .addTo(sChemicalRecipes); // C2H4 + HCl + O = C2H3Cl + H2O - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethylene.getCells(1), Materials.HydrochloricAcid.getCells(1)) - .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Oxygen.getGas(1000)).fluidOutputs(Materials.VinylChloride.getGas(1000)) - .duration(8 * SECONDS).eut(30).addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Oxygen.getCells(1)) - .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Ethylene.getGas(1000)).fluidOutputs(Materials.VinylChloride.getGas(1000)) - .duration(8 * SECONDS).eut(30).addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(1), Materials.Ethylene.getCells(1)) - .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) - .fluidOutputs(Materials.VinylChloride.getGas(1000)).duration(8 * SECONDS).eut(30) - .addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Butadiene.getCells(1), ItemList.Cell_Air.get(5)) - .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(9), Materials.Empty.getCells(6)) - .fluidInputs(Materials.Styrene.getFluid(350)).noFluidOutputs().duration(8 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Butadiene.getCells(1), Materials.Oxygen.getCells(5)) - .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(13), Materials.Empty.getCells(6)) - .fluidInputs(Materials.Styrene.getFluid(350)).noFluidOutputs().duration(8 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Styrene.getCells(1), ItemList.Cell_Air.get(15)) - .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(27), Materials.Empty.getCells(16)) - .fluidInputs(Materials.Butadiene.getGas(3000)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Styrene.getCells(1), Materials.Oxygen.getCells(15)) - .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(41), Materials.Empty.getCells(16)) - .fluidInputs(Materials.Butadiene.getGas(3000)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Styrene.getCells(1), Materials.Butadiene.getCells(3)) - .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(27), Materials.Empty.getCells(4)) - .fluidInputs(Materials.Air.getGas(15000)).noFluidOutputs().duration(24 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Styrene.getCells(1), Materials.Butadiene.getCells(3)) - .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(41), Materials.Empty.getCells(4)) - .fluidInputs(Materials.Oxygen.getGas(15000)).noFluidOutputs().duration(24 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Benzene.getCells(1), Materials.Empty.getCells(1)) - .itemOutputs(Materials.HydrochloricAcid.getCells(2)).fluidInputs(Materials.Chlorine.getGas(4000)) - .fluidOutputs(Materials.Dichlorobenzene.getFluid(1000)).duration(12 * SECONDS).eut(30) - .addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Glycerol.getCells(1), Materials.Empty.getCells(2)) - .itemOutputs(Materials.DilutedSulfuricAcid.getCells(3)) - .fluidInputs(Materials.NitrationMixture.getFluid(6000)).fluidOutputs(Materials.Glyceryl.getFluid(1000)) - .duration(9 * SECONDS).eut(30).addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(12), Materials.Empty.getCells(4)) - .itemOutputs(Materials.Salt.getDust(8), Materials.Phenol.getCells(4)) - .fluidInputs(Materials.Chlorobenzene.getFluid(4000)).noFluidOutputs().duration(48 * SECONDS).eut(30) - .addTo(sChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(12), Materials.Chlorobenzene.getCells(4)) - .itemOutputs(Materials.Salt.getDust(8), Materials.Phenol.getCells(4)).noFluidInputs().noFluidOutputs() - .duration(48 * SECONDS).eut(30).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethylene.getCells(1), Materials.HydrochloricAcid.getCells(1)) + .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .fluidOutputs(Materials.VinylChloride.getGas(1000)) + .duration(8 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydrochloricAcid.getCells(1), Materials.Oxygen.getCells(1)) + .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Ethylene.getGas(1000)) + .fluidOutputs(Materials.VinylChloride.getGas(1000)) + .duration(8 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(1), Materials.Ethylene.getCells(1)) + .itemOutputs(Materials.Water.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(Materials.VinylChloride.getGas(1000)) + .duration(8 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Butadiene.getCells(1), ItemList.Cell_Air.get(5)) + .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(9), Materials.Empty.getCells(6)) + .fluidInputs(Materials.Styrene.getFluid(350)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Butadiene.getCells(1), Materials.Oxygen.getCells(5)) + .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(13), Materials.Empty.getCells(6)) + .fluidInputs(Materials.Styrene.getFluid(350)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Styrene.getCells(1), ItemList.Cell_Air.get(15)) + .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(27), Materials.Empty.getCells(16)) + .fluidInputs(Materials.Butadiene.getGas(3000)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Styrene.getCells(1), Materials.Oxygen.getCells(15)) + .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(41), Materials.Empty.getCells(16)) + .fluidInputs(Materials.Butadiene.getGas(3000)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Styrene.getCells(1), Materials.Butadiene.getCells(3)) + .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(27), Materials.Empty.getCells(4)) + .fluidInputs(Materials.Air.getGas(15000)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Styrene.getCells(1), Materials.Butadiene.getCells(3)) + .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(41), Materials.Empty.getCells(4)) + .fluidInputs(Materials.Oxygen.getGas(15000)) + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Benzene.getCells(1), Materials.Empty.getCells(1)) + .itemOutputs(Materials.HydrochloricAcid.getCells(2)) + .fluidInputs(Materials.Chlorine.getGas(4000)) + .fluidOutputs(Materials.Dichlorobenzene.getFluid(1000)) + .duration(12 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Glycerol.getCells(1), Materials.Empty.getCells(2)) + .itemOutputs(Materials.DilutedSulfuricAcid.getCells(3)) + .fluidInputs(Materials.NitrationMixture.getFluid(6000)) + .fluidOutputs(Materials.Glyceryl.getFluid(1000)) + .duration(9 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(12), Materials.Empty.getCells(4)) + .itemOutputs(Materials.Salt.getDust(8), Materials.Phenol.getCells(4)) + .fluidInputs(Materials.Chlorobenzene.getFluid(4000)) + .noFluidOutputs() + .duration(48 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(12), Materials.Chlorobenzene.getCells(4)) + .itemOutputs(Materials.Salt.getDust(8), Materials.Phenol.getCells(4)) + .noFluidInputs() + .noFluidOutputs() + .duration(48 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); // Recipes for gasoline // 2N + O = N2O - GT_Values.RA.stdBuilder().itemInputs(Materials.Nitrogen.getCells(2), Materials.Oxygen.getCells(1)) - .itemOutputs(Materials.NitrousOxide.getCells(1), Materials.Empty.getCells(2)).noFluidInputs() - .noFluidOutputs().duration(10 * SECONDS).eut(30).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Nitrogen.getCells(2), Materials.Oxygen.getCells(1)) + .itemOutputs(Materials.NitrousOxide.getCells(1), Materials.Empty.getCells(2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Nitrogen.getCells(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(2)).fluidInputs(Materials.Oxygen.getGas(1000)) - .fluidOutputs(Materials.NitrousOxide.getGas(1000)).duration(10 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Nitrogen.getCells(2), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(2)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .fluidOutputs(Materials.NitrousOxide.getGas(1000)) + .duration(10 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Nitrogen.getCells(2), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.NitrousOxide.getCells(1), Materials.Empty.getCells(1)) - .fluidInputs(Materials.Oxygen.getGas(1000)).noFluidOutputs().duration(10 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Nitrogen.getCells(2), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.NitrousOxide.getCells(1), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.Nitrogen.getGas(2000)) - .fluidOutputs(Materials.NitrousOxide.getGas(1000)).duration(10 * SECONDS).eut(30) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Nitrogen.getGas(2000)) + .fluidOutputs(Materials.NitrousOxide.getGas(1000)) + .duration(10 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.NitrousOxide.getCells(1)).fluidInputs(Materials.Nitrogen.getGas(2000)) - .noFluidOutputs().duration(10 * SECONDS).eut(30).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Oxygen.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.NitrousOxide.getCells(1)) + .fluidInputs(Materials.Nitrogen.getGas(2000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(30) + .addTo(sChemicalRecipes); // C2H6O + C4H8 = C6H14O - GT_Values.RA.stdBuilder().itemInputs(Materials.Ethanol.getCells(1), Materials.Butene.getCells(1)) - .itemOutputs(Materials.AntiKnock.getCells(1), Materials.Empty.getCells(1)).noFluidInputs() - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Ethanol.getCells(1), Materials.Butene.getCells(1)) + .itemOutputs(Materials.AntiKnock.getCells(1), Materials.Empty.getCells(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sChemicalRecipes); // Potassium Dichromate // 2KNO3 + 2CrO3 = K2Cr2O7 + 2NO + 3O - GT_Values.RA.stdBuilder().itemInputs(Materials.Saltpeter.getDust(10), Materials.ChromiumTrioxide.getDust(8)) - .itemOutputs(Materials.Potassiumdichromate.getDust(11)).noFluidInputs() - .fluidOutputs(Materials.NitricOxide.getGas(2000)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Saltpeter.getDust(10), Materials.ChromiumTrioxide.getDust(8)) + .itemOutputs(Materials.Potassiumdichromate.getDust(11)) + .noFluidInputs() + .fluidOutputs(Materials.NitricOxide.getGas(2000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs(Materials.PotassiumNitrade.getDust(10), Materials.ChromiumTrioxide.getDust(8)) - .itemOutputs(Materials.Potassiumdichromate.getDust(11)).noFluidInputs() - .fluidOutputs(Materials.NitricOxide.getGas(2000)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sChemicalRecipes); + .itemInputs(Materials.PotassiumNitrade.getDust(10), Materials.ChromiumTrioxide.getDust(8)) + .itemOutputs(Materials.Potassiumdichromate.getDust(11)) + .noFluidInputs() + .fluidOutputs(Materials.NitricOxide.getGas(2000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sChemicalRecipes); } public void multiblockOnly() { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(22)).itemOutputs() - .fluidInputs(Materials.Hydrogen.getGas(16000), Materials.Oxygen.getGas(8000)) - .fluidOutputs(GT_ModHandler.getDistilledWater(8000)).duration(4 * SECONDS).eut(30) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(22)) + .itemOutputs() + .fluidInputs(Materials.Hydrogen.getGas(16000), Materials.Oxygen.getGas(8000)) + .fluidOutputs(GT_ModHandler.getDistilledWater(8000)) + .duration(4 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs(Materials.PotassiumNitrade.getDust(10), Materials.ChromiumTrioxide.getDust(8)) - .itemOutputs(Materials.Potassiumdichromate.getDust(11)).noFluidInputs() - .fluidOutputs(Materials.NitricOxide.getGas(2000), Materials.Oxygen.getGas(3000)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); + .itemInputs(Materials.PotassiumNitrade.getDust(10), Materials.ChromiumTrioxide.getDust(8)) + .itemOutputs(Materials.Potassiumdichromate.getDust(11)) + .noFluidInputs() + .fluidOutputs(Materials.NitricOxide.getGas(2000), Materials.Oxygen.getGas(3000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Saltpeter.getDust(10), Materials.ChromiumTrioxide.getDust(8)) - .itemOutputs(Materials.Potassiumdichromate.getDust(11)).noFluidInputs() - .fluidOutputs(Materials.NitricOxide.getGas(2000), Materials.Oxygen.getGas(3000)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Saltpeter.getDust(10), Materials.ChromiumTrioxide.getDust(8)) + .itemOutputs(Materials.Potassiumdichromate.getDust(11)) + .noFluidInputs() + .fluidOutputs(Materials.NitricOxide.getGas(2000), Materials.Oxygen.getGas(3000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); // Potassium Dichromate shortcut // 2 Cr + 6O + 10 Saltpeter/Potassium Dichromate = 10 K2Cr2O7 + 2NO + 3O GT_Values.RA.stdBuilder() - .itemInputs( - Materials.PotassiumNitrade.getDust(64), - Materials.PotassiumNitrade.getDust(64), - Materials.PotassiumNitrade.getDust(32), - Materials.Chrome.getDust(2 * 16), - GT_Utility.getIntegratedCircuit(11)) - .itemOutputs( - Materials.Potassiumdichromate.getDust(64), - Materials.Potassiumdichromate.getDust(64), - Materials.Potassiumdichromate.getDust(48)) - .fluidInputs(Materials.Oxygen.getGas(6000 * 16)) - .fluidOutputs(Materials.NitricOxide.getGas(2000 * 16), Materials.Oxygen.getGas(3000 * 16)) - .duration(2 * MINUTES + 8 * SECONDS).eut((int) GT_Values.VP[7]).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - Materials.Saltpeter.getDust(64), - Materials.Saltpeter.getDust(64), - Materials.Saltpeter.getDust(32), - Materials.Chrome.getDust(2 * 16), - GT_Utility.getIntegratedCircuit(11)) - .itemOutputs( - Materials.Potassiumdichromate.getDust(64), - Materials.Potassiumdichromate.getDust(64), - Materials.Potassiumdichromate.getDust(48)) - .fluidInputs(Materials.Oxygen.getGas(6000 * 16)) - .fluidOutputs(Materials.NitricOxide.getGas(2000 * 16), Materials.Oxygen.getGas(3000 * 16)) - .duration(2 * MINUTES + 8 * SECONDS).eut((int) GT_Values.VP[7]).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(Materials.Benzene.getFluid(1000), Materials.Methane.getGas(2000)) - .fluidOutputs(Materials.Dimethylbenzene.getFluid(1000), Materials.Hydrogen.getGas(4000)) - .duration(3 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 3), - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 1)) - .noItemOutputs().fluidInputs(Materials.SulfuricAcid.getFluid(4000)) - .fluidOutputs(new FluidStack(ItemList.sIndiumConcentrate, 8000)).duration(3 * SECONDS).eut(150) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(8), - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 27), - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 9)) - .noItemOutputs().fluidInputs(Materials.SulfuricAcid.getFluid(36000)) - .fluidOutputs(new FluidStack(ItemList.sIndiumConcentrate, 72000)).duration(8 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pentlandite, 9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 1)) - .fluidInputs(Materials.SulfuricAcid.getFluid(9000)) - .fluidOutputs(new FluidStack(ItemList.sNickelSulfate, 18000)).duration(1 * SECONDS + 5 * TICKS) - .eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 1)) - .fluidInputs(Materials.SulfuricAcid.getFluid(9000)) - .fluidOutputs(new FluidStack(ItemList.sBlueVitriol, 18000)).duration(1 * SECONDS + 5 * TICKS) - .eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Plutonium, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 64)) - .fluidInputs(Materials.Air.getGas(8000)).fluidOutputs(Materials.Radon.getGas(800)) - .duration(1 * MINUTES + 15 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + Materials.PotassiumNitrade.getDust(64), + Materials.PotassiumNitrade.getDust(64), + Materials.PotassiumNitrade.getDust(32), + Materials.Chrome.getDust(2 * 16), + GT_Utility.getIntegratedCircuit(11)) + .itemOutputs( + Materials.Potassiumdichromate.getDust(64), + Materials.Potassiumdichromate.getDust(64), + Materials.Potassiumdichromate.getDust(48)) + .fluidInputs(Materials.Oxygen.getGas(6000 * 16)) + .fluidOutputs(Materials.NitricOxide.getGas(2000 * 16), Materials.Oxygen.getGas(3000 * 16)) + .duration(2 * MINUTES + 8 * SECONDS) + .eut((int) GT_Values.VP[7]) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.Saltpeter.getDust(64), + Materials.Saltpeter.getDust(64), + Materials.Saltpeter.getDust(32), + Materials.Chrome.getDust(2 * 16), + GT_Utility.getIntegratedCircuit(11)) + .itemOutputs( + Materials.Potassiumdichromate.getDust(64), + Materials.Potassiumdichromate.getDust(64), + Materials.Potassiumdichromate.getDust(48)) + .fluidInputs(Materials.Oxygen.getGas(6000 * 16)) + .fluidOutputs(Materials.NitricOxide.getGas(2000 * 16), Materials.Oxygen.getGas(3000 * 16)) + .duration(2 * MINUTES + 8 * SECONDS) + .eut((int) GT_Values.VP[7]) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.Benzene.getFluid(1000), Materials.Methane.getGas(2000)) + .fluidOutputs(Materials.Dimethylbenzene.getFluid(1000), Materials.Hydrogen.getGas(4000)) + .duration(3 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 3), + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 1)) + .noItemOutputs() + .fluidInputs(Materials.SulfuricAcid.getFluid(4000)) + .fluidOutputs(new FluidStack(ItemList.sIndiumConcentrate, 8000)) + .duration(3 * SECONDS) + .eut(150) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(8), + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Galena, 27), + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Sphalerite, 9)) + .noItemOutputs() + .fluidInputs(Materials.SulfuricAcid.getFluid(36000)) + .fluidOutputs(new FluidStack(ItemList.sIndiumConcentrate, 72000)) + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Pentlandite, 9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 1)) + .fluidInputs(Materials.SulfuricAcid.getFluid(9000)) + .fluidOutputs(new FluidStack(ItemList.sNickelSulfate, 18000)) + .duration(1 * SECONDS + 5 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.PlatinumGroupSludge, 1)) + .fluidInputs(Materials.SulfuricAcid.getFluid(9000)) + .fluidOutputs(new FluidStack(ItemList.sBlueVitriol, 18000)) + .duration(1 * SECONDS + 5 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Plutonium, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 64)) + .fluidInputs(Materials.Air.getGas(8000)) + .fluidOutputs(Materials.Radon.getGas(800)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); // 3SiO2 + 4Al = 3Si + 2Al2O3 GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 10)) - .noFluidInputs().noFluidOutputs().duration(10 * TICKS).eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 10)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sMultiblockChemicalRecipes); // 10Si + 30HCl -> 0.3 SiH2Cl2 + 9 HSiCl3 + 0.3 SiCl4 + 0.2 Si2Cl6 + 20.4H GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 10)) - .noItemOutputs().fluidInputs(Materials.HydrochloricAcid.getFluid(30000)) - .fluidOutputs( - Materials.Trichlorosilane.getFluid(9000), - Materials.SiliconTetrachloride.getFluid(300), - Materials.Hexachlorodisilane.getFluid(200), - Materials.Dichlorosilane.getGas(300), - Materials.Hydrogen.getGas(20400)) - .duration(7 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 10)) + .noItemOutputs() + .fluidInputs(Materials.HydrochloricAcid.getFluid(30000)) + .fluidOutputs( + Materials.Trichlorosilane.getFluid(9000), + Materials.SiliconTetrachloride.getFluid(300), + Materials.Hexachlorodisilane.getFluid(200), + Materials.Dichlorosilane.getGas(300), + Materials.Hydrogen.getGas(20400)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); // 2CO + 2C3H6 + 4H =RhHCO(P(C6H5)3)3= C4H8O + C4H8O GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(4), MaterialsKevlar.OrganorhodiumCatalyst.getDustTiny(1)) - .noItemOutputs() - .fluidInputs( - Materials.Hydrogen.getGas(4000), - Materials.Propene.getGas(2000), - Materials.CarbonMonoxide.getGas(2000)) - .fluidOutputs( - MaterialsKevlar.Butyraldehyde.getFluid(1000), - MaterialsKevlar.Isobutyraldehyde.getFluid(1000)) - .duration(15 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(9), MaterialsKevlar.OrganorhodiumCatalyst.getDust(1)) - .noItemOutputs() - .fluidInputs( - Materials.Hydrogen.getGas(36000), - Materials.Propene.getGas(18000), - Materials.CarbonMonoxide.getGas(18000)) - .fluidOutputs( - MaterialsKevlar.Butyraldehyde.getFluid(9000), - MaterialsKevlar.Isobutyraldehyde.getFluid(9000)) - .duration(1 * MINUTES + 40 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(4), + MaterialsKevlar.OrganorhodiumCatalyst.getDustTiny(1)) + .noItemOutputs() + .fluidInputs( + Materials.Hydrogen.getGas(4000), + Materials.Propene.getGas(2000), + Materials.CarbonMonoxide.getGas(2000)) + .fluidOutputs( + MaterialsKevlar.Butyraldehyde.getFluid(1000), + MaterialsKevlar.Isobutyraldehyde.getFluid(1000)) + .duration(15 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9), MaterialsKevlar.OrganorhodiumCatalyst.getDust(1)) + .noItemOutputs() + .fluidInputs( + Materials.Hydrogen.getGas(36000), + Materials.Propene.getGas(18000), + Materials.CarbonMonoxide.getGas(18000)) + .fluidOutputs( + MaterialsKevlar.Butyraldehyde.getFluid(9000), + MaterialsKevlar.Isobutyraldehyde.getFluid(9000)) + .duration(1 * MINUTES + 40 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); // C2H4 + O =Al2O3,Ag= C2H4O GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1)) - .noItemOutputs().fluidInputs(Materials.Ethylene.getGas(1000), Materials.Oxygen.getGas(1000)) - .fluidOutputs(MaterialsKevlar.EthyleneOxide.getGas(1000)).duration(2 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9)) - .noItemOutputs().fluidInputs(Materials.Ethylene.getGas(9000), Materials.Oxygen.getGas(9000)) - .fluidOutputs(MaterialsKevlar.EthyleneOxide.getGas(9000)).duration(20 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)).noItemOutputs() - .fluidInputs( - MaterialsKevlar.EthyleneOxide.getGas(1000), - Materials.Dimethyldichlorosilane.getFluid(4000), - Materials.Water.getFluid(5000)) - .fluidOutputs(MaterialsKevlar.SiliconOil.getFluid(5000)).duration(15 * TICKS).eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(8)).noItemOutputs() - .fluidInputs( - MaterialsKevlar.EthyleneOxide.getGas(9000), - Materials.Dimethyldichlorosilane.getFluid(36000), - Materials.Water.getFluid(45000)) - .fluidOutputs(MaterialsKevlar.SiliconOil.getFluid(45000)).duration(5 * SECONDS).eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1)) + .noItemOutputs() + .fluidInputs(Materials.Ethylene.getGas(1000), Materials.Oxygen.getGas(1000)) + .fluidOutputs(MaterialsKevlar.EthyleneOxide.getGas(1000)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9)) + .noItemOutputs() + .fluidInputs(Materials.Ethylene.getGas(9000), Materials.Oxygen.getGas(9000)) + .fluidOutputs(MaterialsKevlar.EthyleneOxide.getGas(9000)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs( + MaterialsKevlar.EthyleneOxide.getGas(1000), + Materials.Dimethyldichlorosilane.getFluid(4000), + Materials.Water.getFluid(5000)) + .fluidOutputs(MaterialsKevlar.SiliconOil.getFluid(5000)) + .duration(15 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(8)) + .noItemOutputs() + .fluidInputs( + MaterialsKevlar.EthyleneOxide.getGas(9000), + Materials.Dimethyldichlorosilane.getFluid(36000), + Materials.Water.getFluid(45000)) + .fluidOutputs(MaterialsKevlar.SiliconOil.getFluid(45000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // NH3 + CH4O =SiO2,Al2O3= CH5N + H2O GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(10), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1)) - .noItemOutputs().fluidInputs(Materials.Methanol.getFluid(1000), Materials.Ammonia.getGas(1000)) - .fluidOutputs(MaterialsKevlar.Methylamine.getGas(1000), Materials.Water.getFluid(1000)) - .duration(1 * MINUTES + 15 * SECONDS).eut(500000).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 5)) - .noItemOutputs() - .fluidInputs(MaterialsKevlar.Ethyleneglycol.getFluid(4000), MaterialsKevlar.SiliconOil.getFluid(1000)) - .fluidOutputs(MaterialsKevlar.PolyurethaneResin.getFluid(1000)).duration(10 * SECONDS).eut(500000) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 45)) - .noItemOutputs() - .fluidInputs(MaterialsKevlar.Ethyleneglycol.getFluid(36000), MaterialsKevlar.SiliconOil.getFluid(9000)) - .fluidOutputs(MaterialsKevlar.PolyurethaneResin.getFluid(9000)).duration(1 * MINUTES + 15 * SECONDS) - .eut(500000).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(10), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1)) + .noItemOutputs() + .fluidInputs(Materials.Methanol.getFluid(1000), Materials.Ammonia.getGas(1000)) + .fluidOutputs(MaterialsKevlar.Methylamine.getGas(1000), Materials.Water.getFluid(1000)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(500000) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 5)) + .noItemOutputs() + .fluidInputs( + MaterialsKevlar.Ethyleneglycol.getFluid(4000), + MaterialsKevlar.SiliconOil.getFluid(1000)) + .fluidOutputs(MaterialsKevlar.PolyurethaneResin.getFluid(1000)) + .duration(10 * SECONDS) + .eut(500000) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 45)) + .noItemOutputs() + .fluidInputs( + MaterialsKevlar.Ethyleneglycol.getFluid(36000), + MaterialsKevlar.SiliconOil.getFluid(9000)) + .fluidOutputs(MaterialsKevlar.PolyurethaneResin.getFluid(9000)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(500000) + .addTo(sMultiblockChemicalRecipes); // 3NH3 + 6CH4O =Al2O3,SiO2= CH5N + C2H7N + C3H9N + 6H2O GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1)) - .noItemOutputs().fluidInputs(Materials.Methanol.getFluid(6000), Materials.Ammonia.getGas(3000)) - .fluidOutputs( - MaterialsKevlar.Methylamine.getGas(1000), - Materials.Dimethylamine.getGas(1000), - MaterialsKevlar.Trimethylamine.getGas(1000), - Materials.Water.getFluid(6000)) - .duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(11), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9)) - .noItemOutputs().fluidInputs(Materials.Methanol.getFluid(54000), Materials.Ammonia.getGas(27000)) - .fluidOutputs( - MaterialsKevlar.Methylamine.getGas(9000), - Materials.Dimethylamine.getGas(9000), - MaterialsKevlar.Trimethylamine.getGas(9000), - Materials.Water.getFluid(54000)) - .duration(2 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1)) + .noItemOutputs() + .fluidInputs(Materials.Methanol.getFluid(6000), Materials.Ammonia.getGas(3000)) + .fluidOutputs( + MaterialsKevlar.Methylamine.getGas(1000), + Materials.Dimethylamine.getGas(1000), + MaterialsKevlar.Trimethylamine.getGas(1000), + Materials.Water.getFluid(6000)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(11), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9)) + .noItemOutputs() + .fluidInputs(Materials.Methanol.getFluid(54000), Materials.Ammonia.getGas(27000)) + .fluidOutputs( + MaterialsKevlar.Methylamine.getGas(9000), + Materials.Dimethylamine.getGas(9000), + MaterialsKevlar.Trimethylamine.getGas(9000), + Materials.Water.getFluid(54000)) + .duration(2 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // 18SOCl2 + 5C10H10O4 + 6CO2 = 7C8H4Cl2O2 + 22HCl + 18SO2 - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 48)) - .fluidInputs( - MaterialsKevlar.ThionylChloride.getFluid(18000), - MaterialsKevlar.DimethylTerephthalate.getFluid(5000), - Materials.CarbonDioxide.getGas(6000)) - .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(22000), Materials.SulfurDioxide.getGas(18000)) - .duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 48)) + .fluidInputs( + MaterialsKevlar.ThionylChloride.getFluid(18000), + MaterialsKevlar.DimethylTerephthalate.getFluid(5000), + Materials.CarbonDioxide.getGas(6000)) + .fluidOutputs( + Materials.DilutedHydrochloricAcid.getFluid(22000), + Materials.SulfurDioxide.getGas(18000)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // 2CH4O + C8H6O4 =H2SO4= C10H10O4 + 2H2O - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs( - MaterialsKevlar.TerephthalicAcid.getFluid(1000), - Materials.Methanol.getFluid(2000), - Materials.SulfuricAcid.getFluid(2000)) - .fluidOutputs( - MaterialsKevlar.DimethylTerephthalate.getFluid(1000), - Materials.DilutedSulfuricAcid.getFluid(2000)) - .duration(12 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)).noItemOutputs() - .fluidInputs( - MaterialsKevlar.TerephthalicAcid.getFluid(9000), - Materials.Methanol.getFluid(18000), - Materials.SulfuricAcid.getFluid(18000)) - .fluidOutputs( - MaterialsKevlar.DimethylTerephthalate.getFluid(9000), - Materials.DilutedSulfuricAcid.getFluid(18000)) - .duration(1 * MINUTES + 27 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)).noItemOutputs() - .fluidInputs(Materials.Benzene.getFluid(1000), Materials.Methane.getGas(2000)) - .fluidOutputs(MaterialsKevlar.IIIDimethylbenzene.getFluid(1000), Materials.Hydrogen.getGas(4000)) - .duration(3 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(3)).noItemOutputs() - .fluidInputs(Materials.Benzene.getFluid(1000), Materials.Methane.getGas(2000)) - .fluidOutputs(MaterialsKevlar.IVDimethylbenzene.getFluid(1000), Materials.Hydrogen.getGas(4000)) - .duration(3 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIHydroxide, 45)) - .itemOutputs( - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(49)) - .fluidInputs(MaterialsKevlar.NaphthenicAcid.getFluid(10000)).noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 7)) - .itemOutputs( - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(64), - MaterialsKevlar.CobaltIINaphthenate.getDust(49)) - .fluidInputs(MaterialsKevlar.NaphthenicAcid.getFluid(10000)) - .fluidOutputs(Materials.AceticAcid.getFluid(15000)).duration(10 * SECONDS).eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs( + MaterialsKevlar.TerephthalicAcid.getFluid(1000), + Materials.Methanol.getFluid(2000), + Materials.SulfuricAcid.getFluid(2000)) + .fluidOutputs( + MaterialsKevlar.DimethylTerephthalate.getFluid(1000), + Materials.DilutedSulfuricAcid.getFluid(2000)) + .duration(12 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .noItemOutputs() + .fluidInputs( + MaterialsKevlar.TerephthalicAcid.getFluid(9000), + Materials.Methanol.getFluid(18000), + Materials.SulfuricAcid.getFluid(18000)) + .fluidOutputs( + MaterialsKevlar.DimethylTerephthalate.getFluid(9000), + Materials.DilutedSulfuricAcid.getFluid(18000)) + .duration(1 * MINUTES + 27 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs(Materials.Benzene.getFluid(1000), Materials.Methane.getGas(2000)) + .fluidOutputs(MaterialsKevlar.IIIDimethylbenzene.getFluid(1000), Materials.Hydrogen.getGas(4000)) + .duration(3 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(3)) + .noItemOutputs() + .fluidInputs(Materials.Benzene.getFluid(1000), Materials.Methane.getGas(2000)) + .fluidOutputs(MaterialsKevlar.IVDimethylbenzene.getFluid(1000), Materials.Hydrogen.getGas(4000)) + .duration(3 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIHydroxide, 45)) + .itemOutputs( + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(49)) + .fluidInputs(MaterialsKevlar.NaphthenicAcid.getFluid(10000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CobaltIIAcetate, 7)) + .itemOutputs( + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(64), + MaterialsKevlar.CobaltIINaphthenate.getDust(49)) + .fluidInputs(MaterialsKevlar.NaphthenicAcid.getFluid(10000)) + .fluidOutputs(Materials.AceticAcid.getFluid(15000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // PCl3 + 3C6H5Cl + 6Na = 6NaCl + C18H15P GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 6)) - .itemOutputs(MaterialsKevlar.Triphenylphosphene.getDust(34), Materials.Salt.getDust(12)) - .fluidInputs( - MaterialsKevlar.PhosphorusTrichloride.getFluid(1000), - Materials.Chlorobenzene.getFluid(3000)) - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 6)) + .itemOutputs(MaterialsKevlar.Triphenylphosphene.getDust(34), Materials.Salt.getDust(12)) + .fluidInputs( + MaterialsKevlar.PhosphorusTrichloride.getFluid(1000), + Materials.Chlorobenzene.getFluid(3000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // 4NaH + C3H9BO3 = NaBH4 + 3CH3ONa GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1), MaterialsKevlar.SodiumHydride.getDust(8)) - .itemOutputs(MaterialsKevlar.SodiumBorohydride.getDust(6), MaterialsKevlar.SodiumMethoxide.getDust(18)) - .fluidInputs(MaterialsKevlar.TrimethylBorate.getFluid(1000)).noFluidOutputs().duration(30 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + .itemInputs(GT_Utility.getIntegratedCircuit(1), MaterialsKevlar.SodiumHydride.getDust(8)) + .itemOutputs( + MaterialsKevlar.SodiumBorohydride.getDust(6), + MaterialsKevlar.SodiumMethoxide.getDust(18)) + .fluidInputs(MaterialsKevlar.TrimethylBorate.getFluid(1000)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(9), MaterialsKevlar.SodiumHydride.getDust(64)) - .itemOutputs( - MaterialsKevlar.SodiumBorohydride.getDust(48), - MaterialsKevlar.SodiumMethoxide.getDust(64), - MaterialsKevlar.SodiumMethoxide.getDust(64), - MaterialsKevlar.SodiumMethoxide.getDust(16)) - .fluidInputs(MaterialsKevlar.TrimethylBorate.getFluid(8000)).noFluidOutputs().duration(30 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + .itemInputs(GT_Utility.getIntegratedCircuit(9), MaterialsKevlar.SodiumHydride.getDust(64)) + .itemOutputs( + MaterialsKevlar.SodiumBorohydride.getDust(48), + MaterialsKevlar.SodiumMethoxide.getDust(64), + MaterialsKevlar.SodiumMethoxide.getDust(64), + MaterialsKevlar.SodiumMethoxide.getDust(16)) + .fluidInputs(MaterialsKevlar.TrimethylBorate.getFluid(8000)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // 2CH3COOH = CH3COCH3 + CO2 + H GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(0, Materials.Calcite.getDust(5)), GT_Utility.getIntegratedCircuit(24)) - .noItemOutputs().fluidInputs(Materials.AceticAcid.getFluid(2000)) - .fluidOutputs( - Materials.Acetone.getFluid(1000), - Materials.CarbonDioxide.getGas(1000), - Materials.Water.getFluid(1000)) - .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.copyAmount(0, Materials.Calcite.getDust(5)), + GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.AceticAcid.getFluid(2000)) + .fluidOutputs( + Materials.Acetone.getFluid(1000), + Materials.CarbonDioxide.getGas(1000), + Materials.Water.getFluid(1000)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(0, Materials.Calcium.getDust(1)), GT_Utility.getIntegratedCircuit(24)) - .noItemOutputs().fluidInputs(Materials.AceticAcid.getFluid(2000)) - .fluidOutputs( - Materials.Acetone.getFluid(1000), - Materials.CarbonDioxide.getGas(1000), - Materials.Water.getFluid(1000)) - .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.copyAmount(0, Materials.Calcium.getDust(1)), + GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.AceticAcid.getFluid(2000)) + .fluidOutputs( + Materials.Acetone.getFluid(1000), + Materials.CarbonDioxide.getGas(1000), + Materials.Water.getFluid(1000)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(0, Materials.Quicklime.getDust(2)), - GT_Utility.getIntegratedCircuit(24)) - .noItemOutputs().fluidInputs(Materials.AceticAcid.getFluid(2000)) - .fluidOutputs( - Materials.Acetone.getFluid(1000), - Materials.CarbonDioxide.getGas(1000), - Materials.Water.getFluid(1000)) - .duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.copyAmount(0, Materials.Quicklime.getDust(2)), + GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.AceticAcid.getFluid(2000)) + .fluidOutputs( + Materials.Acetone.getFluid(1000), + Materials.CarbonDioxide.getGas(1000), + Materials.Water.getFluid(1000)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); // C + 4H + O = CH3OH - GT_Values.RA.stdBuilder().itemInputs(Materials.Carbon.getDust(1), GT_Utility.getIntegratedCircuit(23)) - .noItemOutputs().fluidInputs(Materials.Hydrogen.getGas(4000), Materials.Oxygen.getGas(1000)) - .fluidOutputs(Materials.Methanol.getFluid(1000)).duration(16 * SECONDS).eut(96) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Carbon.getDust(1), GT_Utility.getIntegratedCircuit(23)) + .noItemOutputs() + .fluidInputs(Materials.Hydrogen.getGas(4000), Materials.Oxygen.getGas(1000)) + .fluidOutputs(Materials.Methanol.getFluid(1000)) + .duration(16 * SECONDS) + .eut(96) + .addTo(sMultiblockChemicalRecipes); // This recipe collides with one for Vinyl Chloride // 2C + 4H + 2O = CH3COOH - GT_Values.RA.stdBuilder().itemInputs(Materials.Carbon.getDust(2), GT_Utility.getIntegratedCircuit(24)) - .noItemOutputs().fluidInputs(Materials.Hydrogen.getGas(4000), Materials.Oxygen.getGas(2000)) - .fluidOutputs(Materials.AceticAcid.getFluid(1000)).duration(24 * SECONDS).eut(30) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Carbon.getDust(2), GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.Hydrogen.getGas(4000), Materials.Oxygen.getGas(2000)) + .fluidOutputs(Materials.AceticAcid.getFluid(1000)) + .duration(24 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); // 2CO + 4H = CH3COOH - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.CarbonMonoxide.getGas(2000), Materials.Hydrogen.getGas(4000)) - .fluidOutputs(Materials.AceticAcid.getFluid(1000)).duration(16 * SECONDS).eut(30) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.CarbonMonoxide.getGas(2000), Materials.Hydrogen.getGas(4000)) + .fluidOutputs(Materials.AceticAcid.getFluid(1000)) + .duration(16 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(8)).noItemOutputs() - .fluidInputs(Materials.Hydrogen.getGas(9000), Materials.Chlorine.getGas(9000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(9000)).duration(7 * TICKS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(8)) + .noItemOutputs() + .fluidInputs(Materials.Hydrogen.getGas(9000), Materials.Chlorine.getGas(9000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(9000)) + .duration(7 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)).noItemOutputs() - .fluidInputs( - Materials.Chlorine.getGas(10000), - Materials.Water.getFluid(10000), - Materials.Mercury.getFluid(1000)) - .fluidOutputs(Materials.HypochlorousAcid.getFluid(10000), Materials.Hydrogen.getGas(10000)) - .duration(30 * SECONDS).eut(8).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs( + Materials.Chlorine.getGas(10000), + Materials.Water.getFluid(10000), + Materials.Mercury.getFluid(1000)) + .fluidOutputs(Materials.HypochlorousAcid.getFluid(10000), Materials.Hydrogen.getGas(10000)) + .duration(30 * SECONDS) + .eut(8) + .addTo(sMultiblockChemicalRecipes); // H2O + 4Cl + C3H6 + NaOH = C3H5ClO + NaCl·H2O + 2HCl - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(23)) - .noItemOutputs() - .fluidInputs( - Materials.Propene.getGas(1000), - Materials.Chlorine.getGas(4000), - Materials.Water.getFluid(1000)) - .fluidOutputs( - Materials.Epichlorohydrin.getFluid(1000), - Materials.SaltWater.getFluid(1000), - Materials.HydrochloricAcid.getFluid(2000)) - .duration(32 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(23)) + .noItemOutputs() + .fluidInputs( + Materials.Propene.getGas(1000), + Materials.Chlorine.getGas(4000), + Materials.Water.getFluid(1000)) + .fluidOutputs( + Materials.Epichlorohydrin.getFluid(1000), + Materials.SaltWater.getFluid(1000), + Materials.HydrochloricAcid.getFluid(2000)) + .duration(32 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); // H2O + 2Cl + C3H6 + NaOH =Hg= C3H5ClO + NaCl·H2O + 2H - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(24)) - .noItemOutputs() - .fluidInputs( - Materials.Propene.getGas(1000), - Materials.Chlorine.getGas(2000), - Materials.Water.getFluid(1000), - Materials.Mercury.getFluid(100)) - .fluidOutputs( - Materials.Epichlorohydrin.getFluid(1000), - Materials.SaltWater.getFluid(1000), - Materials.Hydrogen.getGas(2000)) - .duration(32 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs( + Materials.Propene.getGas(1000), + Materials.Chlorine.getGas(2000), + Materials.Water.getFluid(1000), + Materials.Mercury.getFluid(100)) + .fluidOutputs( + Materials.Epichlorohydrin.getFluid(1000), + Materials.SaltWater.getFluid(1000), + Materials.Hydrogen.getGas(2000)) + .duration(32 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); // HClO + 2Cl + C3H6 + NaOH = C3H5ClO + NaCl·H2O + HCl - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(24)) - .noItemOutputs() - .fluidInputs( - Materials.Propene.getGas(1000), - Materials.Chlorine.getGas(2000), - Materials.HypochlorousAcid.getFluid(1000)) - .fluidOutputs( - Materials.Epichlorohydrin.getFluid(1000), - Materials.SaltWater.getFluid(1000), - Materials.HydrochloricAcid.getFluid(1000)) - .duration(32 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Apatite.getDust(9)).itemOutputs(Materials.Gypsum.getDust(40)) - .fluidInputs(Materials.SulfuricAcid.getFluid(5000), Materials.Water.getFluid(10000)) - .fluidOutputs(Materials.PhosphoricAcid.getFluid(3000), Materials.HydrochloricAcid.getFluid(1000)) - .duration(16 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Phosphorus.getDust(4), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.PhosphorousPentoxide.getDust(14)).fluidInputs(Materials.Oxygen.getGas(10000)) - .noFluidOutputs().duration(2 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(3), GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs( + Materials.Propene.getGas(1000), + Materials.Chlorine.getGas(2000), + Materials.HypochlorousAcid.getFluid(1000)) + .fluidOutputs( + Materials.Epichlorohydrin.getFluid(1000), + Materials.SaltWater.getFluid(1000), + Materials.HydrochloricAcid.getFluid(1000)) + .duration(32 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Apatite.getDust(9)) + .itemOutputs(Materials.Gypsum.getDust(40)) + .fluidInputs(Materials.SulfuricAcid.getFluid(5000), Materials.Water.getFluid(10000)) + .fluidOutputs(Materials.PhosphoricAcid.getFluid(3000), Materials.HydrochloricAcid.getFluid(1000)) + .duration(16 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Phosphorus.getDust(4), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.PhosphorousPentoxide.getDust(14)) + .fluidInputs(Materials.Oxygen.getGas(10000)) + .noFluidOutputs() + .duration(2 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); // 2P + 5O + 3H2O = 2H3PO4 - GT_Values.RA.stdBuilder().itemInputs(Materials.Phosphorus.getDust(1), GT_Utility.getIntegratedCircuit(24)) - .noItemOutputs().fluidInputs(Materials.Oxygen.getGas(2500), Materials.Water.getFluid(1500)) - .fluidOutputs(Materials.PhosphoricAcid.getFluid(1000)).duration(16 * SECONDS).eut(30) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs( - Materials.Propene.getGas(8000), - Materials.Benzene.getFluid(8000), - Materials.PhosphoricAcid.getFluid(1000)) - .fluidOutputs(Materials.Cumene.getFluid(8000)).duration(1 * MINUTES + 36 * SECONDS).eut(30) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs( - Materials.Propene.getGas(1000), - Materials.Benzene.getFluid(1000), - Materials.PhosphoricAcid.getFluid(100), - Materials.Oxygen.getGas(2000)) - .fluidOutputs(Materials.Phenol.getFluid(1000), Materials.Acetone.getFluid(1000)).duration(24 * SECONDS) - .eut(30).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs( - Materials.Acetone.getFluid(1000), - Materials.Phenol.getFluid(2000), - Materials.HydrochloricAcid.getFluid(1000)) - .fluidOutputs(Materials.BisphenolA.getFluid(1000), Materials.Water.getFluid(1000)).duration(8 * SECONDS) - .eut(30).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(6), GT_Utility.getIntegratedCircuit(24)) - .noItemOutputs() - .fluidInputs( - Materials.Acetone.getFluid(1000), - Materials.Phenol.getFluid(2000), - Materials.HydrochloricAcid.getFluid(1000), - Materials.Epichlorohydrin.getFluid(2000)) - .fluidOutputs(Materials.Epoxid.getMolten(1000), Materials.SaltWater.getFluid(2000)) - .duration(24 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)).noItemOutputs() - .fluidInputs(Materials.Hydrogen.getGas(9000), Materials.Fluorine.getGas(9000)) - .fluidOutputs(Materials.HydrofluoricAcid.getFluid(9000)).duration(7 * TICKS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs( - Materials.HydrofluoricAcid.getFluid(4000), - Materials.Methane.getGas(2000), - Materials.Chlorine.getGas(12000)) - .fluidOutputs(Materials.Tetrafluoroethylene.getGas(1000), Materials.HydrochloricAcid.getFluid(12000)) - .duration(27 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(24)) - .itemOutputs(Materials.Polydimethylsiloxane.getDust(3)) - .fluidInputs( - Materials.Methane.getGas(2000), - Materials.Chlorine.getGas(4000), - Materials.Water.getFluid(1000)) - .fluidOutputs( - Materials.HydrochloricAcid.getFluid(2000), - Materials.DilutedHydrochloricAcid.getFluid(2000)) - .duration(24 * SECONDS).eut(96).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(24)) - .itemOutputs(Materials.Polydimethylsiloxane.getDust(3)) - .fluidInputs(Materials.Methanol.getFluid(2000), Materials.HydrochloricAcid.getFluid(2000)) - .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(2000)).duration(24 * SECONDS).eut(96) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.Nitrogen.getGas(10000), Materials.Hydrogen.getGas(30000)) - .fluidOutputs(Materials.Ammonia.getGas(10000)).duration(40 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Phosphorus.getDust(1), GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.Oxygen.getGas(2500), Materials.Water.getFluid(1500)) + .fluidOutputs(Materials.PhosphoricAcid.getFluid(1000)) + .duration(16 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs( + Materials.Propene.getGas(8000), + Materials.Benzene.getFluid(8000), + Materials.PhosphoricAcid.getFluid(1000)) + .fluidOutputs(Materials.Cumene.getFluid(8000)) + .duration(1 * MINUTES + 36 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs( + Materials.Propene.getGas(1000), + Materials.Benzene.getFluid(1000), + Materials.PhosphoricAcid.getFluid(100), + Materials.Oxygen.getGas(2000)) + .fluidOutputs(Materials.Phenol.getFluid(1000), Materials.Acetone.getFluid(1000)) + .duration(24 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs( + Materials.Acetone.getFluid(1000), + Materials.Phenol.getFluid(2000), + Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(Materials.BisphenolA.getFluid(1000), Materials.Water.getFluid(1000)) + .duration(8 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(6), GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs( + Materials.Acetone.getFluid(1000), + Materials.Phenol.getFluid(2000), + Materials.HydrochloricAcid.getFluid(1000), + Materials.Epichlorohydrin.getFluid(2000)) + .fluidOutputs(Materials.Epoxid.getMolten(1000), Materials.SaltWater.getFluid(2000)) + .duration(24 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .noItemOutputs() + .fluidInputs(Materials.Hydrogen.getGas(9000), Materials.Fluorine.getGas(9000)) + .fluidOutputs(Materials.HydrofluoricAcid.getFluid(9000)) + .duration(7 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs( + Materials.HydrofluoricAcid.getFluid(4000), + Materials.Methane.getGas(2000), + Materials.Chlorine.getGas(12000)) + .fluidOutputs( + Materials.Tetrafluoroethylene.getGas(1000), + Materials.HydrochloricAcid.getFluid(12000)) + .duration(27 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(24)) + .itemOutputs(Materials.Polydimethylsiloxane.getDust(3)) + .fluidInputs( + Materials.Methane.getGas(2000), + Materials.Chlorine.getGas(4000), + Materials.Water.getFluid(1000)) + .fluidOutputs( + Materials.HydrochloricAcid.getFluid(2000), + Materials.DilutedHydrochloricAcid.getFluid(2000)) + .duration(24 * SECONDS) + .eut(96) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Silicon.getDust(1), GT_Utility.getIntegratedCircuit(24)) + .itemOutputs(Materials.Polydimethylsiloxane.getDust(3)) + .fluidInputs(Materials.Methanol.getFluid(2000), Materials.HydrochloricAcid.getFluid(2000)) + .fluidOutputs(Materials.DilutedHydrochloricAcid.getFluid(2000)) + .duration(24 * SECONDS) + .eut(96) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.Nitrogen.getGas(10000), Materials.Hydrogen.getGas(30000)) + .fluidOutputs(Materials.Ammonia.getGas(10000)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); // 2NH3 + 7O = N2O4 + 3H2O - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(23)).noItemOutputs() - .fluidInputs(Materials.Ammonia.getGas(2000), Materials.Oxygen.getGas(7000)) - .fluidOutputs(Materials.DinitrogenTetroxide.getGas(1000), Materials.Water.getFluid(3000)) - .duration(24 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(23)) + .noItemOutputs() + .fluidInputs(Materials.Ammonia.getGas(2000), Materials.Oxygen.getGas(7000)) + .fluidOutputs(Materials.DinitrogenTetroxide.getGas(1000), Materials.Water.getFluid(3000)) + .duration(24 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); // 7O + 6H + 2N = N2O4 + 3H2O - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(23)).noItemOutputs() - .fluidInputs( - Materials.Nitrogen.getGas(2000), - Materials.Hydrogen.getGas(6000), - Materials.Oxygen.getGas(7000)) - .fluidOutputs(Materials.DinitrogenTetroxide.getGas(1000), Materials.Water.getFluid(3000)) - .duration(55 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)).noItemOutputs() - .fluidInputs(Materials.Oxygen.getGas(100000), Materials.Ammonia.getGas(36000)) - .fluidOutputs(Materials.NitricOxide.getGas(36000), Materials.Water.getFluid(54000)) - .duration(8 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(8)).noItemOutputs() - .fluidInputs(Materials.Oxygen.getGas(100000), Materials.Ammonia.getGas(36000)) - .fluidOutputs(Materials.NitricOxide.getGas(36000)).duration(8 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)).noItemOutputs() - .fluidInputs(Materials.NitricOxide.getGas(9000), Materials.Oxygen.getGas(9000)) - .fluidOutputs(Materials.NitrogenDioxide.getGas(9000)).duration(4 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)).noItemOutputs() - .fluidInputs(Materials.NitrogenDioxide.getGas(27000), Materials.Water.getFluid(9000)) - .fluidOutputs(Materials.NitricAcid.getFluid(18000), Materials.NitricOxide.getGas(9000)) - .duration(6 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs( - Materials.Hydrogen.getGas(3000), - Materials.Nitrogen.getGas(1000), - Materials.Oxygen.getGas(4000)) - .fluidOutputs(Materials.NitricAcid.getFluid(1000), Materials.Water.getFluid(1000)) - .duration(16 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.Ammonia.getGas(1000), Materials.Oxygen.getGas(4000)) - .fluidOutputs(Materials.NitricAcid.getFluid(1000), Materials.Water.getFluid(1000)) - .duration(16 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs( - Materials.NitrogenDioxide.getGas(2000), - Materials.Oxygen.getGas(1000), - Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.NitricAcid.getFluid(2000)).duration(16 * SECONDS).eut(30) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.Sulfur.getDust(9)) - .noItemOutputs().fluidInputs(Materials.Hydrogen.getGas(18000)) - .fluidOutputs(Materials.HydricSulfide.getGas(9000)).duration(4 * TICKS).eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.Sulfur.getDust(9)) - .noItemOutputs().fluidInputs(Materials.Oxygen.getGas(18000)) - .fluidOutputs(Materials.SulfurDioxide.getGas(9000)).duration(4 * TICKS).eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)).noItemOutputs() - .fluidInputs(Materials.HydricSulfide.getGas(9000), Materials.Oxygen.getGas(27000)) - .fluidOutputs(Materials.SulfurDioxide.getGas(9000), Materials.Water.getFluid(9000)) - .duration(3 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(8)).noItemOutputs() - .fluidInputs(Materials.HydricSulfide.getGas(9000), Materials.Oxygen.getGas(27000)) - .fluidOutputs(Materials.SulfurDioxide.getGas(9000)).duration(3 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(7)) - .itemOutputs(Materials.Sulfur.getDust(27)) - .fluidInputs(Materials.SulfurDioxide.getGas(9000), Materials.HydricSulfide.getGas(18000)) - .noFluidOutputs().duration(3 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)).noItemOutputs() - .fluidInputs(Materials.SulfurTrioxide.getGas(9000), Materials.Water.getFluid(9000)) - .fluidOutputs(Materials.SulfuricAcid.getFluid(9000)).duration(13 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(23)) + .noItemOutputs() + .fluidInputs( + Materials.Nitrogen.getGas(2000), + Materials.Hydrogen.getGas(6000), + Materials.Oxygen.getGas(7000)) + .fluidOutputs(Materials.DinitrogenTetroxide.getGas(1000), Materials.Water.getFluid(3000)) + .duration(55 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .noItemOutputs() + .fluidInputs(Materials.Oxygen.getGas(100000), Materials.Ammonia.getGas(36000)) + .fluidOutputs(Materials.NitricOxide.getGas(36000), Materials.Water.getFluid(54000)) + .duration(8 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(8)) + .noItemOutputs() + .fluidInputs(Materials.Oxygen.getGas(100000), Materials.Ammonia.getGas(36000)) + .fluidOutputs(Materials.NitricOxide.getGas(36000)) + .duration(8 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .noItemOutputs() + .fluidInputs(Materials.NitricOxide.getGas(9000), Materials.Oxygen.getGas(9000)) + .fluidOutputs(Materials.NitrogenDioxide.getGas(9000)) + .duration(4 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .noItemOutputs() + .fluidInputs(Materials.NitrogenDioxide.getGas(27000), Materials.Water.getFluid(9000)) + .fluidOutputs(Materials.NitricAcid.getFluid(18000), Materials.NitricOxide.getGas(9000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs( + Materials.Hydrogen.getGas(3000), + Materials.Nitrogen.getGas(1000), + Materials.Oxygen.getGas(4000)) + .fluidOutputs(Materials.NitricAcid.getFluid(1000), Materials.Water.getFluid(1000)) + .duration(16 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.Ammonia.getGas(1000), Materials.Oxygen.getGas(4000)) + .fluidOutputs(Materials.NitricAcid.getFluid(1000), Materials.Water.getFluid(1000)) + .duration(16 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs( + Materials.NitrogenDioxide.getGas(2000), + Materials.Oxygen.getGas(1000), + Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.NitricAcid.getFluid(2000)) + .duration(16 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.Sulfur.getDust(9)) + .noItemOutputs() + .fluidInputs(Materials.Hydrogen.getGas(18000)) + .fluidOutputs(Materials.HydricSulfide.getGas(9000)) + .duration(4 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.Sulfur.getDust(9)) + .noItemOutputs() + .fluidInputs(Materials.Oxygen.getGas(18000)) + .fluidOutputs(Materials.SulfurDioxide.getGas(9000)) + .duration(4 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .noItemOutputs() + .fluidInputs(Materials.HydricSulfide.getGas(9000), Materials.Oxygen.getGas(27000)) + .fluidOutputs(Materials.SulfurDioxide.getGas(9000), Materials.Water.getFluid(9000)) + .duration(3 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(8)) + .noItemOutputs() + .fluidInputs(Materials.HydricSulfide.getGas(9000), Materials.Oxygen.getGas(27000)) + .fluidOutputs(Materials.SulfurDioxide.getGas(9000)) + .duration(3 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(7)) + .itemOutputs(Materials.Sulfur.getDust(27)) + .fluidInputs(Materials.SulfurDioxide.getGas(9000), Materials.HydricSulfide.getGas(18000)) + .noFluidOutputs() + .duration(3 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .noItemOutputs() + .fluidInputs(Materials.SulfurTrioxide.getGas(9000), Materials.Water.getFluid(9000)) + .fluidOutputs(Materials.SulfuricAcid.getFluid(9000)) + .duration(13 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); // S + O3 + H2O = H2SO4 - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24), Materials.Sulfur.getDust(1)) - .noItemOutputs().fluidInputs(Materials.Oxygen.getGas(3000), Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)).duration(24 * SECONDS).eut(30) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24), Materials.Sulfur.getDust(1)) + .noItemOutputs() + .fluidInputs(Materials.Oxygen.getGas(3000), Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) + .duration(24 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(7), Materials.Sulfur.getDust(9)) - .noItemOutputs().fluidInputs(Materials.Oxygen.getGas(27000), Materials.Water.getFluid(9000)) - .fluidOutputs(Materials.SulfuricAcid.getFluid(9000)).duration(13 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(7), Materials.Sulfur.getDust(9)) + .noItemOutputs() + .fluidInputs(Materials.Oxygen.getGas(27000), Materials.Water.getFluid(9000)) + .fluidOutputs(Materials.SulfuricAcid.getFluid(9000)) + .duration(13 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); // H2S + O4 = H2SO4 - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.HydricSulfide.getGas(1000), Materials.Oxygen.getGas(4000)) - .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)).duration(24 * SECONDS).eut(30) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.HydricSulfide.getGas(1000), Materials.Oxygen.getGas(4000)) + .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) + .duration(24 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); // SO2 + O + H2O = H2SO4 - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs( - Materials.SulfurDioxide.getGas(1000), - Materials.Oxygen.getGas(1000), - Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)).duration(30 * SECONDS).eut(30) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)).noItemOutputs() - .fluidInputs( - Materials.SulfurDioxide.getGas(9000), - Materials.Oxygen.getGas(9000), - Materials.Water.getFluid(9000)) - .fluidOutputs(Materials.SulfuricAcid.getFluid(9000)).duration(7 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)).noItemOutputs() - .fluidInputs( - Materials.HydrochloricAcid.getFluid(1000), - Materials.Ethylene.getGas(1000), - Materials.Oxygen.getGas(1000)) - .fluidOutputs(Materials.VinylChloride.getGas(1000), Materials.Water.getFluid(1000)) - .duration(8 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs( - Materials.Chlorine.getGas(2000), - Materials.Ethylene.getGas(2000), - Materials.Oxygen.getGas(1000)) - .fluidOutputs(Materials.VinylChloride.getGas(2000), Materials.Water.getFluid(1000)) - .duration(12 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.RawRubber.getDust(18)) - .fluidInputs( - Materials.Isoprene.getFluid(1728), - Materials.Air.getGas(6000), - Materials.Titaniumtetrachloride.getFluid(80)) - .noFluidOutputs().duration(32 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.RawRubber.getDust(24)) - .fluidInputs( - Materials.Isoprene.getFluid(1728), - Materials.Oxygen.getGas(6000), - Materials.Titaniumtetrachloride.getFluid(80)) - .noFluidOutputs().duration(32 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(1)) - .fluidInputs( - Materials.Styrene.getFluid(36), - Materials.Butadiene.getGas(108), - Materials.Air.getGas(2000)) - .noFluidOutputs().duration(8 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(3)) - .fluidInputs( - Materials.Styrene.getFluid(72), - Materials.Butadiene.getGas(216), - Materials.Oxygen.getGas(2000)) - .noFluidOutputs().duration(8 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)) - .itemOutputs( - Materials.RawStyreneButadieneRubber.getDust(22), - Materials.RawStyreneButadieneRubber.getDustSmall(2)) - .fluidInputs( - Materials.Styrene.getFluid(540), - Materials.Butadiene.getGas(1620), - Materials.Titaniumtetrachloride.getFluid(100), - Materials.Air.getGas(15000)) - .noFluidOutputs().duration(32 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(30)) - .fluidInputs( - Materials.Styrene.getFluid(540), - Materials.Butadiene.getGas(1620), - Materials.Titaniumtetrachloride.getFluid(100), - Materials.Oxygen.getGas(7500)) - .noFluidOutputs().duration(32 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.Salt.getDust(18)) - .itemOutputs(Materials.SodiumBisulfate.getDust(63)).fluidInputs(Materials.SulfuricAcid.getFluid(9000)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(9000)).duration(6 * SECONDS + 15 * TICKS) - .eut(TierEU.RECIPE_MV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.SodiumHydroxide.getDust(27)) - .itemOutputs(Materials.SodiumBisulfate.getDust(63)).fluidInputs(Materials.SulfuricAcid.getFluid(9000)) - .fluidOutputs(Materials.Water.getFluid(9000)).duration(6 * SECONDS + 15 * TICKS).eut(TierEU.RECIPE_MV) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs( - Materials.Benzene.getFluid(1000), - Materials.Chlorine.getGas(2000), - Materials.Water.getFluid(1000)) - .fluidOutputs( - Materials.Phenol.getFluid(1000), - Materials.HydrochloricAcid.getFluid(1000), - Materials.DilutedHydrochloricAcid.getFluid(1000)) - .duration(28 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs( + Materials.SulfurDioxide.getGas(1000), + Materials.Oxygen.getGas(1000), + Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) + .duration(30 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .noItemOutputs() + .fluidInputs( + Materials.SulfurDioxide.getGas(9000), + Materials.Oxygen.getGas(9000), + Materials.Water.getFluid(9000)) + .fluidOutputs(Materials.SulfuricAcid.getFluid(9000)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs( + Materials.HydrochloricAcid.getFluid(1000), + Materials.Ethylene.getGas(1000), + Materials.Oxygen.getGas(1000)) + .fluidOutputs(Materials.VinylChloride.getGas(1000), Materials.Water.getFluid(1000)) + .duration(8 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs( + Materials.Chlorine.getGas(2000), + Materials.Ethylene.getGas(2000), + Materials.Oxygen.getGas(1000)) + .fluidOutputs(Materials.VinylChloride.getGas(2000), Materials.Water.getFluid(1000)) + .duration(12 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.RawRubber.getDust(18)) + .fluidInputs( + Materials.Isoprene.getFluid(1728), + Materials.Air.getGas(6000), + Materials.Titaniumtetrachloride.getFluid(80)) + .noFluidOutputs() + .duration(32 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.RawRubber.getDust(24)) + .fluidInputs( + Materials.Isoprene.getFluid(1728), + Materials.Oxygen.getGas(6000), + Materials.Titaniumtetrachloride.getFluid(80)) + .noFluidOutputs() + .duration(32 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(1)) + .fluidInputs( + Materials.Styrene.getFluid(36), + Materials.Butadiene.getGas(108), + Materials.Air.getGas(2000)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(3)) + .fluidInputs( + Materials.Styrene.getFluid(72), + Materials.Butadiene.getGas(216), + Materials.Oxygen.getGas(2000)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + Materials.RawStyreneButadieneRubber.getDust(22), + Materials.RawStyreneButadieneRubber.getDustSmall(2)) + .fluidInputs( + Materials.Styrene.getFluid(540), + Materials.Butadiene.getGas(1620), + Materials.Titaniumtetrachloride.getFluid(100), + Materials.Air.getGas(15000)) + .noFluidOutputs() + .duration(32 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(Materials.RawStyreneButadieneRubber.getDust(30)) + .fluidInputs( + Materials.Styrene.getFluid(540), + Materials.Butadiene.getGas(1620), + Materials.Titaniumtetrachloride.getFluid(100), + Materials.Oxygen.getGas(7500)) + .noFluidOutputs() + .duration(32 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.Salt.getDust(18)) + .itemOutputs(Materials.SodiumBisulfate.getDust(63)) + .fluidInputs(Materials.SulfuricAcid.getFluid(9000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(9000)) + .duration(6 * SECONDS + 15 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9), Materials.SodiumHydroxide.getDust(27)) + .itemOutputs(Materials.SodiumBisulfate.getDust(63)) + .fluidInputs(Materials.SulfuricAcid.getFluid(9000)) + .fluidOutputs(Materials.Water.getFluid(9000)) + .duration(6 * SECONDS + 15 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs( + Materials.Benzene.getFluid(1000), + Materials.Chlorine.getGas(2000), + Materials.Water.getFluid(1000)) + .fluidOutputs( + Materials.Phenol.getFluid(1000), + Materials.HydrochloricAcid.getFluid(1000), + Materials.DilutedHydrochloricAcid.getFluid(1000)) + .duration(28 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); // C6H6 + 2Cl + NaOH = C6H6O + NaCl + HCl - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(6), GT_Utility.getIntegratedCircuit(24)) - .itemOutputs(Materials.Salt.getDust(4)) - .fluidInputs(Materials.Benzene.getFluid(2000), Materials.Chlorine.getGas(4000)) - .fluidOutputs(Materials.Phenol.getFluid(2000), Materials.HydrochloricAcid.getFluid(2000)) - .duration(56 * SECONDS).eut(30).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(6), GT_Utility.getIntegratedCircuit(24)) + .itemOutputs(Materials.Salt.getDust(4)) + .fluidInputs(Materials.Benzene.getFluid(2000), Materials.Chlorine.getGas(4000)) + .fluidOutputs(Materials.Phenol.getFluid(2000), Materials.HydrochloricAcid.getFluid(2000)) + .duration(56 * SECONDS) + .eut(30) + .addTo(sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.LightFuel.getFluid(20000), Materials.HeavyFuel.getFluid(4000)) - .fluidOutputs(Materials.Fuel.getFluid(24000)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.LightFuel.getFluid(20000), Materials.HeavyFuel.getFluid(4000)) + .fluidOutputs(Materials.Fuel.getFluid(24000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.Fuel.getFluid(10000), Materials.Tetranitromethane.getFluid(200)) - .fluidOutputs(Materials.NitroFuel.getFluid(10000)).duration(6 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.Fuel.getFluid(10000), Materials.Tetranitromethane.getFluid(200)) + .fluidOutputs(Materials.NitroFuel.getFluid(10000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.BioDiesel.getFluid(10000), Materials.Tetranitromethane.getFluid(400)) - .fluidOutputs(Materials.NitroFuel.getFluid(9000)).duration(6 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.BioDiesel.getFluid(10000), Materials.Tetranitromethane.getFluid(400)) + .fluidOutputs(Materials.NitroFuel.getFluid(9000)) + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); // CH4 + 2H2O = CO2 + 8H - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(11)).noItemOutputs() - .fluidInputs(Materials.Methane.getGas(5000), GT_ModHandler.getDistilledWater(10000)) - .fluidOutputs(Materials.CarbonDioxide.getGas(5000), Materials.Hydrogen.getGas(40000)) - .duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(11)) + .noItemOutputs() + .fluidInputs(Materials.Methane.getGas(5000), GT_ModHandler.getDistilledWater(10000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(5000), Materials.Hydrogen.getGas(40000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); // CH4 + H2O = CO + 6H - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(12)).noItemOutputs() - .fluidInputs(Materials.Methane.getGas(5000), GT_ModHandler.getDistilledWater(5000)) - .fluidOutputs(Materials.CarbonMonoxide.getGas(5000), Materials.Hydrogen.getGas(30000)) - .duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.Nitrogen.getGas(20000), Materials.Oxygen.getGas(10000)) - .fluidOutputs(Materials.NitrousOxide.getGas(10000)).duration(2 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs( - Materials.Naphtha.getFluid(16000), - Materials.Gas.getGas(2000), - Materials.Methanol.getFluid(1000), - Materials.Acetone.getFluid(1000)) - .fluidOutputs(Materials.GasolineRaw.getFluid(20000)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.GasolineRaw.getFluid(10000), Materials.Toluene.getFluid(1000)) - .fluidOutputs(Materials.GasolineRegular.getFluid(11000)).duration(10 * TICKS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs( - Materials.GasolineRegular.getFluid(20000), - Materials.Octane.getFluid(2000), - Materials.NitrousOxide.getGas(6000), - Materials.Toluene.getFluid(1000), - Materials.AntiKnock.getFluid(3000)) - .fluidOutputs(Materials.GasolinePremium.getFluid(32000)).duration(2 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(12)) + .noItemOutputs() + .fluidInputs(Materials.Methane.getGas(5000), GT_ModHandler.getDistilledWater(5000)) + .fluidOutputs(Materials.CarbonMonoxide.getGas(5000), Materials.Hydrogen.getGas(30000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.Nitrogen.getGas(20000), Materials.Oxygen.getGas(10000)) + .fluidOutputs(Materials.NitrousOxide.getGas(10000)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs( + Materials.Naphtha.getFluid(16000), + Materials.Gas.getGas(2000), + Materials.Methanol.getFluid(1000), + Materials.Acetone.getFluid(1000)) + .fluidOutputs(Materials.GasolineRaw.getFluid(20000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.GasolineRaw.getFluid(10000), Materials.Toluene.getFluid(1000)) + .fluidOutputs(Materials.GasolineRegular.getFluid(11000)) + .duration(10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs( + Materials.GasolineRegular.getFluid(20000), + Materials.Octane.getFluid(2000), + Materials.NitrousOxide.getGas(6000), + Materials.Toluene.getFluid(1000), + Materials.AntiKnock.getFluid(3000)) + .fluidOutputs(Materials.GasolinePremium.getFluid(32000)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // C2H6O + C4H8 = C6H14O - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.Ethanol.getFluid(1000), Materials.Butene.getGas(1000)) - .fluidOutputs(Materials.AntiKnock.getFluid(1000)).duration(20 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.Ethanol.getFluid(1000), Materials.Butene.getGas(1000)) + .fluidOutputs(Materials.AntiKnock.getFluid(1000)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); // CH4O + C4H8 = C5H12O - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.Methanol.getFluid(1000), Materials.Butene.getGas(1000)) - .fluidOutputs(Materials.MTBEMixture.getGas(1000)).duration(20 * TICKS).eut(TierEU.RECIPE_HV) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.Methanol.getFluid(1000), Materials.Butene.getGas(1000)) + .fluidOutputs(Materials.MTBEMixture.getGas(1000)) + .duration(20 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs( - Materials.Naquadria.getMolten(4608), - Materials.ElectrumFlux.getMolten(4608), - Materials.Radon.getGas(16000)) - .fluidOutputs(Materials.EnrichedNaquadria.getFluid(9216)).duration(30 * SECONDS).eut(500000) - .addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs( + Materials.Naquadria.getMolten(4608), + Materials.ElectrumFlux.getMolten(4608), + Materials.Radon.getGas(16000)) + .fluidOutputs(Materials.EnrichedNaquadria.getFluid(9216)) + .duration(30 * SECONDS) + .eut(500000) + .addTo(sMultiblockChemicalRecipes); if (GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded()) { // CH2O + 2C6H7N + HCl = C13H14N2(HCl) + H2O - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("formaldehyde"), 1000), - new FluidStack(FluidRegistry.getFluid("aniline"), 2000), - Materials.HydrochloricAcid.getFluid(1000)) - .fluidOutputs(MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000)).duration(60 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("formaldehyde"), 1000), + new FluidStack(FluidRegistry.getFluid("aniline"), 2000), + Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // C6H5NO2 + 6H =Pd= C6H7N + 2H2O GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1)) - .noItemOutputs() - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("nitrobenzene"), 9000), - Materials.Hydrogen.getGas(54000)) - .fluidOutputs( - Materials.Water.getFluid(18000), - new FluidStack(FluidRegistry.getFluid("aniline"), 9000)) - .duration(45 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1)) + .noItemOutputs() + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("nitrobenzene"), 9000), + Materials.Hydrogen.getGas(54000)) + .fluidOutputs( + Materials.Water.getFluid(18000), + new FluidStack(FluidRegistry.getFluid("aniline"), 9000)) + .duration(45 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // C6H6 + HNO3 =H2SO4= C6H5NO2 + H2O - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs( - Materials.Benzene.getFluid(5000), - Materials.SulfuricAcid.getFluid(3000), - Materials.NitricAcid.getFluid(5000), - GT_ModHandler.getDistilledWater(10000)) - .fluidOutputs( - new FluidStack(FluidRegistry.getFluid("nitrobenzene"), 5000), - Materials.DilutedSulfuricAcid.getFluid(3000)) - .duration(8 * TICKS).eut(TierEU.RECIPE_ZPM).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs( + Materials.Benzene.getFluid(5000), + Materials.SulfuricAcid.getFluid(3000), + Materials.NitricAcid.getFluid(5000), + GT_ModHandler.getDistilledWater(10000)) + .fluidOutputs( + new FluidStack(FluidRegistry.getFluid("nitrobenzene"), 5000), + Materials.DilutedSulfuricAcid.getFluid(3000)) + .duration(8 * TICKS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sMultiblockChemicalRecipes); // C13H14N2(HCl) + 2COCl2 = C15H10N2O2(5HCl) - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs( - MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000), - new FluidStack(FluidRegistry.getFluid("phosgene"), 2000)) - .fluidOutputs(MaterialsKevlar.DiphenylmethaneDiisocyanateMixture.getFluid(1000)) - .duration(30 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs( + MaterialsKevlar.DiaminodiphenylmethanMixture.getFluid(1000), + new FluidStack(FluidRegistry.getFluid("phosgene"), 2000)) + .fluidOutputs(MaterialsKevlar.DiphenylmethaneDiisocyanateMixture.getFluid(1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1)) - .noItemOutputs() - .fluidInputs(MaterialsKevlar.Butyraldehyde.getFluid(9000), Materials.Hydrogen.getGas(18000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("butanol"), 9000)).duration(4 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1)) + .noItemOutputs() + .fluidInputs(MaterialsKevlar.Butyraldehyde.getFluid(9000), Materials.Hydrogen.getGas(18000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("butanol"), 9000)) + .duration(4 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 1)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("butanol"), 2000), - new FluidStack(FluidRegistry.getFluid("propionicacid"), 1000), - Materials.IronIIIChloride.getFluid(100)) - .noFluidOutputs().duration(30 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 1)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("butanol"), 2000), + new FluidStack(FluidRegistry.getFluid("propionicacid"), 1000), + Materials.IronIIIChloride.getFluid(100)) + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 9)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("butanol"), 18000), - new FluidStack(FluidRegistry.getFluid("propionicacid"), 9000), - Materials.IronIIIChloride.getFluid(900)) - .noFluidOutputs().duration(3 * MINUTES + 45 * SECONDS).eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.KevlarCatalyst, 9)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("butanol"), 18000), + new FluidStack(FluidRegistry.getFluid("propionicacid"), 9000), + Materials.IronIIIChloride.getFluid(900)) + .noFluidOutputs() + .duration(3 * MINUTES + 45 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // C2H4 + CO + H2O =C4NiO= C3H6O2 - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs( - Materials.Ethylene.getGas(1000), - Materials.CarbonMonoxide.getGas(1000), - MaterialsKevlar.NickelTetracarbonyl.getFluid(100), - Materials.Water.getFluid(1000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("propionicacid"), 1000)).duration(10 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs( + Materials.Ethylene.getGas(1000), + Materials.CarbonMonoxide.getGas(1000), + MaterialsKevlar.NickelTetracarbonyl.getFluid(100), + Materials.Water.getFluid(1000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("propionicacid"), 1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)).noItemOutputs() - .fluidInputs( - Materials.Ethylene.getGas(9000), - Materials.CarbonMonoxide.getGas(9000), - MaterialsKevlar.NickelTetracarbonyl.getFluid(900), - Materials.Water.getFluid(9000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("propionicacid"), 9000)) - .duration(1 * MINUTES + 15 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .noItemOutputs() + .fluidInputs( + Materials.Ethylene.getGas(9000), + Materials.CarbonMonoxide.getGas(9000), + MaterialsKevlar.NickelTetracarbonyl.getFluid(900), + Materials.Water.getFluid(9000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("propionicacid"), 9000)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // C6H7N + HNO3 =H2SO4,C4H6O3= C6H6N2O2 + H2O - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)).noItemOutputs() - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("aniline"), 1000), - new FluidStack(FluidRegistry.getFluid("molten.aceticanhydride"), 100), - Materials.NitrationMixture.getFluid(2000)) - .fluidOutputs( - MaterialsKevlar.IVNitroaniline.getFluid(1000), - Materials.DilutedSulfuricAcid.getFluid(1000)) - .duration(15 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("aniline"), 1000), + new FluidStack(FluidRegistry.getFluid("molten.aceticanhydride"), 100), + Materials.NitrationMixture.getFluid(2000)) + .fluidOutputs( + MaterialsKevlar.IVNitroaniline.getFluid(1000), + Materials.DilutedSulfuricAcid.getFluid(1000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)).noItemOutputs() - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("aniline"), 9000), - new FluidStack(FluidRegistry.getFluid("molten.aceticanhydride"), 900), - Materials.NitrationMixture.getFluid(18000)) - .fluidOutputs( - MaterialsKevlar.IVNitroaniline.getFluid(9000), - Materials.DilutedSulfuricAcid.getFluid(9000)) - .duration(1 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .noItemOutputs() + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("aniline"), 9000), + new FluidStack(FluidRegistry.getFluid("molten.aceticanhydride"), 900), + Materials.NitrationMixture.getFluid(18000)) + .fluidOutputs( + MaterialsKevlar.IVNitroaniline.getFluid(9000), + Materials.DilutedSulfuricAcid.getFluid(9000)) + .duration(1 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // C6H6N2O2 + 6H =Pd,NO2= C6H8N2 + 2H2O GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 16)) - .fluidInputs( - Materials.NitrogenDioxide.getGas(100), - Materials.Hydrogen.getGas(6000), - MaterialsKevlar.IVNitroaniline.getFluid(1000)) - .fluidOutputs(Materials.Water.getFluid(2000)).duration(20 * SECONDS).eut(500000) - .addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 16)) + .fluidInputs( + Materials.NitrogenDioxide.getGas(100), + Materials.Hydrogen.getGas(6000), + MaterialsKevlar.IVNitroaniline.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(20 * SECONDS) + .eut(500000) + .addTo(sMultiblockChemicalRecipes); // C4H10O2 =Cu= C4H6O2 + 4H GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1)) - .noItemOutputs().fluidInputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000)) - .fluidOutputs(MaterialsKevlar.GammaButyrolactone.getFluid(1000), Materials.Hydrogen.getGas(4000)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1)) + .noItemOutputs() + .fluidInputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000)) + .fluidOutputs( + MaterialsKevlar.GammaButyrolactone.getFluid(1000), + Materials.Hydrogen.getGas(4000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 9)) - .noItemOutputs().fluidInputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 9000)) - .fluidOutputs(MaterialsKevlar.GammaButyrolactone.getFluid(9000), Materials.Hydrogen.getGas(36000)) - .duration(35 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 9)) + .noItemOutputs() + .fluidInputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 9000)) + .fluidOutputs( + MaterialsKevlar.GammaButyrolactone.getFluid(9000), + Materials.Hydrogen.getGas(36000)) + .duration(35 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // 2CH2O + C2H2 =SiO2,CuO,Bi2O3= C4H6O2 GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12)) - .fluidInputs( - MaterialsKevlar.Acetylene.getGas(1000), - new FluidStack(FluidRegistry.getFluid("formaldehyde"), 2000)) - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12)) + .fluidInputs( + MaterialsKevlar.Acetylene.getGas(1000), + new FluidStack(FluidRegistry.getFluid("formaldehyde"), 2000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 44)) - .fluidInputs( - MaterialsKevlar.Acetylene.getGas(9000), - new FluidStack(FluidRegistry.getFluid("formaldehyde"), 18000)) - .noFluidOutputs().duration(2 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_EV) - .addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CupricOxide, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.BismuthIIIOxide, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 9)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 44)) + .fluidInputs( + MaterialsKevlar.Acetylene.getGas(9000), + new FluidStack(FluidRegistry.getFluid("formaldehyde"), 18000)) + .noFluidOutputs() + .duration(2 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // C4H6O2 + 4H =NiAl= C4H10O2 GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RaneyNickelActivated, 1)) - .noItemOutputs().fluidInputs(Materials.Hydrogen.getGas(4000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000)).duration(15 * SECONDS) - .eut(500000).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.IIButinIIVdiol, 12), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RaneyNickelActivated, 1)) + .noItemOutputs() + .fluidInputs(Materials.Hydrogen.getGas(4000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("1,4-butanediol"), 1000)) + .duration(15 * SECONDS) + .eut(500000) + .addTo(sMultiblockChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - getModItem(GTPlusPlus.modID, "itemDustCalciumChloride", 1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 9)) - .noItemOutputs().fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(1000)) - .fluidOutputs( - MaterialsKevlar.LiquidCrystalKevlar.getFluid(9000), - Materials.DilutedHydrochloricAcid.getFluid(2000)) - .duration(30 * SECONDS).eut(500000).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + getModItem(GTPlusPlus.modID, "itemDustCalciumChloride", 1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 9)) + .noItemOutputs() + .fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(1000)) + .fluidOutputs( + MaterialsKevlar.LiquidCrystalKevlar.getFluid(9000), + Materials.DilutedHydrochloricAcid.getFluid(2000)) + .duration(30 * SECONDS) + .eut(500000) + .addTo(sMultiblockChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - getModItem(GTPlusPlus.modID, "itemDustCalciumChloride", 7), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 63), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 63)) - .noItemOutputs().fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(7000)) - .fluidOutputs( - MaterialsKevlar.LiquidCrystalKevlar.getFluid(63000), - Materials.DilutedHydrochloricAcid.getFluid(14000)) - .duration(2 * MINUTES + 55 * SECONDS).eut(500000).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + getModItem(GTPlusPlus.modID, "itemDustCalciumChloride", 7), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 63), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 63)) + .noItemOutputs() + .fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(7000)) + .fluidOutputs( + MaterialsKevlar.LiquidCrystalKevlar.getFluid(63000), + Materials.DilutedHydrochloricAcid.getFluid(14000)) + .duration(2 * MINUTES + 55 * SECONDS) + .eut(500000) + .addTo(sMultiblockChemicalRecipes); // Na2B4O7(H2O)10 + 2HCl = 2NaCl + 4H3BO3 + 5H2O GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Borax, 23)) - .itemOutputs(Materials.Salt.getDust(4)).fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) - .fluidOutputs( - new FluidStack(FluidRegistry.getFluid("boricacid"), 4000), - Materials.Water.getFluid(5000)) - .duration(40 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Borax, 23)) + .itemOutputs(Materials.Salt.getDust(4)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) + .fluidOutputs( + new FluidStack(FluidRegistry.getFluid("boricacid"), 4000), + Materials.Water.getFluid(5000)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); // H3BO3 + 3CH4O =H2SO4= C3H9BO3 + 3H2O - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs( - Materials.Methanol.getFluid(3000), - new FluidStack(FluidRegistry.getFluid("boricacid"), 1000), - Materials.SulfuricAcid.getFluid(6000)) - .fluidOutputs( - Materials.DilutedSulfuricAcid.getFluid(6000), - MaterialsKevlar.TrimethylBorate.getFluid(1000)) - .duration(30 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs( + Materials.Methanol.getFluid(3000), + new FluidStack(FluidRegistry.getFluid("boricacid"), 1000), + Materials.SulfuricAcid.getFluid(6000)) + .fluidOutputs( + Materials.DilutedSulfuricAcid.getFluid(6000), + MaterialsKevlar.TrimethylBorate.getFluid(1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)).noItemOutputs() - .fluidInputs( - Materials.Methanol.getFluid(27000), - new FluidStack(FluidRegistry.getFluid("boricacid"), 9000), - Materials.SulfuricAcid.getFluid(54000)) - .fluidOutputs( - Materials.DilutedSulfuricAcid.getFluid(54000), - MaterialsKevlar.TrimethylBorate.getFluid(9000)) - .duration(3 * MINUTES + 45 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .noItemOutputs() + .fluidInputs( + Materials.Methanol.getFluid(27000), + new FluidStack(FluidRegistry.getFluid("boricacid"), 9000), + Materials.SulfuricAcid.getFluid(54000)) + .fluidOutputs( + Materials.DilutedSulfuricAcid.getFluid(54000), + MaterialsKevlar.TrimethylBorate.getFluid(9000)) + .duration(3 * MINUTES + 45 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); // RhCl3 + 3C18H15P + 3NaBH4 + CO = RhC55H46P3O + 3NaCl + 3B + 11H GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RhodiumChloride, 4), - MaterialsKevlar.Triphenylphosphene.getDust(64), - MaterialsKevlar.Triphenylphosphene.getDust(38), - MaterialsKevlar.SodiumBorohydride.getDust(18)) - .itemOutputs( - MaterialsKevlar.OrganorhodiumCatalyst.getDust(64), - MaterialsKevlar.OrganorhodiumCatalyst.getDust(42), - Materials.Salt.getDust(6), - Materials.Boron.getDust(3)) - .fluidInputs(Materials.CarbonMonoxide.getGas(1000)).fluidOutputs(Materials.Hydrogen.getGas(11000)) - .duration(40 * SECONDS).eut(500000).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.RhodiumChloride, 4), + MaterialsKevlar.Triphenylphosphene.getDust(64), + MaterialsKevlar.Triphenylphosphene.getDust(38), + MaterialsKevlar.SodiumBorohydride.getDust(18)) + .itemOutputs( + MaterialsKevlar.OrganorhodiumCatalyst.getDust(64), + MaterialsKevlar.OrganorhodiumCatalyst.getDust(42), + Materials.Salt.getDust(6), + Materials.Boron.getDust(3)) + .fluidInputs(Materials.CarbonMonoxide.getGas(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(11000)) + .duration(40 * SECONDS) + .eut(500000) + .addTo(sMultiblockChemicalRecipes); // 2NaOH + N2H4 =Mn= 2N + 2H2O + 2NaH GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(9), - Materials.SodiumHydroxide.getDust(6), - Materials.Manganese.getDustTiny(1)) - .itemOutputs(MaterialsKevlar.SodiumHydride.getDust(4)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("hydrazine"), 1000)) - .fluidOutputs(Materials.Nitrogen.getGas(2000), Materials.Water.getFluid(2000)).duration(10 * TICKS) - .eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(9), + Materials.SodiumHydroxide.getDust(6), + Materials.Manganese.getDustTiny(1)) + .itemOutputs(MaterialsKevlar.SodiumHydride.getDust(4)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("hydrazine"), 1000)) + .fluidOutputs(Materials.Nitrogen.getGas(2000), Materials.Water.getFluid(2000)) + .duration(10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(18), - Materials.SodiumHydroxide.getDust(54), - Materials.Manganese.getDust(1)) - .itemOutputs(MaterialsKevlar.SodiumHydride.getDust(36)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("hydrazine"), 9000)) - .fluidOutputs(Materials.Nitrogen.getGas(18000), Materials.Water.getFluid(18000)) - .duration(3 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV).addTo(sMultiblockChemicalRecipes); + .itemInputs( + GT_Utility.getIntegratedCircuit(18), + Materials.SodiumHydroxide.getDust(54), + Materials.Manganese.getDust(1)) + .itemOutputs(MaterialsKevlar.SodiumHydride.getDust(36)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("hydrazine"), 9000)) + .fluidOutputs(Materials.Nitrogen.getGas(18000), Materials.Water.getFluid(18000)) + .duration(3 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(sMultiblockChemicalRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java index 826d71eb2c..74f8ebc207 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java @@ -33,133 +33,172 @@ public class CircuitAssemblerRecipes implements Runnable { // Railcraft Circuits GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Coated_Basic.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), - ItemList.Cover_Controller.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 4L, 0)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs().duration(15 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Coated_Basic.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), + ItemList.Cover_Controller.get(1)) + .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 4L, 0)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Coated_Basic.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), - ItemList.Sensor_LV.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 4L, 1)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs().duration(15 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Coated_Basic.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), + ItemList.Sensor_LV.get(1)) + .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 4L, 1)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Coated_Basic.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), - getModItem(Railcraft.modID, "part.signal.lamp", 1L, 0)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 4L, 2)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs().duration(15 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Coated_Basic.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), + getModItem(Railcraft.modID, "part.signal.lamp", 1L, 0)) + .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 4L, 2)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Phenolic_Good.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), - ItemList.Cover_Controller.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 8L, 0)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs().duration(20 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Phenolic_Good.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), + ItemList.Cover_Controller.get(1)) + .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 8L, 0)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Phenolic_Good.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), - ItemList.Sensor_LV.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 8L, 1)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs().duration(20 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Phenolic_Good.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), + ItemList.Sensor_LV.get(1)) + .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 8L, 1)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Phenolic_Good.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), - getModItem(Railcraft.modID, "part.signal.lamp", 1L, 0)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 8L, 2)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs().duration(20 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Phenolic_Good.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), + getModItem(Railcraft.modID, "part.signal.lamp", 1L, 0)) + .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 8L, 2)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Epoxy_Advanced.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), - ItemList.Cover_Controller.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 16L, 0)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs().duration(25 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Epoxy_Advanced.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), + ItemList.Cover_Controller.get(1)) + .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 16L, 0)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(25 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Epoxy_Advanced.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), - ItemList.Sensor_LV.get(1)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 16L, 1)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs().duration(25 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Epoxy_Advanced.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), + ItemList.Sensor_LV.get(1)) + .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 16L, 1)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(25 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Epoxy_Advanced.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), - getModItem(Railcraft.modID, "part.signal.lamp", 1L, 0)) - .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 16L, 2)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)).noFluidOutputs().duration(25 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Epoxy_Advanced.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), + getModItem(Railcraft.modID, "part.signal.lamp", 1L, 0)) + .itemOutputs(getModItem(Railcraft.modID, "part.circuit", 16L, 2)) + .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) + .noFluidOutputs() + .duration(25 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Coated_Basic.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Primitive, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 0)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)).noFluidOutputs().duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Coated_Basic.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Primitive, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 0)) + .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Coated_Basic.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 1)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)).noFluidOutputs().duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Coated_Basic.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 1)) + .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Phenolic_Good.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 2)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)).noFluidOutputs().duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Phenolic_Good.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 2)) + .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Phenolic_Good.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 3)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)).noFluidOutputs().duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Phenolic_Good.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 3)) + .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); } } @@ -172,26 +211,32 @@ public class CircuitAssemblerRecipes implements Runnable { // alternative version of the copper electron tube GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.AnnealedCopper, 2)) - .itemOutputs(getModItem(Forestry.modID, "thermionicTubes", 4L, 0)) - .fluidInputs(Materials.Glass.getMolten(576)).noFluidOutputs().duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.AnnealedCopper, 2)) + .itemOutputs(getModItem(Forestry.modID, "thermionicTubes", 4L, 0)) + .fluidInputs(Materials.Glass.getMolten(576)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); // alternative version of the iron electron tube GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.WroughtIron, 2)) - .itemOutputs(getModItem(Forestry.modID, "thermionicTubes", 4L, 3)) - .fluidInputs(Materials.Glass.getMolten(576)).noFluidOutputs().duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2), + GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.WroughtIron, 2)) + .itemOutputs(getModItem(Forestry.modID, "thermionicTubes", 4L, 3)) + .fluidInputs(Materials.Glass.getMolten(576)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); ItemStack[] rodMaterials = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Copper, 2L), @@ -211,14 +256,17 @@ public class CircuitAssemblerRecipes implements Runnable { for (int metaid = 0; metaid < rodMaterials.length; metaid++) { GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2), - rodMaterials[metaid]) - .itemOutputs(getModItem(Forestry.modID, "thermionicTubes", 4L, metaid)) - .fluidInputs(Materials.Glass.getMolten(576)).noFluidOutputs().duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1), + GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Gold, 2), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 2), + rodMaterials[metaid]) + .itemOutputs(getModItem(Forestry.modID, "thermionicTubes", 4L, metaid)) + .fluidInputs(Materials.Glass.getMolten(576)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); } for (Materials tMat : solderingMats) { @@ -227,52 +275,64 @@ public class CircuitAssemblerRecipes implements Runnable { : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Coated_Basic.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Primitive, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 0)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)).noFluidOutputs().duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Coated_Basic.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Primitive, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 0)) + .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Coated_Basic.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 1)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)).noFluidOutputs().duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Coated_Basic.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 1)) + .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Phenolic_Good.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 2)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)).noFluidOutputs().duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Phenolic_Good.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 2)) + .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Phenolic_Good.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 3)) - .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)).noFluidOutputs().duration(10 * SECONDS) - .eut((int) TierEU.RECIPE_LV).addTo(sCircuitAssemblerRecipes); + .itemInputs( + ItemList.Circuit_Board_Phenolic_Good.get(1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Forestry.modID, "chipsets", 1L, 3)) + .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut((int) TierEU.RECIPE_LV) + .addTo(sCircuitAssemblerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java index b0416a0ba1..ed86b3dd8b 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java @@ -23,61 +23,131 @@ public class CompressorRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(getModItem(GTPlusPlus.modID, "blockRainforestOakSapling", 8, 0)) - .itemOutputs(ItemList.IC2_Plantball.get(1)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(2).addTo(sCompressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Compressed_Coal_Chunk.get(1)) - .itemOutputs(ItemList.IC2_Industrial_Diamond.get(1)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1)) - .itemOutputs(GT_ModHandler.getIC2Item("Uran238", 1)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1)) - .itemOutputs(GT_ModHandler.getIC2Item("Uran235", 1)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1)) - .itemOutputs(GT_ModHandler.getIC2Item("Plutonium", 1)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium235, 1)) - .itemOutputs(GT_ModHandler.getIC2Item("smallUran235", 1)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1)) - .itemOutputs(GT_ModHandler.getIC2Item("smallPlutonium", 1)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.ice, 2, 32767)) - .itemOutputs(new ItemStack(Blocks.packed_ice, 1, 0)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1)) - .itemOutputs(new ItemStack(Blocks.ice, 1, 0)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(2).addTo(sCompressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 4)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockQuartz", 1)).noFluidInputs() - .noFluidOutputs().duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 10)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockQuartz", 1)).noFluidInputs() - .noFluidOutputs().duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 11)) - .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 0)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 12)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockFluix", 1)).noFluidInputs() - .noFluidOutputs().duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.quartz, 4, 0)) - .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 0)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(GTPlusPlus.modID, "blockRainforestOakSapling", 8, 0)) + .itemOutputs(ItemList.IC2_Plantball.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Compressed_Coal_Chunk.get(1)) + .itemOutputs(ItemList.IC2_Industrial_Diamond.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1)) + .itemOutputs(GT_ModHandler.getIC2Item("Uran238", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium235, 1)) + .itemOutputs(GT_ModHandler.getIC2Item("Uran235", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1)) + .itemOutputs(GT_ModHandler.getIC2Item("Plutonium", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium235, 1)) + .itemOutputs(GT_ModHandler.getIC2Item("smallUran235", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1)) + .itemOutputs(GT_ModHandler.getIC2Item("smallPlutonium", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.ice, 2, 32767)) + .itemOutputs(new ItemStack(Blocks.packed_ice, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1)) + .itemOutputs(new ItemStack(Blocks.ice, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.CertusQuartz, 4)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockQuartz", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 10)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockQuartz", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 11)) + .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 12)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "tile.BlockFluix", 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.quartz, 4, 0)) + .itemOutputs(new ItemStack(Blocks.quartz_block, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); /* * GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Items.wheat, 9, 0) ) .itemOutputs( new @@ -85,18 +155,33 @@ public class CompressorRecipes implements Runnable { * .addTo(sCompressorRecipes); */ - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 4)) - .itemOutputs(new ItemStack(Blocks.glowstone, 1)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(2).addTo(sCompressorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Fireclay.getDust(1)) - .itemOutputs(ItemList.CompressedFireclay.get(1)).noFluidInputs().noFluidOutputs().duration(4 * SECONDS) - .eut(4).addTo(sCompressorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 4)) + .itemOutputs(new ItemStack(Blocks.glowstone, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Fireclay.getDust(1)) + .itemOutputs(ItemList.CompressedFireclay.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(4 * SECONDS) + .eut(4) + .addTo(sCompressorRecipes); if (Railcraft.isModLoaded()) { - GT_Values.RA.stdBuilder().itemInputs(RailcraftToolItems.getCoalCoke(9)) - .itemOutputs(EnumCube.COKE_BLOCK.getItem()).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(2).addTo(sCompressorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(RailcraftToolItems.getCoalCoke(9)) + .itemOutputs(EnumCube.COKE_BLOCK.getItem()) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java index 7d9555b1eb..28f66b8179 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java @@ -128,29 +128,41 @@ public class CropProcessingRecipes implements Runnable { return; if (GT_Mod.gregtechproxy.mNerfedCrops) { FluidStack fluidOutputChemReactor = aMaterialOut.mOreByProducts.isEmpty() ? null - : aMaterialOut.mOreByProducts.get(0).getMolten(144); + : aMaterialOut.mOreByProducts.get(0) + .getMolten(144); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(9, tCrop), - GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4)) - .fluidInputs(Materials.Water.getFluid(1000)).fluidOutputs(fluidOutputChemReactor) - .duration(4 * SECONDS + 16 * TICKS).eut(24).addTo(UniversalChemical); + .itemInputs( + GT_Utility.copyAmount(9, tCrop), + GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(fluidOutputChemReactor) + .duration(4 * SECONDS + 16 * TICKS) + .eut(24) + .addTo(UniversalChemical); GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.copyAmount(16, tCrop), - GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1)) - .fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10)))) - .noFluidOutputs().duration((int) (aMaterial.getMass() * 128)).eut(384).addTo(sAutoclaveRecipes); + .itemInputs( + GT_Utility.copyAmount(16, tCrop), + GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 1)) + .fluidInputs(Materials.UUMatter.getFluid(Math.max(1, ((aMaterial.getMass() + 9) / 10)))) + .noFluidOutputs() + .duration((int) (aMaterial.getMass() * 128)) + .eut(384) + .addTo(sAutoclaveRecipes); } else { if (aMainOutput) { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.copyAmount(9, tCrop)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1)).noFluidInputs() - .noFluidOutputs().duration(15 * SECONDS).eut(2).addTo(sExtractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(9, tCrop)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sExtractorRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java index b8c66d638e..0461e331da 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java @@ -242,29 +242,62 @@ public class CuttingRecipes implements Runnable { public void recipeWithClassicFluids(ItemStack[] inputs, ItemStack[] outputs, int duration, long eut, boolean cleanroomRequired) { if (cleanroomRequired) { - GT_Values.RA.stdBuilder().itemInputs(inputs).itemOutputs(outputs) - .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, duration * eut / 320)))) - .noFluidOutputs().duration(2 * duration).eut(eut).requiresCleanRoom().addTo(sCutterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(inputs).itemOutputs(outputs) - .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, duration * eut / 426)))) - .noFluidOutputs().duration(2 * duration).eut(eut).requiresCleanRoom().addTo(sCutterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(inputs).itemOutputs(outputs) - .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, duration * eut / 1280)))) - .noFluidOutputs().duration(duration).eut(eut).requiresCleanRoom().addTo(sCutterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(inputs) + .itemOutputs(outputs) + .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, duration * eut / 320)))) + .noFluidOutputs() + .duration(2 * duration) + .eut(eut) + .requiresCleanRoom() + .addTo(sCutterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(inputs) + .itemOutputs(outputs) + .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, duration * eut / 426)))) + .noFluidOutputs() + .duration(2 * duration) + .eut(eut) + .requiresCleanRoom() + .addTo(sCutterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(inputs) + .itemOutputs(outputs) + .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, duration * eut / 1280)))) + .noFluidOutputs() + .duration(duration) + .eut(eut) + .requiresCleanRoom() + .addTo(sCutterRecipes); } else { - GT_Values.RA.stdBuilder().itemInputs(inputs).itemOutputs(outputs) - .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, duration * eut / 320)))) - .noFluidOutputs().duration(2 * duration).eut(eut).addTo(sCutterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(inputs).itemOutputs(outputs) - .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, duration * eut / 426)))) - .noFluidOutputs().duration(2 * duration).eut(eut).addTo(sCutterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(inputs).itemOutputs(outputs) - .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, duration * eut / 1280)))) - .noFluidOutputs().duration(duration).eut(eut).addTo(sCutterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(inputs) + .itemOutputs(outputs) + .fluidInputs(Materials.Water.getFluid(Math.max(4, Math.min(1000, duration * eut / 320)))) + .noFluidOutputs() + .duration(2 * duration) + .eut(eut) + .addTo(sCutterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(inputs) + .itemOutputs(outputs) + .fluidInputs(GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, duration * eut / 426)))) + .noFluidOutputs() + .duration(2 * duration) + .eut(eut) + .addTo(sCutterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(inputs) + .itemOutputs(outputs) + .fluidInputs(Materials.Lubricant.getFluid(Math.max(1, Math.min(250, duration * eut / 1280)))) + .noFluidOutputs() + .duration(duration) + .eut(eut) + .addTo(sCutterRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java index bc9de6a77c..22d65e0634 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java @@ -26,345 +26,641 @@ public class DistilleryRecipes implements Runnable { distillationTowerRecipes(); universalDistillationTowerRecipes(); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.Creosote.getFluid(100L)).fluidOutputs(Materials.Lubricant.getFluid(32L)) - .duration(12 * SECONDS).eut(30).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.SeedOil.getFluid(32L)).fluidOutputs(Materials.Lubricant.getFluid(8L)) - .duration(4 * SECONDS).eut(30).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.FishOil.getFluid(32L)).fluidOutputs(Materials.Lubricant.getFluid(8L)) - .duration(4 * SECONDS).eut(30).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.Oil.getFluid(120L)).fluidOutputs(Materials.Lubricant.getFluid(60L)) - .duration(8 * SECONDS).eut(30).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.OilLight.getFluid(120L)).fluidOutputs(Materials.Lubricant.getFluid(30L)) - .duration(8 * SECONDS).eut(30).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.OilMedium.getFluid(120L)).fluidOutputs(Materials.Lubricant.getFluid(60L)) - .duration(8 * SECONDS).eut(30).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(24)).noItemOutputs() - .fluidInputs(Materials.OilHeavy.getFluid(120L)).fluidOutputs(Materials.Lubricant.getFluid(90L)) - .duration(8 * SECONDS).eut(30).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(Materials.Biomass.getFluid(40L)).fluidOutputs(Materials.Ethanol.getFluid(12L)) - .duration(16 * TICKS).eut(24).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(5)).noItemOutputs() - .fluidInputs(Materials.Biomass.getFluid(40L)).fluidOutputs(Materials.Water.getFluid(12L)) - .duration(16 * TICKS).eut(24).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(5)).noItemOutputs() - .fluidInputs(Materials.Water.getFluid(5L)).fluidOutputs(GT_ModHandler.getDistilledWater(5L)) - .duration(16 * TICKS).eut(10).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(getFluidStack("potion.potatojuice", 2)).fluidOutputs(getFluidStack("potion.vodka", 1)) - .duration(16 * TICKS).eut(16).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(getFluidStack("potion.lemonade", 2)).fluidOutputs(getFluidStack("potion.alcopops", 1)) - .duration(16 * TICKS).eut(16).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)).noItemOutputs() - .fluidInputs(Materials.OilLight.getFluid(300L)).fluidOutputs(Materials.Oil.getFluid(100L)) - .duration(16 * TICKS).eut(24).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)).noItemOutputs() - .fluidInputs(Materials.OilMedium.getFluid(200L)).fluidOutputs(Materials.Oil.getFluid(100L)) - .duration(16 * TICKS).eut(24).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)).noItemOutputs() - .fluidInputs(Materials.OilHeavy.getFluid(100L)).fluidOutputs(Materials.Oil.getFluid(100L)) - .duration(16 * TICKS).eut(24).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(MaterialsOreAlum.SluiceSand.getDust(1)) - .fluidInputs(MaterialsOreAlum.SluiceJuice.getFluid(1000)).fluidOutputs(Materials.Water.getFluid(500)) - .duration(5 * SECONDS).eut(16).addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(6)).noItemOutputs() - .fluidInputs(Materials.WoodTar.getFluid(200)) - .fluidOutputs(MaterialsKevlar.IIIDimethylbenzene.getFluid(30)).duration(16 * TICKS).eut(64) - .addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(6)).noItemOutputs() - .fluidInputs(Materials.CharcoalByproducts.getGas(200)) - .fluidOutputs(MaterialsKevlar.IIIDimethylbenzene.getFluid(20)).duration(5 * SECONDS).eut(64) - .addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(7)).noItemOutputs() - .fluidInputs(Materials.WoodTar.getFluid(200)) - .fluidOutputs(MaterialsKevlar.IVDimethylbenzene.getFluid(30)).duration(16 * TICKS).eut(64) - .addTo(sDistilleryRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(7)).noItemOutputs() - .fluidInputs(Materials.CharcoalByproducts.getGas(200)) - .fluidOutputs(MaterialsKevlar.IVDimethylbenzene.getFluid(20)).duration(5 * SECONDS).eut(64) - .addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.Creosote.getFluid(100L)) + .fluidOutputs(Materials.Lubricant.getFluid(32L)) + .duration(12 * SECONDS) + .eut(30) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.SeedOil.getFluid(32L)) + .fluidOutputs(Materials.Lubricant.getFluid(8L)) + .duration(4 * SECONDS) + .eut(30) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.FishOil.getFluid(32L)) + .fluidOutputs(Materials.Lubricant.getFluid(8L)) + .duration(4 * SECONDS) + .eut(30) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.Oil.getFluid(120L)) + .fluidOutputs(Materials.Lubricant.getFluid(60L)) + .duration(8 * SECONDS) + .eut(30) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.OilLight.getFluid(120L)) + .fluidOutputs(Materials.Lubricant.getFluid(30L)) + .duration(8 * SECONDS) + .eut(30) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.OilMedium.getFluid(120L)) + .fluidOutputs(Materials.Lubricant.getFluid(60L)) + .duration(8 * SECONDS) + .eut(30) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(24)) + .noItemOutputs() + .fluidInputs(Materials.OilHeavy.getFluid(120L)) + .fluidOutputs(Materials.Lubricant.getFluid(90L)) + .duration(8 * SECONDS) + .eut(30) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.Biomass.getFluid(40L)) + .fluidOutputs(Materials.Ethanol.getFluid(12L)) + .duration(16 * TICKS) + .eut(24) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(5)) + .noItemOutputs() + .fluidInputs(Materials.Biomass.getFluid(40L)) + .fluidOutputs(Materials.Water.getFluid(12L)) + .duration(16 * TICKS) + .eut(24) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(5)) + .noItemOutputs() + .fluidInputs(Materials.Water.getFluid(5L)) + .fluidOutputs(GT_ModHandler.getDistilledWater(5L)) + .duration(16 * TICKS) + .eut(10) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.potatojuice", 2)) + .fluidOutputs(getFluidStack("potion.vodka", 1)) + .duration(16 * TICKS) + .eut(16) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.lemonade", 2)) + .fluidOutputs(getFluidStack("potion.alcopops", 1)) + .duration(16 * TICKS) + .eut(16) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(4)) + .noItemOutputs() + .fluidInputs(Materials.OilLight.getFluid(300L)) + .fluidOutputs(Materials.Oil.getFluid(100L)) + .duration(16 * TICKS) + .eut(24) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(4)) + .noItemOutputs() + .fluidInputs(Materials.OilMedium.getFluid(200L)) + .fluidOutputs(Materials.Oil.getFluid(100L)) + .duration(16 * TICKS) + .eut(24) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(4)) + .noItemOutputs() + .fluidInputs(Materials.OilHeavy.getFluid(100L)) + .fluidOutputs(Materials.Oil.getFluid(100L)) + .duration(16 * TICKS) + .eut(24) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(MaterialsOreAlum.SluiceSand.getDust(1)) + .fluidInputs(MaterialsOreAlum.SluiceJuice.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(500)) + .duration(5 * SECONDS) + .eut(16) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(6)) + .noItemOutputs() + .fluidInputs(Materials.WoodTar.getFluid(200)) + .fluidOutputs(MaterialsKevlar.IIIDimethylbenzene.getFluid(30)) + .duration(16 * TICKS) + .eut(64) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(6)) + .noItemOutputs() + .fluidInputs(Materials.CharcoalByproducts.getGas(200)) + .fluidOutputs(MaterialsKevlar.IIIDimethylbenzene.getFluid(20)) + .duration(5 * SECONDS) + .eut(64) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(7)) + .noItemOutputs() + .fluidInputs(Materials.WoodTar.getFluid(200)) + .fluidOutputs(MaterialsKevlar.IVDimethylbenzene.getFluid(30)) + .duration(16 * TICKS) + .eut(64) + .addTo(sDistilleryRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(7)) + .noItemOutputs() + .fluidInputs(Materials.CharcoalByproducts.getGas(200)) + .fluidOutputs(MaterialsKevlar.IVDimethylbenzene.getFluid(20)) + .duration(5 * SECONDS) + .eut(64) + .addTo(sDistilleryRecipes); // (NaCl·H2O) = NaCl + H2O - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(Materials.Salt.getDust(2)) - .fluidInputs(Materials.SaltWater.getFluid(1000)).fluidOutputs(GT_ModHandler.getDistilledWater(1000)) - .duration(1 * MINUTES + 20 * SECONDS).eut(30).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(Materials.Salt.getDust(2)) + .fluidInputs(Materials.SaltWater.getFluid(1000)) + .fluidOutputs(GT_ModHandler.getDistilledWater(1000)) + .duration(1 * MINUTES + 20 * SECONDS) + .eut(30) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(ItemList.IC2_Fertilizer.get(1)) - .fluidInputs(Materials.FermentedBiomass.getFluid(1000)).fluidOutputs(Materials.AceticAcid.getFluid(25)) - .duration(1 * MINUTES + 15 * SECONDS).eut(8).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(ItemList.IC2_Fertilizer.get(1)) + .fluidInputs(Materials.FermentedBiomass.getFluid(1000)) + .fluidOutputs(Materials.AceticAcid.getFluid(25)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(8) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(ItemList.IC2_Fertilizer.get(1)) - .fluidInputs(Materials.FermentedBiomass.getFluid(1000)).fluidOutputs(Materials.Water.getFluid(375)) - .duration(1 * MINUTES + 15 * SECONDS).eut(8).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(ItemList.IC2_Fertilizer.get(1)) + .fluidInputs(Materials.FermentedBiomass.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(375)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(8) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(ItemList.IC2_Fertilizer.get(1)) - .fluidInputs(Materials.FermentedBiomass.getFluid(1000)).fluidOutputs(Materials.Ethanol.getFluid(150)) - .duration(1 * MINUTES + 15 * SECONDS).eut(8).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(ItemList.IC2_Fertilizer.get(1)) + .fluidInputs(Materials.FermentedBiomass.getFluid(1000)) + .fluidOutputs(Materials.Ethanol.getFluid(150)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(8) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(ItemList.IC2_Fertilizer.get(1)) - .fluidInputs(Materials.FermentedBiomass.getFluid(1000)).fluidOutputs(Materials.Methanol.getFluid(150)) - .duration(1 * MINUTES + 15 * SECONDS).eut(8).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(ItemList.IC2_Fertilizer.get(1)) + .fluidInputs(Materials.FermentedBiomass.getFluid(1000)) + .fluidOutputs(Materials.Methanol.getFluid(150)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(8) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(ItemList.IC2_Fertilizer.get(1)) - .fluidInputs(Materials.FermentedBiomass.getFluid(1000)).fluidOutputs(Materials.Ammonia.getGas(100)) - .duration(1 * MINUTES + 15 * SECONDS).eut(8).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(ItemList.IC2_Fertilizer.get(1)) + .fluidInputs(Materials.FermentedBiomass.getFluid(1000)) + .fluidOutputs(Materials.Ammonia.getGas(100)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(8) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(ItemList.IC2_Fertilizer.get(1)) - .fluidInputs(Materials.FermentedBiomass.getFluid(1000)) - .fluidOutputs(Materials.CarbonDioxide.getGas(400)).duration(1 * MINUTES + 15 * SECONDS).eut(8) - .addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(ItemList.IC2_Fertilizer.get(1)) + .fluidInputs(Materials.FermentedBiomass.getFluid(1000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(400)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(8) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(ItemList.IC2_Fertilizer.get(1)) - .fluidInputs(Materials.FermentedBiomass.getFluid(1000)).fluidOutputs(Materials.Methane.getGas(600)) - .duration(1 * MINUTES + 15 * SECONDS).eut(8).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(ItemList.IC2_Fertilizer.get(1)) + .fluidInputs(Materials.FermentedBiomass.getFluid(1000)) + .fluidOutputs(Materials.Methane.getGas(600)) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(8) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(ItemList.IC2_Fertilizer.get(1)) - .fluidInputs(Materials.FermentedBiomass.getFluid(1000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 1800)) - .duration(1 * MINUTES + 20 * SECONDS).eut(8).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(ItemList.IC2_Fertilizer.get(1)) + .fluidInputs(Materials.FermentedBiomass.getFluid(1000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 1800)) + .duration(1 * MINUTES + 20 * SECONDS) + .eut(8) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.Methane.getGas(1000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 3000)).duration(8 * SECONDS).eut(8) - .addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Methane.getGas(1000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 3000)) + .duration(8 * SECONDS) + .eut(8) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)).noItemOutputs() - .fluidInputs(Materials.HeavyFuel.getFluid(100)).fluidOutputs(Materials.Benzene.getFluid(40)) - .duration(8 * SECONDS).eut(24).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs(Materials.HeavyFuel.getFluid(100)) + .fluidOutputs(Materials.Benzene.getFluid(40)) + .duration(8 * SECONDS) + .eut(24) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(3)).noItemOutputs() - .fluidInputs(Materials.HeavyFuel.getFluid(100)).fluidOutputs(Materials.Phenol.getFluid(25)) - .duration(8 * SECONDS).eut(24).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(3)) + .noItemOutputs() + .fluidInputs(Materials.HeavyFuel.getFluid(100)) + .fluidOutputs(Materials.Phenol.getFluid(25)) + .duration(8 * SECONDS) + .eut(24) + .addTo(sDistilleryRecipes); // Dimethylbenzene - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(5)).noItemOutputs() - .fluidInputs(Materials.WoodTar.getFluid(200)).fluidOutputs(Materials.Dimethylbenzene.getFluid(30)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(5)) + .noItemOutputs() + .fluidInputs(Materials.WoodTar.getFluid(200)) + .fluidOutputs(Materials.Dimethylbenzene.getFluid(30)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(5)).noItemOutputs() - .fluidInputs(Materials.CharcoalByproducts.getGas(200)) - .fluidOutputs(Materials.Dimethylbenzene.getFluid(20)).duration(5 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(5)) + .noItemOutputs() + .fluidInputs(Materials.CharcoalByproducts.getGas(200)) + .fluidOutputs(Materials.Dimethylbenzene.getFluid(20)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(new FluidStack(ItemList.sOilExtraHeavy, 10)).fluidOutputs(Materials.OilHeavy.getFluid(15)) - .duration(16 * TICKS).eut(24).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(new FluidStack(ItemList.sOilExtraHeavy, 10)) + .fluidOutputs(Materials.OilHeavy.getFluid(15)) + .duration(16 * TICKS) + .eut(24) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(Materials.HeavyFuel.getFluid(10L)).fluidOutputs(new FluidStack(ItemList.sToluene, 4)) - .duration(16 * TICKS).eut(24).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.HeavyFuel.getFluid(10L)) + .fluidOutputs(new FluidStack(ItemList.sToluene, 4)) + .duration(16 * TICKS) + .eut(24) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(new FluidStack(ItemList.sToluene, 30)).fluidOutputs(Materials.LightFuel.getFluid(30L)) - .duration(16 * TICKS).eut(24).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(new FluidStack(ItemList.sToluene, 30)) + .fluidOutputs(Materials.LightFuel.getFluid(30L)) + .duration(16 * TICKS) + .eut(24) + .addTo(sDistilleryRecipes); if (TinkerConstruct.isModLoaded()) { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(Materials.Glue.getFluid(8L)).fluidOutputs(getFluidStack("glue", 8)).duration(1 * TICKS) - .eut(24).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.Glue.getFluid(8L)) + .fluidOutputs(getFluidStack("glue", 8)) + .duration(1 * TICKS) + .eut(24) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(getFluidStack("glue", 8)).fluidOutputs(Materials.Glue.getFluid(4L)).duration(1 * TICKS) - .eut(24).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(getFluidStack("glue", 8)) + .fluidOutputs(Materials.Glue.getFluid(4L)) + .duration(1 * TICKS) + .eut(24) + .addTo(sDistilleryRecipes); } if (!GregTech_API.mIC2Classic) { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 20)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 32)).duration(2 * SECONDS).eut(16) - .addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 20)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 32)) + .duration(2 * SECONDS) + .eut(16) + .addTo(sDistilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)).noItemOutputs() - .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 4)) - .fluidOutputs(Materials.Water.getFluid(2)).duration(4 * SECONDS).eut(30).addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 4)) + .fluidOutputs(Materials.Water.getFluid(2)) + .duration(4 * SECONDS) + .eut(30) + .addTo(sDistilleryRecipes); } } public void distillationTowerRecipes() { - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.Creosote.getFluid(1000L)) - .fluidOutputs(Materials.Lubricant.getFluid(500L)).duration(20 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.SeedOil.getFluid(1400L)) - .fluidOutputs(Materials.Lubricant.getFluid(500L)).duration(20 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.FishOil.getFluid(1200L)) - .fluidOutputs(Materials.Lubricant.getFluid(500L)).duration(20 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs() - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)) - .fluidInputs(Materials.Biomass.getFluid(1000L)) - .fluidOutputs(Materials.Ethanol.getFluid(600L), Materials.Water.getFluid(300L)) - .duration(1 * SECONDS + 12 * TICKS).eut(400).addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.Water.getFluid(1000L)) - .fluidOutputs(GT_ModHandler.getDistilledWater(1000L)).duration(1 * SECONDS + 12 * TICKS) - .eut(TierEU.RECIPE_MV).addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.OilLight.getFluid(1000L)) - .fluidOutputs(Materials.Lubricant.getFluid(250L)).duration(20 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.OilMedium.getFluid(1000L)) - .fluidOutputs(Materials.Lubricant.getFluid(500L)).duration(20 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.OilHeavy.getFluid(1000L)) - .fluidOutputs(Materials.Lubricant.getFluid(750L)).duration(20 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sDistillationRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Creosote.getFluid(1000L)) + .fluidOutputs(Materials.Lubricant.getFluid(500L)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.SeedOil.getFluid(1400L)) + .fluidOutputs(Materials.Lubricant.getFluid(500L)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.FishOil.getFluid(1200L)) + .fluidOutputs(Materials.Lubricant.getFluid(500L)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)) + .fluidInputs(Materials.Biomass.getFluid(1000L)) + .fluidOutputs(Materials.Ethanol.getFluid(600L), Materials.Water.getFluid(300L)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(400) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Water.getFluid(1000L)) + .fluidOutputs(GT_ModHandler.getDistilledWater(1000L)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.OilLight.getFluid(1000L)) + .fluidOutputs(Materials.Lubricant.getFluid(250L)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.OilMedium.getFluid(1000L)) + .fluidOutputs(Materials.Lubricant.getFluid(500L)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.OilHeavy.getFluid(1000L)) + .fluidOutputs(Materials.Lubricant.getFluid(750L)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sDistillationRecipes); // C15H10N2O2(5HCl) = C15H10N2O2 + 5HCl - GT_Values.RA.stdBuilder().noItemInputs() - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.DiphenylmethaneDiisocyanate, 29L)) - .fluidInputs(MaterialsKevlar.DiphenylmethaneDiisocyanateMixture.getFluid(1000L)) - .fluidOutputs(Materials.HydrochloricAcid.getFluid(5000L)).duration(2 * MINUTES + 5 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(Materials.Charcoal.getDustSmall(1)) - .fluidInputs(Materials.CharcoalByproducts.getGas(1000)) - .fluidOutputs( - Materials.WoodTar.getFluid(250), - Materials.WoodVinegar.getFluid(400), - Materials.WoodGas.getGas(250), - MaterialsKevlar.IIIDimethylbenzene.getFluid(100)) - .duration(2 * SECONDS).eut(256).addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(GT_Values.NI).fluidInputs(Materials.WoodTar.getFluid(1000)) - .fluidOutputs( - Materials.Creosote.getFluid(250), - Materials.Phenol.getFluid(100), - Materials.Benzene.getFluid(400), - Materials.Toluene.getFluid(100), - MaterialsKevlar.IIIDimethylbenzene.getFluid(150)) - .duration(2 * SECONDS).eut(256).addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(Materials.Charcoal.getDustSmall(1)) - .fluidInputs(Materials.CharcoalByproducts.getGas(1000)) - .fluidOutputs( - Materials.WoodTar.getFluid(250), - Materials.WoodVinegar.getFluid(400), - Materials.WoodGas.getGas(250), - MaterialsKevlar.IVDimethylbenzene.getFluid(100)) - .duration(2 * SECONDS).eut(256).addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(Materials.Charcoal.getDustSmall(1)) - .fluidInputs(Materials.CharcoalByproducts.getGas(1000)) - .fluidOutputs( - Materials.WoodTar.getFluid(250), - Materials.WoodVinegar.getFluid(400), - Materials.WoodGas.getGas(250), - Materials.Dimethylbenzene.getFluid(20), - MaterialsKevlar.IIIDimethylbenzene.getFluid(60), - MaterialsKevlar.IVDimethylbenzene.getFluid(20)) - .duration(2 * SECONDS).eut(256).addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(GT_Values.NI).fluidInputs(Materials.WoodTar.getFluid(1000)) - .fluidOutputs( - Materials.Creosote.getFluid(250), - Materials.Phenol.getFluid(100), - Materials.Benzene.getFluid(400), - Materials.Toluene.getFluid(100), - Materials.Dimethylbenzene.getFluid(30), - MaterialsKevlar.IIIDimethylbenzene.getFluid(90), - MaterialsKevlar.IVDimethylbenzene.getFluid(30)) - .duration(2 * SECONDS).eut(256).addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.OilLight.getFluid(1500)) - .fluidOutputs( - Materials.SulfuricHeavyFuel.getFluid(100), - Materials.SulfuricLightFuel.getFluid(200), - Materials.SulfuricNaphtha.getFluid(300), - MaterialsKevlar.NaphthenicAcid.getFluid(25), - Materials.SulfuricGas.getGas(2400)) - .duration(1 * SECONDS + 12 * TICKS).eut(TierEU.RECIPE_HV).addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.OilMedium.getFluid(1000)) - .fluidOutputs( - Materials.SulfuricHeavyFuel.getFluid(100), - Materials.SulfuricLightFuel.getFluid(500), - Materials.SulfuricNaphtha.getFluid(1500), - MaterialsKevlar.NaphthenicAcid.getFluid(25), - Materials.SulfuricGas.getGas(600)) - .duration(1 * SECONDS + 12 * TICKS).eut(TierEU.RECIPE_HV).addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.Oil.getFluid(500L)) - .fluidOutputs( - Materials.SulfuricHeavyFuel.getFluid(150), - Materials.SulfuricLightFuel.getFluid(500), - Materials.SulfuricNaphtha.getFluid(200), - MaterialsKevlar.NaphthenicAcid.getFluid(25), - Materials.SulfuricGas.getGas(600)) - .duration(1 * SECONDS + 12 * TICKS).eut(TierEU.RECIPE_HV).addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.OilHeavy.getFluid(1000)) - .fluidOutputs( - Materials.SulfuricHeavyFuel.getFluid(2500), - Materials.SulfuricLightFuel.getFluid(450), - Materials.SulfuricNaphtha.getFluid(150), - MaterialsKevlar.NaphthenicAcid.getFluid(50), - Materials.SulfuricGas.getGas(600)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sDistillationRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs( + GT_OreDictUnificator.get( + OrePrefixes.dust, + MaterialsKevlar.DiphenylmethaneDiisocyanate, + 29L)) + .fluidInputs(MaterialsKevlar.DiphenylmethaneDiisocyanateMixture.getFluid(1000L)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(5000L)) + .duration(2 * MINUTES + 5 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(Materials.Charcoal.getDustSmall(1)) + .fluidInputs(Materials.CharcoalByproducts.getGas(1000)) + .fluidOutputs( + Materials.WoodTar.getFluid(250), + Materials.WoodVinegar.getFluid(400), + Materials.WoodGas.getGas(250), + MaterialsKevlar.IIIDimethylbenzene.getFluid(100)) + .duration(2 * SECONDS) + .eut(256) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(GT_Values.NI) + .fluidInputs(Materials.WoodTar.getFluid(1000)) + .fluidOutputs( + Materials.Creosote.getFluid(250), + Materials.Phenol.getFluid(100), + Materials.Benzene.getFluid(400), + Materials.Toluene.getFluid(100), + MaterialsKevlar.IIIDimethylbenzene.getFluid(150)) + .duration(2 * SECONDS) + .eut(256) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(Materials.Charcoal.getDustSmall(1)) + .fluidInputs(Materials.CharcoalByproducts.getGas(1000)) + .fluidOutputs( + Materials.WoodTar.getFluid(250), + Materials.WoodVinegar.getFluid(400), + Materials.WoodGas.getGas(250), + MaterialsKevlar.IVDimethylbenzene.getFluid(100)) + .duration(2 * SECONDS) + .eut(256) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(Materials.Charcoal.getDustSmall(1)) + .fluidInputs(Materials.CharcoalByproducts.getGas(1000)) + .fluidOutputs( + Materials.WoodTar.getFluid(250), + Materials.WoodVinegar.getFluid(400), + Materials.WoodGas.getGas(250), + Materials.Dimethylbenzene.getFluid(20), + MaterialsKevlar.IIIDimethylbenzene.getFluid(60), + MaterialsKevlar.IVDimethylbenzene.getFluid(20)) + .duration(2 * SECONDS) + .eut(256) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(GT_Values.NI) + .fluidInputs(Materials.WoodTar.getFluid(1000)) + .fluidOutputs( + Materials.Creosote.getFluid(250), + Materials.Phenol.getFluid(100), + Materials.Benzene.getFluid(400), + Materials.Toluene.getFluid(100), + Materials.Dimethylbenzene.getFluid(30), + MaterialsKevlar.IIIDimethylbenzene.getFluid(90), + MaterialsKevlar.IVDimethylbenzene.getFluid(30)) + .duration(2 * SECONDS) + .eut(256) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.OilLight.getFluid(1500)) + .fluidOutputs( + Materials.SulfuricHeavyFuel.getFluid(100), + Materials.SulfuricLightFuel.getFluid(200), + Materials.SulfuricNaphtha.getFluid(300), + MaterialsKevlar.NaphthenicAcid.getFluid(25), + Materials.SulfuricGas.getGas(2400)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.OilMedium.getFluid(1000)) + .fluidOutputs( + Materials.SulfuricHeavyFuel.getFluid(100), + Materials.SulfuricLightFuel.getFluid(500), + Materials.SulfuricNaphtha.getFluid(1500), + MaterialsKevlar.NaphthenicAcid.getFluid(25), + Materials.SulfuricGas.getGas(600)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Oil.getFluid(500L)) + .fluidOutputs( + Materials.SulfuricHeavyFuel.getFluid(150), + Materials.SulfuricLightFuel.getFluid(500), + Materials.SulfuricNaphtha.getFluid(200), + MaterialsKevlar.NaphthenicAcid.getFluid(25), + Materials.SulfuricGas.getGas(600)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.OilHeavy.getFluid(1000)) + .fluidOutputs( + Materials.SulfuricHeavyFuel.getFluid(2500), + Materials.SulfuricLightFuel.getFluid(450), + Materials.SulfuricNaphtha.getFluid(150), + MaterialsKevlar.NaphthenicAcid.getFluid(50), + Materials.SulfuricGas.getGas(600)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sDistillationRecipes); // 9C5H12O = 4C6H14O + 5CH4O + 4C4H8 - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.MTBEMixture.getGas(900L)) - .fluidOutputs( - Materials.AntiKnock.getFluid(400L), - Materials.Methanol.getFluid(500L), - Materials.Butene.getGas(400L)) - .duration(2 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sDistillationRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(ItemList.IC2_Fertilizer.get(1)) - .fluidInputs(Materials.FermentedBiomass.getFluid(1000)) - .fluidOutputs( - Materials.AceticAcid.getFluid(25), - Materials.Water.getFluid(375), - Materials.Ethanol.getFluid(150), - Materials.Methanol.getFluid(150), - Materials.Ammonia.getGas(100), - Materials.CarbonDioxide.getGas(400), - Materials.Methane.getGas(600)) - .duration(3 * SECONDS + 15 * TICKS).eut(TierEU.RECIPE_MV).addTo(sDistillationRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.MTBEMixture.getGas(900L)) + .fluidOutputs( + Materials.AntiKnock.getFluid(400L), + Materials.Methanol.getFluid(500L), + Materials.Butene.getGas(400L)) + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sDistillationRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(ItemList.IC2_Fertilizer.get(1)) + .fluidInputs(Materials.FermentedBiomass.getFluid(1000)) + .fluidOutputs( + Materials.AceticAcid.getFluid(25), + Materials.Water.getFluid(375), + Materials.Ethanol.getFluid(150), + Materials.Methanol.getFluid(150), + Materials.Ammonia.getGas(100), + Materials.CarbonDioxide.getGas(400), + Materials.Methane.getGas(600)) + .duration(3 * SECONDS + 15 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sDistillationRecipes); if (!GregTech_API.mIC2Classic) { - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(ItemList.IC2_Fertilizer.get(1)) - .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 3000)) - .fluidOutputs( - new FluidStack(FluidRegistry.getFluid("ic2biogas"), 8000), - Materials.Water.getFluid(125L)) - .duration(12 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV).addTo(sDistillationRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(ItemList.IC2_Fertilizer.get(1)) + .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 3000)) + .fluidOutputs( + new FluidStack(FluidRegistry.getFluid("ic2biogas"), 8000), + Materials.Water.getFluid(125L)) + .duration(12 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sDistillationRecipes); } } @@ -980,32 +1276,59 @@ public class DistilleryRecipes implements Runnable { public void addUniversalDistillationRecipewithCircuit(FluidStack aInput, ItemStack[] aCircuit, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt) { for (int i = 0; i < Math.min(aOutputs.length, 11); i++) { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(i + 1)).itemOutputs(aOutput2) - .fluidInputs(aInput).fluidOutputs(aOutputs[i]).duration(2 * aDuration).eut(aEUt / 4) - .addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)) + .itemOutputs(aOutput2) + .fluidInputs(aInput) + .fluidOutputs(aOutputs[i]) + .duration(2 * aDuration) + .eut(aEUt / 4) + .addTo(sDistilleryRecipes); } - GT_Values.RA.stdBuilder().itemInputs(aCircuit).itemOutputs(aOutput2).fluidInputs(aInput).fluidOutputs(aOutputs) - .duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sDistillationRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(aCircuit) + .itemOutputs(aOutput2) + .fluidInputs(aInput) + .fluidOutputs(aOutputs) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sDistillationRecipes); } public void addUniversalDistillationRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt) { if (aOutput2 == null) { for (int i = 0; i < Math.min(aOutputs.length, 11); i++) { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(i + 1)).noItemOutputs() - .fluidInputs(aInput).fluidOutputs(aOutputs[i]).duration(2 * aDuration).eut(aEUt / 4) - .addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)) + .noItemOutputs() + .fluidInputs(aInput) + .fluidOutputs(aOutputs[i]) + .duration(2 * aDuration) + .eut(aEUt / 4) + .addTo(sDistilleryRecipes); } } else { for (int i = 0; i < Math.min(aOutputs.length, 11); i++) { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(i + 1)).itemOutputs(aOutput2) - .fluidInputs(aInput).fluidOutputs(aOutputs[i]).duration(2 * aDuration).eut(aEUt / 4) - .addTo(sDistilleryRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)) + .itemOutputs(aOutput2) + .fluidInputs(aInput) + .fluidOutputs(aOutputs[i]) + .duration(2 * aDuration) + .eut(aEUt / 4) + .addTo(sDistilleryRecipes); } } - GT_Values.RA.stdBuilder().noItemInputs().itemOutputs(aOutput2).fluidInputs(aInput).fluidOutputs(aOutputs) - .duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sDistillationRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs(aOutput2) + .fluidInputs(aInput) + .fluidOutputs(aOutputs) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sDistillationRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java index 2110c49d20..a16edda7f0 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java @@ -24,185 +24,308 @@ public class ElectrolyzerRecipes implements Runnable { public void run() { // H2O = 2H + O - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1), ItemList.Cell_Empty.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)) - .fluidInputs(Materials.Water.getFluid(1000L)).fluidOutputs(Materials.Hydrogen.getGas(2000L)) - .duration(1 * MINUTES + 40 * SECONDS).eut(30).addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1), ItemList.Cell_Empty.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)) + .fluidInputs(Materials.Water.getFluid(1000L)) + .fluidOutputs(Materials.Hydrogen.getGas(2000L)) + .duration(1 * MINUTES + 40 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2), ItemList.Cell_Empty.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)) - .fluidInputs(GT_ModHandler.getDistilledWater(1000L)).fluidOutputs(Materials.Hydrogen.getGas(2000L)) - .duration(1 * MINUTES + 40 * SECONDS).eut(30).addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2), ItemList.Cell_Empty.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)) + .fluidInputs(GT_ModHandler.getDistilledWater(1000L)) + .fluidOutputs(Materials.Hydrogen.getGas(2000L)) + .duration(1 * MINUTES + 40 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(3), ItemList.Cell_Empty.get(2L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L)) - .fluidInputs(Materials.Water.getFluid(1000L)).fluidOutputs(Materials.Oxygen.getGas(1000L)) - .duration(1 * MINUTES + 40 * SECONDS).eut(30).addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(3), ItemList.Cell_Empty.get(2L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L)) + .fluidInputs(Materials.Water.getFluid(1000L)) + .fluidOutputs(Materials.Oxygen.getGas(1000L)) + .duration(1 * MINUTES + 40 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4), ItemList.Cell_Empty.get(2L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L)) - .fluidInputs(GT_ModHandler.getDistilledWater(1000L)).fluidOutputs(Materials.Oxygen.getGas(1000L)) - .duration(1 * MINUTES + 40 * SECONDS).eut(30).addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(4), ItemList.Cell_Empty.get(2L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L)) + .fluidInputs(GT_ModHandler.getDistilledWater(1000L)) + .fluidOutputs(Materials.Oxygen.getGas(1000L)) + .duration(1 * MINUTES + 40 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("electrolyzedWaterCell", 1L), ItemList.Cell_Empty.get(2L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)) - .noFluidInputs().noFluidOutputs().duration(1 * SECONDS + 10 * TICKS).eut(30) - .addTo(sElectrolyzerRecipes); + .itemInputs(GT_ModHandler.getIC2Item("electrolyzedWaterCell", 1L), ItemList.Cell_Empty.get(2L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2L), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 10 * TICKS) + .eut(30) + .addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("electrolyzedWaterCell", 1L), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)).noFluidInputs() - .fluidOutputs(Materials.Hydrogen.getGas(2000L)).duration(1 * SECONDS + 10 * TICKS).eut(30) - .addTo(sElectrolyzerRecipes); + .itemInputs( + GT_ModHandler.getIC2Item("electrolyzedWaterCell", 1L), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)) + .noFluidInputs() + .fluidOutputs(Materials.Hydrogen.getGas(2000L)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(30) + .addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L), ItemList.Cell_Empty.get(0)) - .itemOutputs(GT_ModHandler.getIC2Item("electrolyzedWaterCell", 1L)).noFluidInputs().noFluidOutputs() - .duration(1 * MINUTES + 13 * SECONDS + 10 * TICKS).eut(30).addTo(sElectrolyzerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L), + ItemList.Cell_Empty.get(0)) + .itemOutputs(GT_ModHandler.getIC2Item("electrolyzedWaterCell", 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 13 * SECONDS + 10 * TICKS) + .eut(30) + .addTo(sElectrolyzerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Dye_Bonemeal.get(3L), ItemList.Cell_Empty.get(0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L)).noFluidInputs() - .noFluidOutputs().duration(4 * SECONDS + 18 * TICKS).eut(26).addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Dye_Bonemeal.get(3L), ItemList.Cell_Empty.get(0)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(4 * SECONDS + 18 * TICKS) + .eut(26) + .addTo(sElectrolyzerRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.sand, 8, 0), ItemList.Cell_Empty.get(0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L)).noFluidInputs() - .noFluidOutputs().duration(25 * SECONDS).eut(25).addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.sand, 8, 0), ItemList.Cell_Empty.get(0)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L)) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(25) + .addTo(sElectrolyzerRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.sand, 8, 1), ItemList.Cell_Empty.get(0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L)).noFluidInputs() - .noFluidOutputs().duration(25 * SECONDS).eut(25).addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.sand, 8, 1), ItemList.Cell_Empty.get(0)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L)) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(25) + .addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1), - ItemList.Cell_Empty.get(0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 4)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(64).addTo(sElectrolyzerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 1), + ItemList.Cell_Empty.get(0)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(64) + .addTo(sElectrolyzerRecipes); // ZnS = Zn + S + 1 Ga(9.17%) - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sphalerite, 2)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1)) - .outputChances(new int[] { 10000, 10000, 917 }).noFluidInputs().noFluidOutputs().duration(10 * SECONDS) - .eut(30).addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sphalerite, 2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1)) + .outputChances(new int[] { 10000, 10000, 917 }) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); // IC2 Fertilizer = H2O + CaCO3 + C - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Fertilizer.get(1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L)) - .noFluidInputs().fluidOutputs(Materials.Water.getFluid(1000L)).duration(5 * SECONDS).eut(30) - .addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Fertilizer.get(1L)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1L)) + .noFluidInputs() + .fluidOutputs(Materials.Water.getFluid(1000L)) + .duration(5 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); // NaOH = Na + O + H - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumHydroxide.getDust(3), Materials.Empty.getCells(1)) - .itemOutputs(Materials.Sodium.getDust(1), Materials.Hydrogen.getCells(1)) - .outputChances(new int[] { 10000, 10000 }).noFluidInputs().fluidOutputs(Materials.Oxygen.getGas(1000)) - .duration(50 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumHydroxide.getDust(3), Materials.Empty.getCells(1)) + .itemOutputs(Materials.Sodium.getDust(1), Materials.Hydrogen.getCells(1)) + .outputChances(new int[] { 10000, 10000 }) + .noFluidInputs() + .fluidOutputs(Materials.Oxygen.getGas(1000)) + .duration(50 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sElectrolyzerRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Carbon.getDust(1)).fluidInputs(Materials.CarbonDioxide.getGas(1000)) - .fluidOutputs(Materials.Oxygen.getGas(2000)).duration(15 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Carbon.getDust(1)) + .fluidInputs(Materials.CarbonDioxide.getGas(1000)) + .fluidOutputs(Materials.Oxygen.getGas(2000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sElectrolyzerRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(11), Materials.Empty.getCells(2)) - .itemOutputs(Materials.Carbon.getDust(1), Materials.Oxygen.getCells(2)) - .fluidInputs(Materials.CarbonDioxide.getGas(1000)).noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(11), Materials.Empty.getCells(2)) + .itemOutputs(Materials.Carbon.getDust(1), Materials.Oxygen.getCells(2)) + .fluidInputs(Materials.CarbonDioxide.getGas(1000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sElectrolyzerRecipes); // SO2 = S + 2O - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Sulfur.getDust(1)).fluidInputs(Materials.SulfurDioxide.getGas(1000)) - .fluidOutputs(Materials.Oxygen.getGas(2000)).duration(15 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Sulfur.getDust(1)) + .fluidInputs(Materials.SulfurDioxide.getGas(1000)) + .fluidOutputs(Materials.Oxygen.getGas(2000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sElectrolyzerRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(11), Materials.Empty.getCells(2)) - .itemOutputs(Materials.Sulfur.getDust(1), Materials.Oxygen.getCells(2)) - .fluidInputs(Materials.SulfurDioxide.getGas(1000)).noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(11), Materials.Empty.getCells(2)) + .itemOutputs(Materials.Sulfur.getDust(1), Materials.Oxygen.getCells(2)) + .fluidInputs(Materials.SulfurDioxide.getGas(1000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sElectrolyzerRecipes); // NaCl = Na +Cl - GT_Values.RA.stdBuilder().itemInputs(Materials.Salt.getDust(2)).itemOutputs(Materials.Sodium.getDust(1)) - .noFluidInputs().fluidOutputs(Materials.Chlorine.getGas(1000)).duration(16 * SECONDS).eut(30) - .addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Salt.getDust(2)) + .itemOutputs(Materials.Sodium.getDust(1)) + .noFluidInputs() + .fluidOutputs(Materials.Chlorine.getGas(1000)) + .duration(16 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); // (NaCl·H2O)= NaOH + H - GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.SodiumHydroxide.getDust(3), Materials.Hydrogen.getCells(1)) - .fluidInputs(Materials.SaltWater.getFluid(1000)).fluidOutputs(Materials.Chlorine.getGas(1000)) - .duration(36 * SECONDS).eut(30).addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.SodiumHydroxide.getDust(3), Materials.Hydrogen.getCells(1)) + .fluidInputs(Materials.SaltWater.getFluid(1000)) + .fluidOutputs(Materials.Chlorine.getGas(1000)) + .duration(36 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.SodiumHydroxide.getDust(3), Materials.Chlorine.getCells(1)) - .fluidInputs(Materials.SaltWater.getFluid(1000)).fluidOutputs(Materials.Hydrogen.getGas(1000)) - .duration(36 * SECONDS).eut(30).addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.SodiumHydroxide.getDust(3), Materials.Chlorine.getCells(1)) + .fluidInputs(Materials.SaltWater.getFluid(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(1000)) + .duration(36 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); // HCl = H + Cl - GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Hydrogen.getCells(1)).fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) - .fluidOutputs(Materials.Chlorine.getGas(1000)).duration(36 * SECONDS).eut(30) - .addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Hydrogen.getCells(1)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(Materials.Chlorine.getGas(1000)) + .duration(36 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Chlorine.getCells(1)).fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) - .fluidOutputs(Materials.Hydrogen.getGas(1000)).duration(36 * SECONDS).eut(30) - .addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Chlorine.getCells(1)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(Materials.Hydrogen.getGas(1000)) + .duration(36 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Hydrogen.getCells(1)).noFluidInputs() - .fluidOutputs(Materials.Chlorine.getGas(1000)).duration(36 * SECONDS).eut(30) - .addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Hydrogen.getCells(1)) + .noFluidInputs() + .fluidOutputs(Materials.Chlorine.getGas(1000)) + .duration(36 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.Chlorine.getCells(1)).noFluidInputs() - .fluidOutputs(Materials.Hydrogen.getGas(1000)).duration(36 * SECONDS).eut(30) - .addTo(sElectrolyzerRecipes); + .itemInputs(Materials.HydrochloricAcid.getCells(1), GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.Chlorine.getCells(1)) + .noFluidInputs() + .fluidOutputs(Materials.Hydrogen.getGas(1000)) + .duration(36 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); // 2NaHSO4 = 2H + Na2S2O8 - GT_Values.RA.stdBuilder().itemInputs(Materials.SodiumBisulfate.getDust(14), Materials.Empty.getCells(2)) - .itemOutputs(Materials.Hydrogen.getCells(2)).noFluidInputs() - .fluidOutputs(Materials.SodiumPersulfate.getFluid(1000)).duration(30 * SECONDS).eut(30) - .addTo(sElectrolyzerRecipes); - - GT_Values.RA.stdBuilder().noItemInputs() - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lead, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 4)) - .fluidInputs(new FluidStack(ItemList.sLeadZincSolution, 8000)) - .fluidOutputs(Materials.Water.getFluid(2000)).duration(15 * SECONDS).eut(192) - .addTo(sElectrolyzerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Cell_Empty.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1)) - .fluidInputs(new FluidStack(ItemList.sBlueVitriol, 2000)) - .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)).duration(45 * SECONDS).eut(30) - .addTo(sElectrolyzerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Cell_Empty.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1)) - .fluidInputs(new FluidStack(ItemList.sNickelSulfate, 2000)) - .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)).duration(45 * SECONDS).eut(30) - .addTo(sElectrolyzerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Cell_Empty.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1)) - .fluidInputs(new FluidStack(ItemList.sGreenVitriol, 2000)) - .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)).duration(45 * SECONDS).eut(30) - .addTo(sElectrolyzerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.SodiumBisulfate.getDust(14), Materials.Empty.getCells(2)) + .itemOutputs(Materials.Hydrogen.getCells(2)) + .noFluidInputs() + .fluidOutputs(Materials.SodiumPersulfate.getFluid(1000)) + .duration(30 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lead, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 4)) + .fluidInputs(new FluidStack(ItemList.sLeadZincSolution, 8000)) + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(15 * SECONDS) + .eut(192) + .addTo(sElectrolyzerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Cell_Empty.get(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1)) + .fluidInputs(new FluidStack(ItemList.sBlueVitriol, 2000)) + .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) + .duration(45 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Cell_Empty.get(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1)) + .fluidInputs(new FluidStack(ItemList.sNickelSulfate, 2000)) + .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) + .duration(45 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Cell_Empty.get(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1)) + .fluidInputs(new FluidStack(ItemList.sGreenVitriol, 2000)) + .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) + .duration(45 * SECONDS) + .eut(30) + .addTo(sElectrolyzerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java index ee8078bd06..cb10bde54d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java @@ -11,10 +11,15 @@ public class ElectromagneticSeparatorRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(MaterialsOreAlum.SluiceSand.getDust(1)) - .itemOutputs(Materials.Iron.getDust(1), Materials.Neodymium.getDust(1), Materials.Chrome.getDust(1)) - .outputChances(4000, 2000, 2000).noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(240) - .addTo(sElectroMagneticSeparatorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(MaterialsOreAlum.SluiceSand.getDust(1)) + .itemOutputs(Materials.Iron.getDust(1), Materials.Neodymium.getDust(1), Materials.Chrome.getDust(1)) + .outputChances(4000, 2000, 2000) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(240) + .addTo(sElectroMagneticSeparatorRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java index f07af970f3..12ddbd54f1 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java @@ -38,7 +38,13 @@ public class ExtractorRecipes implements Runnable { public void addExtractionRecipe(ItemStack input, ItemStack output) { output = GT_OreDictUnificator.get(true, output); - GT_Values.RA.stdBuilder().itemInputs(input).itemOutputs(output).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(2).addTo(sExtractorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(input) + .itemOutputs(output) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sExtractorRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java index 7b021dc221..65975bc0a7 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ExtruderRecipes.java @@ -12,12 +12,22 @@ public class ExtruderRecipes implements Runnable { @Override public void run() { // wax capsule - GT_Values.RA.stdBuilder().itemInputs(ItemList.FR_Wax.get(1L), ItemList.Shape_Extruder_Cell.get(0L)) - .itemOutputs(ItemList.FR_WaxCapsule.get(1L)).noFluidInputs().noFluidOutputs() - .duration(3 * SECONDS + 4 * TICKS).eut(16).addTo(sExtruderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.FR_Wax.get(1L), ItemList.Shape_Extruder_Cell.get(0L)) + .itemOutputs(ItemList.FR_WaxCapsule.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(sExtruderRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.FR_RefractoryWax.get(1L), ItemList.Shape_Extruder_Cell.get(0L)) - .itemOutputs(ItemList.FR_WaxCapsule.get(1L)).noFluidInputs().noFluidOutputs() - .duration(6 * SECONDS + 8 * TICKS).eut(16).addTo(sExtruderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.FR_RefractoryWax.get(1L), ItemList.Shape_Extruder_Cell.get(0L)) + .itemOutputs(ItemList.FR_WaxCapsule.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(16) + .addTo(sExtruderRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java index 7cab676e0e..381fdad4a8 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java @@ -17,188 +17,401 @@ public class FermenterRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.Biomass.getFluid(100)) - .fluidOutputs(Materials.FermentedBiomass.getFluid(100)).duration(7 * SECONDS + 10 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 100)) - .fluidOutputs(Materials.FermentedBiomass.getFluid(100)).duration(7 * SECONDS + 10 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("milk", 50)) - .fluidOutputs(getFluidStack("potion.mundane", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.lemonjuice", 50)) - .fluidOutputs(getFluidStack("potion.limoncello", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.applejuice", 50)) - .fluidOutputs(getFluidStack("potion.cider", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(getFluidStack("potion.goldenapplejuice", 50)) - .fluidOutputs(getFluidStack("potion.goldencider", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(getFluidStack("potion.idunsapplejuice", 50)) - .fluidOutputs(getFluidStack("potion.notchesbrew", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.reedwater", 50)) - .fluidOutputs(getFluidStack("potion.rum", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.rum", 50)) - .fluidOutputs(getFluidStack("potion.piratebrew", 10)).duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) - .eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.grapejuice", 50)) - .fluidOutputs(getFluidStack("potion.wine", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.wine", 50)) - .fluidOutputs(getFluidStack("potion.vinegar", 10)).duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) - .eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.wheatyjuice", 50)) - .fluidOutputs(getFluidStack("potion.scotch", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.scotch", 50)) - .fluidOutputs(getFluidStack("potion.glenmckenner", 10)).duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) - .eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(getFluidStack("potion.wheatyhopsjuice", 50)).fluidOutputs(getFluidStack("potion.beer", 25)) - .duration(51 * SECONDS + 4 * TICKS).eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.hopsjuice", 50)) - .fluidOutputs(getFluidStack("potion.darkbeer", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.darkbeer", 50)) - .fluidOutputs(getFluidStack("potion.dragonblood", 10)).duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) - .eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.beer", 75)) - .fluidOutputs(getFluidStack("potion.vinegar", 50)).duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) - .eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.cider", 75)) - .fluidOutputs(getFluidStack("potion.vinegar", 50)).duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) - .eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.goldencider", 75)) - .fluidOutputs(getFluidStack("potion.vinegar", 50)).duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) - .eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.rum", 75)) - .fluidOutputs(getFluidStack("potion.vinegar", 50)).duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) - .eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.wine", 75)) - .fluidOutputs(getFluidStack("potion.vinegar", 50)).duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) - .eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.awkward", 50)) - .fluidOutputs(getFluidStack("potion.weakness", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.mundane", 50)) - .fluidOutputs(getFluidStack("potion.weakness", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.thick", 50)) - .fluidOutputs(getFluidStack("potion.weakness", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.poison", 50)) - .fluidOutputs(getFluidStack("potion.damage", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.health", 50)) - .fluidOutputs(getFluidStack("potion.damage", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.waterbreathing", 50)) - .fluidOutputs(getFluidStack("potion.damage", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.nightvision", 50)) - .fluidOutputs(getFluidStack("potion.invisibility", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.fireresistance", 50)) - .fluidOutputs(getFluidStack("potion.slowness", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.speed", 50)) - .fluidOutputs(getFluidStack("potion.slowness", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.strength", 50)) - .fluidOutputs(getFluidStack("potion.weakness", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.regen", 50)) - .fluidOutputs(getFluidStack("potion.poison", 25)).duration(51 * SECONDS + 4 * TICKS).eut(2) - .addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.poison.strong", 50)) - .fluidOutputs(getFluidStack("potion.damage.strong", 10)) - .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS).eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.health.strong", 50)) - .fluidOutputs(getFluidStack("potion.damage.strong", 10)) - .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS).eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.speed.strong", 50)) - .fluidOutputs(getFluidStack("potion.slowness.strong", 10)) - .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS).eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(getFluidStack("potion.strength.strong", 50)) - .fluidOutputs(getFluidStack("potion.weakness.strong", 10)) - .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS).eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(getFluidStack("potion.nightvision.long", 50)) - .fluidOutputs(getFluidStack("potion.invisibility.long", 10)) - .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS).eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.regen.strong", 50)) - .fluidOutputs(getFluidStack("potion.poison.strong", 10)) - .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS).eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.poison.long", 50)) - .fluidOutputs(getFluidStack("potion.damage.long", 10)).duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) - .eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(getFluidStack("potion.waterbreathing.long", 50)) - .fluidOutputs(getFluidStack("potion.damage.long", 10)).duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) - .eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(getFluidStack("potion.fireresistance.long", 50)) - .fluidOutputs(getFluidStack("potion.slowness.long", 10)) - .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS).eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.speed.long", 50)) - .fluidOutputs(getFluidStack("potion.slowness.long", 10)) - .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS).eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.strength.long", 50)) - .fluidOutputs(getFluidStack("potion.weakness.long", 10)) - .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS).eut(2).addTo(sFermentingRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(getFluidStack("potion.regen.long", 50)) - .fluidOutputs(getFluidStack("potion.poison.long", 10)).duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) - .eut(2).addTo(sFermentingRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Biomass.getFluid(100)) + .fluidOutputs(Materials.FermentedBiomass.getFluid(100)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 100)) + .fluidOutputs(Materials.FermentedBiomass.getFluid(100)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("milk", 50)) + .fluidOutputs(getFluidStack("potion.mundane", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.lemonjuice", 50)) + .fluidOutputs(getFluidStack("potion.limoncello", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.applejuice", 50)) + .fluidOutputs(getFluidStack("potion.cider", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.goldenapplejuice", 50)) + .fluidOutputs(getFluidStack("potion.goldencider", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.idunsapplejuice", 50)) + .fluidOutputs(getFluidStack("potion.notchesbrew", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.reedwater", 50)) + .fluidOutputs(getFluidStack("potion.rum", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.rum", 50)) + .fluidOutputs(getFluidStack("potion.piratebrew", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.grapejuice", 50)) + .fluidOutputs(getFluidStack("potion.wine", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.wine", 50)) + .fluidOutputs(getFluidStack("potion.vinegar", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.wheatyjuice", 50)) + .fluidOutputs(getFluidStack("potion.scotch", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.scotch", 50)) + .fluidOutputs(getFluidStack("potion.glenmckenner", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.wheatyhopsjuice", 50)) + .fluidOutputs(getFluidStack("potion.beer", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.hopsjuice", 50)) + .fluidOutputs(getFluidStack("potion.darkbeer", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.darkbeer", 50)) + .fluidOutputs(getFluidStack("potion.dragonblood", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.beer", 75)) + .fluidOutputs(getFluidStack("potion.vinegar", 50)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.cider", 75)) + .fluidOutputs(getFluidStack("potion.vinegar", 50)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.goldencider", 75)) + .fluidOutputs(getFluidStack("potion.vinegar", 50)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.rum", 75)) + .fluidOutputs(getFluidStack("potion.vinegar", 50)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.wine", 75)) + .fluidOutputs(getFluidStack("potion.vinegar", 50)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.awkward", 50)) + .fluidOutputs(getFluidStack("potion.weakness", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.mundane", 50)) + .fluidOutputs(getFluidStack("potion.weakness", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.thick", 50)) + .fluidOutputs(getFluidStack("potion.weakness", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.poison", 50)) + .fluidOutputs(getFluidStack("potion.damage", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.health", 50)) + .fluidOutputs(getFluidStack("potion.damage", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.waterbreathing", 50)) + .fluidOutputs(getFluidStack("potion.damage", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.nightvision", 50)) + .fluidOutputs(getFluidStack("potion.invisibility", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.fireresistance", 50)) + .fluidOutputs(getFluidStack("potion.slowness", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.speed", 50)) + .fluidOutputs(getFluidStack("potion.slowness", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.strength", 50)) + .fluidOutputs(getFluidStack("potion.weakness", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.regen", 50)) + .fluidOutputs(getFluidStack("potion.poison", 25)) + .duration(51 * SECONDS + 4 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.poison.strong", 50)) + .fluidOutputs(getFluidStack("potion.damage.strong", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.health.strong", 50)) + .fluidOutputs(getFluidStack("potion.damage.strong", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.speed.strong", 50)) + .fluidOutputs(getFluidStack("potion.slowness.strong", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.strength.strong", 50)) + .fluidOutputs(getFluidStack("potion.weakness.strong", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.nightvision.long", 50)) + .fluidOutputs(getFluidStack("potion.invisibility.long", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.regen.strong", 50)) + .fluidOutputs(getFluidStack("potion.poison.strong", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.poison.long", 50)) + .fluidOutputs(getFluidStack("potion.damage.long", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.waterbreathing.long", 50)) + .fluidOutputs(getFluidStack("potion.damage.long", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.fireresistance.long", 50)) + .fluidOutputs(getFluidStack("potion.slowness.long", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.speed.long", 50)) + .fluidOutputs(getFluidStack("potion.slowness.long", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.strength.long", 50)) + .fluidOutputs(getFluidStack("potion.weakness.long", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(getFluidStack("potion.regen.long", 50)) + .fluidOutputs(getFluidStack("potion.poison.long", 10)) + .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS) + .eut(2) + .addTo(sFermentingRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java index 6c83998bec..b1da72f477 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidCannerRecipes.java @@ -10,42 +10,76 @@ public class FluidCannerRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(ItemList.Battery_Hull_LV.get(1)).itemOutputs(ItemList.IC2_ReBattery.get(1)) - .fluidInputs(Materials.Redstone.getMolten(288)).noFluidOutputs().duration(4).eut(1) - .addTo(sFluidCannerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Battery_Hull_LV.get(1)) - .itemOutputs(ItemList.Battery_SU_LV_Mercury.getWithCharge(1, Integer.MAX_VALUE)) - .fluidInputs(Materials.Mercury.getFluid(1000)).noFluidOutputs().duration(16).eut(1) - .addTo(sFluidCannerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Battery_Hull_MV.get(1)) - .itemOutputs(ItemList.Battery_SU_MV_Mercury.getWithCharge(1, Integer.MAX_VALUE)) - .fluidInputs(Materials.Mercury.getFluid(4000)).noFluidOutputs().duration(64).eut(1) - .addTo(sFluidCannerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Battery_Hull_HV.get(1)) - .itemOutputs(ItemList.Battery_SU_HV_Mercury.getWithCharge(1, Integer.MAX_VALUE)) - .fluidInputs(Materials.Mercury.getFluid(16000)).noFluidOutputs().duration(258).eut(1) - .addTo(sFluidCannerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Battery_Hull_LV.get(1)) - .itemOutputs(ItemList.Battery_SU_LV_SulfuricAcid.getWithCharge(1, Integer.MAX_VALUE)) - .fluidInputs(Materials.SulfuricAcid.getFluid(1000)).noFluidOutputs().duration(16).eut(1) - .addTo(sFluidCannerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Battery_Hull_MV.get(1)) - .itemOutputs(ItemList.Battery_SU_MV_SulfuricAcid.getWithCharge(1, Integer.MAX_VALUE)) - .fluidInputs(Materials.SulfuricAcid.getFluid(4000)).noFluidOutputs().duration(64).eut(1) - .addTo(sFluidCannerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Battery_Hull_HV.get(1)) - .itemOutputs(ItemList.Battery_SU_HV_SulfuricAcid.getWithCharge(1, Integer.MAX_VALUE)) - .fluidInputs(Materials.SulfuricAcid.getFluid(16000)).noFluidOutputs().duration(258).eut(1) - .addTo(sFluidCannerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.TF_Vial_FieryTears.get(1)) - .itemOutputs(ItemList.Bottle_Empty.get(1)).noFluidInputs() - .fluidOutputs(Materials.FierySteel.getFluid(250)).duration(4).eut(1).addTo(sFluidCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_Hull_LV.get(1)) + .itemOutputs(ItemList.IC2_ReBattery.get(1)) + .fluidInputs(Materials.Redstone.getMolten(288)) + .noFluidOutputs() + .duration(4) + .eut(1) + .addTo(sFluidCannerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_Hull_LV.get(1)) + .itemOutputs(ItemList.Battery_SU_LV_Mercury.getWithCharge(1, Integer.MAX_VALUE)) + .fluidInputs(Materials.Mercury.getFluid(1000)) + .noFluidOutputs() + .duration(16) + .eut(1) + .addTo(sFluidCannerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_Hull_MV.get(1)) + .itemOutputs(ItemList.Battery_SU_MV_Mercury.getWithCharge(1, Integer.MAX_VALUE)) + .fluidInputs(Materials.Mercury.getFluid(4000)) + .noFluidOutputs() + .duration(64) + .eut(1) + .addTo(sFluidCannerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_Hull_HV.get(1)) + .itemOutputs(ItemList.Battery_SU_HV_Mercury.getWithCharge(1, Integer.MAX_VALUE)) + .fluidInputs(Materials.Mercury.getFluid(16000)) + .noFluidOutputs() + .duration(258) + .eut(1) + .addTo(sFluidCannerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_Hull_LV.get(1)) + .itemOutputs(ItemList.Battery_SU_LV_SulfuricAcid.getWithCharge(1, Integer.MAX_VALUE)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .noFluidOutputs() + .duration(16) + .eut(1) + .addTo(sFluidCannerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_Hull_MV.get(1)) + .itemOutputs(ItemList.Battery_SU_MV_SulfuricAcid.getWithCharge(1, Integer.MAX_VALUE)) + .fluidInputs(Materials.SulfuricAcid.getFluid(4000)) + .noFluidOutputs() + .duration(64) + .eut(1) + .addTo(sFluidCannerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Battery_Hull_HV.get(1)) + .itemOutputs(ItemList.Battery_SU_HV_SulfuricAcid.getWithCharge(1, Integer.MAX_VALUE)) + .fluidInputs(Materials.SulfuricAcid.getFluid(16000)) + .noFluidOutputs() + .duration(258) + .eut(1) + .addTo(sFluidCannerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.TF_Vial_FieryTears.get(1)) + .itemOutputs(ItemList.Bottle_Empty.get(1)) + .noFluidInputs() + .fluidOutputs(Materials.FierySteel.getFluid(250)) + .duration(4) + .eut(1) + .addTo(sFluidCannerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java index 6d6309197b..af2e1622ae 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java @@ -25,273 +25,594 @@ public class FluidExtractorRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(ItemList.Dye_SquidInk.get(1L)).noItemOutputs().noFluidInputs() - .fluidOutputs(getFluidStack("squidink", 144)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Dye_Indigo.get(1L)).noItemOutputs().noFluidInputs() - .fluidOutputs(getFluidStack("indigo", 144)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Crop_Drop_Indigo.get(1L)).noItemOutputs().noFluidInputs() - .fluidOutputs(getFluidStack("indigo", 144)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Crop_Drop_MilkWart.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L)).outputChances(1000) - .noFluidInputs().fluidOutputs(GT_ModHandler.getMilk(150L)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Crop_Drop_OilBerry.get(1L)).noItemOutputs().noFluidInputs() - .fluidOutputs(Materials.Oil.getFluid(100L)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Crop_Drop_UUMBerry.get(1L)).noItemOutputs().noFluidInputs() - .fluidOutputs(Materials.UUMatter.getFluid(4L)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Crop_Drop_UUABerry.get(1L)).noItemOutputs().noFluidInputs() - .fluidOutputs(Materials.UUAmplifier.getFluid(4L)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.fish, 1, 0)).noItemOutputs().noFluidInputs() - .fluidOutputs(Materials.FishOil.getFluid(40L)).duration(16 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.fish, 1, 1)).noItemOutputs().noFluidInputs() - .fluidOutputs(Materials.FishOil.getFluid(60L)).duration(16 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.fish, 1, 2)).noItemOutputs().noFluidInputs() - .fluidOutputs(Materials.FishOil.getFluid(70L)).duration(16 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.fish, 1, 3)).noItemOutputs().noFluidInputs() - .fluidOutputs(Materials.FishOil.getFluid(30L)).duration(16 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.coal, 1, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L)).outputChances(1000) - .noFluidInputs().fluidOutputs(Materials.WoodTar.getFluid(100L)).duration(1 * SECONDS + 10 * TICKS) - .eut(16).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) - .itemOutputs(ItemList.IC2_Plantball.get(1L)).outputChances(100).noFluidInputs() - .fluidOutputs(Materials.Creosote.getFluid(5L)).duration(16 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HydratedCoal, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L)).outputChances(10000) - .noFluidInputs().fluidOutputs(Materials.Water.getFluid(100L)).duration(1 * SECONDS + 12 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Thaumcraft.modID, "ItemResource", 1, 3)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Mercury.getFluid(1000L)).duration(6 * SECONDS + 8 * TICKS) - .eut(4).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Mercury, 1L)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Mercury.getFluid(1000L)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Monazite, 1L)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Helium.getGas(200L)) - .duration(3 * SECONDS + 4 * TICKS).eut(64).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(IndustrialCraft2.modID, "blockAlloyGlass", 1L, 0)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.ReinforceGlass.getMolten(144)) - .duration(5 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(NewHorizonsCoreMod.modID, "item.ReinforcedGlassPlate", 1L, 0)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.ReinforceGlass.getMolten(72)) - .duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(NewHorizonsCoreMod.modID, "item.ReinforcedGlassLense", 1L, 0)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.ReinforceGlass.getMolten(54)) - .duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Long_Distance_Pipeline_Fluid.get(1L)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Steel.getMolten(19 * 144)).duration(20 * SECONDS).eut(90) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Long_Distance_Pipeline_Item.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L)).outputChances(10000) - .noFluidInputs().fluidOutputs(Materials.Tin.getMolten(12 * 144)).duration(20 * SECONDS).eut(90) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(4L)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Steel.getMolten(189)).duration(2 * SECONDS).eut(90) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Long_Distance_Pipeline_Item_Pipe.get(16L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 3L)).outputChances(10000) - .noFluidInputs().fluidOutputs(Materials.Steel.getMolten(324)).duration(20 * SECONDS).eut(90) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("TritiumCell", 1)) - .itemOutputs(GT_ModHandler.getIC2Item("fuelRod", 1)).outputChances(10000).noFluidInputs() - .fluidOutputs(Materials.Tritium.getGas(32)).duration(16 * TICKS).eut(64).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 1L)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Glass.getMolten(72)).duration(30 * SECONDS) - .eut(28).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Iron.getMolten(288)).duration(15 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 1)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Iron.getMolten(144)).duration(15 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6)).outputChances(10000) - .noFluidInputs().fluidOutputs(Materials.Bronze.getMolten(1728)).duration(15 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Steel.getMolten(288)).duration(20 * SECONDS).eut(90) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 14)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Steel.getMolten(144)).duration(20 * SECONDS).eut(90) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Steel.getMolten(1836)).duration(20 * SECONDS).eut(90) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Aluminium.getMolten(288)).duration(25 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 1)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Aluminium.getMolten(144)).duration(25 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L)).outputChances(10000) - .noFluidInputs().fluidOutputs(Materials.Aluminium.getMolten(108L)).duration(25 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.StainlessSteel.getMolten(288)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 4)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.StainlessSteel.getMolten(144)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.StainlessSteel.getMolten(1836)).duration(30 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Titanium.getMolten(288)).duration(35 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 7)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Titanium.getMolten(144)).duration(35 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Titanium.getMolten(1836)).duration(35 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.TungstenSteel.getMolten(288)).duration(40 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 10)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.TungstenSteel.getMolten(144)).duration(40 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.TungstenSteel.getMolten(1836)).duration(40 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Palladium.getMolten(288)).duration(45 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 13)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Palladium.getMolten(144)).duration(45 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L)).outputChances(10000) - .noFluidInputs().fluidOutputs(Materials.NiobiumTitanium.getMolten(1728)).duration(45 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Iridium.getMolten(288)).duration(50 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 1)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Iridium.getMolten(144)).duration(50 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L)).outputChances(10000) - .noFluidInputs().fluidOutputs(Materials.Enderium.getMolten(1728)).duration(50 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Osmium.getMolten(288)).duration(55 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 4)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Osmium.getMolten(144)).duration(55 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L)).outputChances(10000) - .noFluidInputs().fluidOutputs(Materials.Naquadah.getMolten(1728)).duration(55 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Neutronium.getMolten(288)).duration(60 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 7)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Neutronium.getMolten(144)).duration(60 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.Neutronium.getMolten(1836)).duration(60 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.wheat_seeds, 1, 32767)).noItemOutputs().noFluidInputs() - .fluidOutputs(Materials.SeedOil.getFluid(10)).duration(1 * SECONDS + 12 * TICKS).eut(2) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.melon_seeds, 1, 32767)).noItemOutputs().noFluidInputs() - .fluidOutputs(Materials.SeedOil.getFluid(10)).duration(1 * SECONDS + 12 * TICKS).eut(2) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.pumpkin_seeds, 1, 32767)).noItemOutputs() - .noFluidInputs().fluidOutputs(Materials.SeedOil.getFluid(10)).duration(1 * SECONDS + 12 * TICKS).eut(2) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Crop_Drop_Rape.get(1)).noItemOutputs().noFluidInputs() - .fluidOutputs(Materials.SeedOil.getFluid(125)).duration(1 * SECONDS + 12 * TICKS).eut(2) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.snowball, 1, 0)).noItemOutputs().noFluidInputs() - .fluidOutputs(Materials.Water.getFluid(250L)).duration(1 * SECONDS + 12 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.snow, 1, 0)).noItemOutputs().noFluidInputs() - .fluidOutputs(Materials.Water.getFluid(1000L)).duration(6 * SECONDS + 8 * TICKS).eut(4) - .addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L)) - .noItemOutputs().noFluidInputs().fluidOutputs(Materials.Ice.getSolid(1000L)) - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sFluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Forestry.modID, "phosphor", 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L)).outputChances(1000) - .noFluidInputs().fluidOutputs(Materials.Lava.getFluid(800L)).duration(12 * SECONDS + 16 * TICKS) - .eut(128).addTo(sFluidExtractionRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Dye_SquidInk.get(1L)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(getFluidStack("squidink", 144)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Dye_Indigo.get(1L)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(getFluidStack("indigo", 144)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Indigo.get(1L)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(getFluidStack("indigo", 144)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_MilkWart.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L)) + .outputChances(1000) + .noFluidInputs() + .fluidOutputs(GT_ModHandler.getMilk(150L)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_OilBerry.get(1L)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Oil.getFluid(100L)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_UUMBerry.get(1L)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.UUMatter.getFluid(4L)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_UUABerry.get(1L)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.UUAmplifier.getFluid(4L)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.fish, 1, 0)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.FishOil.getFluid(40L)) + .duration(16 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.fish, 1, 1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.FishOil.getFluid(60L)) + .duration(16 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.fish, 1, 2)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.FishOil.getFluid(70L)) + .duration(16 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.fish, 1, 3)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.FishOil.getFluid(30L)) + .duration(16 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.coal, 1, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 1L)) + .outputChances(1000) + .noFluidInputs() + .fluidOutputs(Materials.WoodTar.getFluid(100L)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L)) + .itemOutputs(ItemList.IC2_Plantball.get(1L)) + .outputChances(100) + .noFluidInputs() + .fluidOutputs(Materials.Creosote.getFluid(5L)) + .duration(16 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HydratedCoal, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L)) + .outputChances(10000) + .noFluidInputs() + .fluidOutputs(Materials.Water.getFluid(100L)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Thaumcraft.modID, "ItemResource", 1, 3)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Mercury.getFluid(1000L)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Mercury, 1L)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Mercury.getFluid(1000L)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Monazite, 1L)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Helium.getGas(200L)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(64) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(IndustrialCraft2.modID, "blockAlloyGlass", 1L, 0)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.ReinforceGlass.getMolten(144)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(NewHorizonsCoreMod.modID, "item.ReinforcedGlassPlate", 1L, 0)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.ReinforceGlass.getMolten(72)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(NewHorizonsCoreMod.modID, "item.ReinforcedGlassLense", 1L, 0)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.ReinforceGlass.getMolten(54)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Long_Distance_Pipeline_Fluid.get(1L)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Steel.getMolten(19 * 144)) + .duration(20 * SECONDS) + .eut(90) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Long_Distance_Pipeline_Item.get(1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L)) + .outputChances(10000) + .noFluidInputs() + .fluidOutputs(Materials.Tin.getMolten(12 * 144)) + .duration(20 * SECONDS) + .eut(90) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(4L)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Steel.getMolten(189)) + .duration(2 * SECONDS) + .eut(90) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Long_Distance_Pipeline_Item_Pipe.get(16L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 3L)) + .outputChances(10000) + .noFluidInputs() + .fluidOutputs(Materials.Steel.getMolten(324)) + .duration(20 * SECONDS) + .eut(90) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("TritiumCell", 1)) + .itemOutputs(GT_ModHandler.getIC2Item("fuelRod", 1)) + .outputChances(10000) + .noFluidInputs() + .fluidOutputs(Materials.Tritium.getGas(32)) + .duration(16 * TICKS) + .eut(64) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quartzite, 1L)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Glass.getMolten(72)) + .duration(30 * SECONDS) + .eut(28) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Iron.getMolten(288)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Iron.getMolten(144)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6)) + .outputChances(10000) + .noFluidInputs() + .fluidOutputs(Materials.Bronze.getMolten(1728)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Steel.getMolten(288)) + .duration(20 * SECONDS) + .eut(90) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 14)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Steel.getMolten(144)) + .duration(20 * SECONDS) + .eut(90) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Steel.getMolten(1836)) + .duration(20 * SECONDS) + .eut(90) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Aluminium.getMolten(288)) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Aluminium.getMolten(144)) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12L)) + .outputChances(10000) + .noFluidInputs() + .fluidOutputs(Materials.Aluminium.getMolten(108L)) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.StainlessSteel.getMolten(288)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 4)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.StainlessSteel.getMolten(144)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.StainlessSteel.getMolten(1836)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Titanium.getMolten(288)) + .duration(35 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 7)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Titanium.getMolten(144)) + .duration(35 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Titanium.getMolten(1836)) + .duration(35 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.TungstenSteel.getMolten(288)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 10)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.TungstenSteel.getMolten(144)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.TungstenSteel.getMolten(1836)) + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Palladium.getMolten(288)) + .duration(45 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 13)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Palladium.getMolten(144)) + .duration(45 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Chrome, 6L)) + .outputChances(10000) + .noFluidInputs() + .fluidOutputs(Materials.NiobiumTitanium.getMolten(1728)) + .duration(45 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Iridium.getMolten(288)) + .duration(50 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Iridium.getMolten(144)) + .duration(50 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iridium, 6L)) + .outputChances(10000) + .noFluidInputs() + .fluidOutputs(Materials.Enderium.getMolten(1728)) + .duration(50 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Osmium.getMolten(288)) + .duration(55 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 4)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Osmium.getMolten(144)) + .duration(55 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Osmium, 6L)) + .outputChances(10000) + .noFluidInputs() + .fluidOutputs(Materials.Naquadah.getMolten(1728)) + .duration(55 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Neutronium.getMolten(288)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 7)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Neutronium.getMolten(144)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Neutronium.getMolten(1836)) + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.wheat_seeds, 1, 32767)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.SeedOil.getFluid(10)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(2) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.melon_seeds, 1, 32767)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.SeedOil.getFluid(10)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(2) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.pumpkin_seeds, 1, 32767)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.SeedOil.getFluid(10)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(2) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Rape.get(1)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.SeedOil.getFluid(125)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(2) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.snowball, 1, 0)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Water.getFluid(250L)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.snow, 1, 0)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Water.getFluid(1000L)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.Ice.getSolid(1000L)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidExtractionRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Forestry.modID, "phosphor", 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L)) + .outputChances(1000) + .noFluidInputs() + .fluidOutputs(Materials.Lava.getFluid(800L)) + .duration(12 * SECONDS + 16 * TICKS) + .eut(128) + .addTo(sFluidExtractionRecipes); // Beecombs fluid extractor recipes if (BartWorks.isModLoaded()) { diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java index 18b9e2b388..b7085ad8bb 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidHeaterRecipes.java @@ -15,47 +15,90 @@ public class FluidHeaterRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(Materials.GrowthMediumRaw.getFluid(1000)) - .fluidOutputs(Materials.GrowthMediumSterilized.getFluid(1000)).duration(10 * SECONDS) - .eut(TierEU.RECIPE_IV).addTo(sFluidHeaterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(Materials.BioMediumRaw.getFluid(1000)) - .fluidOutputs(Materials.BioMediumSterilized.getFluid(1000)).duration(10 * SECONDS) - .eut(TierEU.RECIPE_LuV).addTo(sFluidHeaterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(Materials.Water.getFluid(6)).fluidOutputs(Materials.Water.getGas(960)) - .duration(1 * SECONDS + 10 * TICKS).eut(30).addTo(sFluidHeaterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(GT_ModHandler.getDistilledWater(6)).fluidOutputs(Materials.Water.getGas(960)) - .duration(1 * SECONDS + 10 * TICKS).eut(30).addTo(sFluidHeaterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(Materials.SeedOil.getFluid(16)).fluidOutputs(Materials.FryingOilHot.getFluid(16)) - .duration(16 * TICKS).eut(30).addTo(sFluidHeaterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(Materials.FishOil.getFluid(16)).fluidOutputs(Materials.FryingOilHot.getFluid(16)) - .duration(16 * TICKS).eut(30).addTo(sFluidHeaterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.GrowthMediumRaw.getFluid(1000)) + .fluidOutputs(Materials.GrowthMediumSterilized.getFluid(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sFluidHeaterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.BioMediumRaw.getFluid(1000)) + .fluidOutputs(Materials.BioMediumSterilized.getFluid(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sFluidHeaterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.Water.getFluid(6)) + .fluidOutputs(Materials.Water.getGas(960)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(30) + .addTo(sFluidHeaterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(GT_ModHandler.getDistilledWater(6)) + .fluidOutputs(Materials.Water.getGas(960)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(30) + .addTo(sFluidHeaterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.SeedOil.getFluid(16)) + .fluidOutputs(Materials.FryingOilHot.getFluid(16)) + .duration(16 * TICKS) + .eut(30) + .addTo(sFluidHeaterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.FishOil.getFluid(16)) + .fluidOutputs(Materials.FryingOilHot.getFluid(16)) + .duration(16 * TICKS) + .eut(30) + .addTo(sFluidHeaterRecipes); // Ca(CH3COO)2 = CH3COCH3 + CaO + CO2 - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(Materials.CalciumAcetateSolution.getFluid(1000)) - .fluidOutputs(Materials.Acetone.getFluid(1000)).duration(4 * SECONDS).eut(30) - .addTo(sFluidHeaterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.CalciumAcetateSolution.getFluid(1000)) + .fluidOutputs(Materials.Acetone.getFluid(1000)) + .duration(4 * SECONDS) + .eut(30) + .addTo(sFluidHeaterRecipes); // Fluid Sodium - GT_Values.RA.stdBuilder().itemInputs(Materials.Sodium.getDust(1)).noItemOutputs().fluidInputs( + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Sodium.getDust(1)) + .noItemOutputs() + .fluidInputs( - ).fluidOutputs(Materials.Sodium.getFluid(1000)).duration(10 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sFluidHeaterRecipes); + ) + .fluidOutputs(Materials.Sodium.getFluid(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sFluidHeaterRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(Materials.Acetone.getFluid(1000)).fluidOutputs(Materials.Ethenone.getGas(1000)) - .duration(8 * SECONDS).eut(160).addTo(sFluidHeaterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.Acetone.getFluid(1000)) + .fluidOutputs(Materials.Ethenone.getGas(1000)) + .duration(8 * SECONDS) + .eut(160) + .addTo(sFluidHeaterRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java index 5a6a6b9983..49030f7eeb 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java @@ -38,306 +38,577 @@ public class FluidSolidifierRecipes implements Runnable { continue; } - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Casing.get(0L)).itemOutputs(materialCasing[i]) - .fluidInputs(materialArray[i].getMolten(72L)).noFluidOutputs().duration(16 * TICKS).eut(8) - .addTo(sFluidSolidficationRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Casing.get(0L)) + .itemOutputs(materialCasing[i]) + .fluidInputs(materialArray[i].getMolten(72L)) + .noFluidOutputs() + .duration(16 * TICKS) + .eut(8) + .addTo(sFluidSolidficationRecipes); } - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ball.get(0L)) - .itemOutputs(getModItem(Thaumcraft.modID, "ItemResource", 1, 3)) - .fluidInputs(Materials.Mercury.getFluid(1000L)).noFluidOutputs().duration(6 * SECONDS + 8 * TICKS) - .eut(4).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ball.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Mercury, 1L)) - .fluidInputs(Materials.Mercury.getFluid(1000L)).noFluidOutputs().duration(6 * SECONDS + 8 * TICKS) - .eut(4).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ball.get(0L)) - .itemOutputs(new ItemStack(Items.snowball, 1, 0)).fluidInputs(Materials.Water.getFluid(250L)) - .noFluidOutputs().duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ball.get(0L)) - .itemOutputs(new ItemStack(Items.snowball, 1, 0)).fluidInputs(GT_ModHandler.getDistilledWater(250L)) - .noFluidOutputs().duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L)) - .itemOutputs(new ItemStack(Blocks.snow, 1, 0)).fluidInputs(Materials.Water.getFluid(1000L)) - .noFluidOutputs().duration(25 * SECONDS + 12 * TICKS).eut(4).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L)) - .itemOutputs(new ItemStack(Blocks.snow, 1, 0)).fluidInputs(GT_ModHandler.getDistilledWater(1000L)) - .noFluidOutputs().duration(25 * SECONDS + 12 * TICKS).eut(4).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L)) - .itemOutputs(new ItemStack(Blocks.obsidian, 1, 0)).fluidInputs(Materials.Lava.getFluid(1000L)) - .noFluidOutputs().duration(51 * SECONDS + 4 * TICKS).eut(16).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L)) - .itemOutputs(new ItemStack(GregTech_API.sBlockConcretes, 1, 8)) - .fluidInputs(Materials.Concrete.getMolten(144L)).noFluidOutputs().duration(12 * TICKS).eut(4) - .addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L)) - .itemOutputs(new ItemStack(Blocks.glowstone, 1, 0)).fluidInputs(Materials.Glowstone.getMolten(576L)) - .noFluidOutputs().duration(12 * TICKS).eut(4).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L)) - .itemOutputs(new ItemStack(Blocks.glass, 1, 0)).fluidInputs(Materials.Glass.getMolten(144L)) - .noFluidOutputs().duration(12 * TICKS).eut(4).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Plate.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Glass, 1L)) - .fluidInputs(Materials.Glass.getMolten(144L)).noFluidOutputs().duration(12 * TICKS).eut(4) - .addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Bottle.get(0L)) - .itemOutputs(ItemList.Bottle_Empty.get(1L)).fluidInputs(Materials.Glass.getMolten(144L)) - .noFluidOutputs().duration(12 * TICKS).eut(4).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Cylinder.get(0L)) - .itemOutputs(ItemList.Food_Cheese.get(1L)).fluidInputs(Materials.Milk.getFluid(250L)).noFluidOutputs() - .duration(51 * SECONDS + 4 * TICKS).eut(4).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Cylinder.get(0L)) - .itemOutputs(ItemList.Food_Cheese.get(1L)).fluidInputs(Materials.Cheese.getMolten(144L)) - .noFluidOutputs().duration(3 * SECONDS + 4 * TICKS).eut(8).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Anvil.get(0L)) - .itemOutputs(new ItemStack(Blocks.anvil, 1, 0)).fluidInputs(Materials.Iron.getMolten(4464L)) - .noFluidOutputs().duration(6 * SECONDS + 8 * TICKS).eut(16).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Anvil.get(0L)) - .itemOutputs(new ItemStack(Blocks.anvil, 1, 0)).fluidInputs(Materials.WroughtIron.getMolten(4464L)) - .noFluidOutputs().duration(6 * SECONDS + 8 * TICKS).eut(16).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).itemOutputs(Materials.Boron.getDust(1)) - .fluidInputs(Materials.Boron.getMolten(144L)).noFluidOutputs().duration(1 * SECONDS + 10 * TICKS) - .eut(30).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Cylinder.get(0)) - .itemOutputs(ItemList.Circuit_Parts_PetriDish.get(1)) - .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(36)).noFluidOutputs().duration(8 * SECONDS) - .eut(16).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Cylinder.get(0)) - .itemOutputs(ItemList.Circuit_Parts_PetriDish.get(1)).fluidInputs(Materials.Polystyrene.getMolten(36)) - .noFluidOutputs().duration(8 * SECONDS).eut(16).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Cylinder.get(0)) - .itemOutputs(ItemList.Circuit_Parts_PetriDish.get(1)) - .fluidInputs(Materials.BorosilicateGlass.getMolten(72)).noFluidOutputs().duration(8 * SECONDS).eut(16) - .addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Plate.get(0L)) - .itemOutputs(getModItem(NewHorizonsCoreMod.modID, "item.ReinforcedGlassPlate", 1L, 0)) - .fluidInputs(Materials.ReinforceGlass.getMolten(72)).noFluidOutputs().duration(8 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L)) - .itemOutputs(getModItem(IndustrialCraft2.modID, "blockAlloyGlass", 1L)) - .fluidInputs(Materials.ReinforceGlass.getMolten(144)).noFluidOutputs().duration(8 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ball.get(0L)) - .itemOutputs(ItemList.Circuit_Parts_Glass_Tube.get(1)).fluidInputs(Materials.Glass.getMolten(144)) - .noFluidOutputs().duration(10 * SECONDS).eut(24).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ball.get(0L)) - .itemOutputs(ItemList.Circuit_Parts_Reinforced_Glass_Tube.get(1)) - .fluidInputs(Materials.ReinforceGlass.getMolten(288)).noFluidOutputs().duration(10 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ball.get(0L)) - .itemOutputs(ItemList.Circuit_Parts_Glass_Tube.get(1)).fluidInputs(getFluidStack("glass.molten", 1000)) - .noFluidOutputs().duration(10 * SECONDS).eut(24).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ball.get(0L)) - .itemOutputs(ItemList.GelledToluene.get(1)).fluidInputs(new FluidStack(ItemList.sToluene, 100)) - .noFluidOutputs().duration(5 * SECONDS).eut(16).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Nugget.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Copper, 1L)) - .fluidInputs(Materials.AnnealedCopper.getMolten(16)).noFluidOutputs().duration(16 * TICKS).eut(4) - .addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ingot.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L)) - .fluidInputs(Materials.AnnealedCopper.getMolten(144)).noFluidOutputs() - .duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Copper, 1L)) - .fluidInputs(Materials.AnnealedCopper.getMolten(1296)).noFluidOutputs() - .duration(14 * SECONDS + 8 * TICKS).eut(8).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Nugget.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L)) - .fluidInputs(Materials.WroughtIron.getMolten(16)).noFluidOutputs().duration(16 * TICKS).eut(4) - .addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ingot.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L)) - .fluidInputs(Materials.WroughtIron.getMolten(144)).noFluidOutputs().duration(1 * SECONDS + 12 * TICKS) - .eut(8).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Block.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L)) - .fluidInputs(Materials.WroughtIron.getMolten(1296)).noFluidOutputs().duration(14 * SECONDS + 8 * TICKS) - .eut(8).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Spinneret.get(0L)).itemOutputs(ItemList.KevlarFiber.get(8L)) - .fluidInputs(MaterialsKevlar.LiquidCrystalKevlar.getFluid(144L)).noFluidOutputs().duration(40 * SECONDS) - .eut(TierEU.RECIPE_EV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Anvil.get(0L)) - .itemOutputs(getModItem(Railcraft.modID, "tile.railcraft.anvil", 1L, 0)) - .fluidInputs(Materials.Steel.getMolten(4464L)).noFluidOutputs().duration(6 * SECONDS + 8 * TICKS) - .eut(16).addTo(sFluidSolidficationRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) + .itemOutputs(getModItem(Thaumcraft.modID, "ItemResource", 1, 3)) + .fluidInputs(Materials.Mercury.getFluid(1000L)) + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Mercury, 1L)) + .fluidInputs(Materials.Mercury.getFluid(1000L)) + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) + .itemOutputs(new ItemStack(Items.snowball, 1, 0)) + .fluidInputs(Materials.Water.getFluid(250L)) + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) + .itemOutputs(new ItemStack(Items.snowball, 1, 0)) + .fluidInputs(GT_ModHandler.getDistilledWater(250L)) + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Block.get(0L)) + .itemOutputs(new ItemStack(Blocks.snow, 1, 0)) + .fluidInputs(Materials.Water.getFluid(1000L)) + .noFluidOutputs() + .duration(25 * SECONDS + 12 * TICKS) + .eut(4) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Block.get(0L)) + .itemOutputs(new ItemStack(Blocks.snow, 1, 0)) + .fluidInputs(GT_ModHandler.getDistilledWater(1000L)) + .noFluidOutputs() + .duration(25 * SECONDS + 12 * TICKS) + .eut(4) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Block.get(0L)) + .itemOutputs(new ItemStack(Blocks.obsidian, 1, 0)) + .fluidInputs(Materials.Lava.getFluid(1000L)) + .noFluidOutputs() + .duration(51 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Block.get(0L)) + .itemOutputs(new ItemStack(GregTech_API.sBlockConcretes, 1, 8)) + .fluidInputs(Materials.Concrete.getMolten(144L)) + .noFluidOutputs() + .duration(12 * TICKS) + .eut(4) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Block.get(0L)) + .itemOutputs(new ItemStack(Blocks.glowstone, 1, 0)) + .fluidInputs(Materials.Glowstone.getMolten(576L)) + .noFluidOutputs() + .duration(12 * TICKS) + .eut(4) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Block.get(0L)) + .itemOutputs(new ItemStack(Blocks.glass, 1, 0)) + .fluidInputs(Materials.Glass.getMolten(144L)) + .noFluidOutputs() + .duration(12 * TICKS) + .eut(4) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Plate.get(0L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Glass, 1L)) + .fluidInputs(Materials.Glass.getMolten(144L)) + .noFluidOutputs() + .duration(12 * TICKS) + .eut(4) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Bottle.get(0L)) + .itemOutputs(ItemList.Bottle_Empty.get(1L)) + .fluidInputs(Materials.Glass.getMolten(144L)) + .noFluidOutputs() + .duration(12 * TICKS) + .eut(4) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Cylinder.get(0L)) + .itemOutputs(ItemList.Food_Cheese.get(1L)) + .fluidInputs(Materials.Milk.getFluid(250L)) + .noFluidOutputs() + .duration(51 * SECONDS + 4 * TICKS) + .eut(4) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Cylinder.get(0L)) + .itemOutputs(ItemList.Food_Cheese.get(1L)) + .fluidInputs(Materials.Cheese.getMolten(144L)) + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(8) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Anvil.get(0L)) + .itemOutputs(new ItemStack(Blocks.anvil, 1, 0)) + .fluidInputs(Materials.Iron.getMolten(4464L)) + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(16) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Anvil.get(0L)) + .itemOutputs(new ItemStack(Blocks.anvil, 1, 0)) + .fluidInputs(Materials.WroughtIron.getMolten(4464L)) + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(16) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Boron.getDust(1)) + .fluidInputs(Materials.Boron.getMolten(144L)) + .noFluidOutputs() + .duration(1 * SECONDS + 10 * TICKS) + .eut(30) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Cylinder.get(0)) + .itemOutputs(ItemList.Circuit_Parts_PetriDish.get(1)) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(36)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(16) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Cylinder.get(0)) + .itemOutputs(ItemList.Circuit_Parts_PetriDish.get(1)) + .fluidInputs(Materials.Polystyrene.getMolten(36)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(16) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Cylinder.get(0)) + .itemOutputs(ItemList.Circuit_Parts_PetriDish.get(1)) + .fluidInputs(Materials.BorosilicateGlass.getMolten(72)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(16) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Plate.get(0L)) + .itemOutputs(getModItem(NewHorizonsCoreMod.modID, "item.ReinforcedGlassPlate", 1L, 0)) + .fluidInputs(Materials.ReinforceGlass.getMolten(72)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Block.get(0L)) + .itemOutputs(getModItem(IndustrialCraft2.modID, "blockAlloyGlass", 1L)) + .fluidInputs(Materials.ReinforceGlass.getMolten(144)) + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) + .itemOutputs(ItemList.Circuit_Parts_Glass_Tube.get(1)) + .fluidInputs(Materials.Glass.getMolten(144)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(24) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) + .itemOutputs(ItemList.Circuit_Parts_Reinforced_Glass_Tube.get(1)) + .fluidInputs(Materials.ReinforceGlass.getMolten(288)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) + .itemOutputs(ItemList.Circuit_Parts_Glass_Tube.get(1)) + .fluidInputs(getFluidStack("glass.molten", 1000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(24) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Ball.get(0L)) + .itemOutputs(ItemList.GelledToluene.get(1)) + .fluidInputs(new FluidStack(ItemList.sToluene, 100)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Nugget.get(0L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Copper, 1L)) + .fluidInputs(Materials.AnnealedCopper.getMolten(16)) + .noFluidOutputs() + .duration(16 * TICKS) + .eut(4) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Ingot.get(0L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L)) + .fluidInputs(Materials.AnnealedCopper.getMolten(144)) + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(8) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Block.get(0L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Copper, 1L)) + .fluidInputs(Materials.AnnealedCopper.getMolten(1296)) + .noFluidOutputs() + .duration(14 * SECONDS + 8 * TICKS) + .eut(8) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Nugget.get(0L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 1L)) + .fluidInputs(Materials.WroughtIron.getMolten(16)) + .noFluidOutputs() + .duration(16 * TICKS) + .eut(4) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Ingot.get(0L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L)) + .fluidInputs(Materials.WroughtIron.getMolten(144)) + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(8) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Block.get(0L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L)) + .fluidInputs(Materials.WroughtIron.getMolten(1296)) + .noFluidOutputs() + .duration(14 * SECONDS + 8 * TICKS) + .eut(8) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Spinneret.get(0L)) + .itemOutputs(ItemList.KevlarFiber.get(8L)) + .fluidInputs(MaterialsKevlar.LiquidCrystalKevlar.getFluid(144L)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Anvil.get(0L)) + .itemOutputs(getModItem(Railcraft.modID, "tile.railcraft.anvil", 1L, 0)) + .fluidInputs(Materials.Steel.getMolten(4464L)) + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(16) + .addTo(sFluidSolidficationRecipes); final int whiteDwarfShapeSolidifierTime = 10 * SECONDS; final int fluidPerShapeSolidifierRecipe = 4 * INGOTS; { - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Bottle.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Bottle.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Plate.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Plate.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Cell.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Cell.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Ring.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Ring.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Rod.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Rod.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Bolt.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Bolt.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Ingot.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Ingot.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Wire.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Wire.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Casing.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Casing.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Pipe_Tiny.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Tiny.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Pipe_Small.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Small.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Pipe_Medium.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Medium.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Pipe_Large.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Large.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Pipe_Huge.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Huge.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Block.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Block.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Sword.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Sword.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Pickaxe.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pickaxe.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Shovel.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Shovel.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Axe.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Axe.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Hoe.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Hoe.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Hammer.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Hammer.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_File.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_File.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Saw.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Saw.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Gear.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Gear.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Rotor.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Rotor.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Turbine_Blade.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Turbine_Blade.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_Small_Gear.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Small_Gear.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Extruder_ToolHeadDrill.get(1)) - .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_ToolHeadDrill.get(1)) - .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)).noFluidOutputs() - .duration(whiteDwarfShapeSolidifierTime).eut(TierEU.RECIPE_UMV).addTo(sFluidSolidficationRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Bottle.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Bottle.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Plate.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Plate.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Cell.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Cell.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Ring.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Ring.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Rod.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Rod.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Bolt.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Bolt.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Ingot.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Ingot.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Wire.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Wire.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Casing.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Casing.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Pipe_Tiny.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Tiny.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Pipe_Small.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Small.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Pipe_Medium.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Medium.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Pipe_Large.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Large.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Pipe_Huge.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Huge.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Block.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Block.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Sword.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Sword.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Pickaxe.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pickaxe.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Shovel.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Shovel.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Axe.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Axe.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Hoe.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Hoe.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Hammer.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Hammer.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_File.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_File.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Saw.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Saw.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Gear.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Gear.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Rotor.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Rotor.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Turbine_Blade.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Turbine_Blade.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_Small_Gear.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Small_Gear.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Extruder_ToolHeadDrill.get(1)) + .itemOutputs(ItemList.White_Dwarf_Shape_Extruder_ToolHeadDrill.get(1)) + .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe)) + .noFluidOutputs() + .duration(whiteDwarfShapeSolidifierTime) + .eut(TierEU.RECIPE_UMV) + .addTo(sFluidSolidficationRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java index d786db3ffc..cab48ac9b5 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java @@ -19,79 +19,172 @@ public class ForgeHammerRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.stonebrick, 1, 0)) - .itemOutputs(new ItemStack(Blocks.stonebrick, 1, 2)).noFluidInputs().noFluidOutputs() - .duration(10 * TICKS).eut(16).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.stone, 1, 0)) - .itemOutputs(new ItemStack(Blocks.cobblestone, 1, 0)).noFluidInputs().noFluidOutputs() - .duration(10 * TICKS).eut(16).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.cobblestone, 1, 0)) - .itemOutputs(new ItemStack(Blocks.gravel, 1, 0)).noFluidInputs().noFluidOutputs().duration(10 * TICKS) - .eut(16).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.gravel, 1, 0)) - .itemOutputs(new ItemStack(Blocks.sand, 1, 0)).noFluidInputs().noFluidOutputs().duration(10 * TICKS) - .eut(16).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.sandstone, 1, 32767)) - .itemOutputs(new ItemStack(Blocks.sand, 1, 0)).noFluidInputs().noFluidOutputs().duration(10 * TICKS) - .eut(16).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.ice, 1, 0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1)).noFluidInputs() - .noFluidOutputs().duration(10 * TICKS).eut(16).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.packed_ice, 1, 0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 2)).noFluidInputs() - .noFluidOutputs().duration(10 * TICKS).eut(16).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.brick_block, 1, 0)) - .itemOutputs(new ItemStack(Items.brick, 3, 0)).noFluidInputs().noFluidOutputs().duration(10 * TICKS) - .eut(16).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.nether_brick, 1, 0)) - .itemOutputs(new ItemStack(Items.netherbrick, 3, 0)).noFluidInputs().noFluidOutputs() - .duration(10 * TICKS).eut(16).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.stained_glass, 1, 32767)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1)).noFluidInputs() - .noFluidOutputs().duration(10 * TICKS).eut(16).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.glass, 1, 32767)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1)).noFluidInputs() - .noFluidOutputs().duration(10 * TICKS).eut(10).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.stained_glass_pane, 1, 32767)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)).noFluidInputs() - .noFluidOutputs().duration(10 * TICKS).eut(16).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.glass_pane, 1, 32767)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)).noFluidInputs() - .noFluidOutputs().duration(10 * TICKS).eut(16).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Brick.getIngots(1)).itemOutputs(Materials.Brick.getDustSmall(1)) - .noFluidInputs().noFluidOutputs().duration(10 * TICKS).eut(16).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Firebrick.get(1)).itemOutputs(Materials.Brick.getDust(1)) - .noFluidInputs().noFluidOutputs().duration(10 * TICKS).eut(16).addTo(sHammerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Firebricks.get(1)).itemOutputs(ItemList.Firebrick.get(3)) - .noFluidInputs().noFluidOutputs().duration(10 * TICKS).eut(16).addTo(sHammerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.stonebrick, 1, 0)) + .itemOutputs(new ItemStack(Blocks.stonebrick, 1, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.stone, 1, 0)) + .itemOutputs(new ItemStack(Blocks.cobblestone, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.cobblestone, 1, 0)) + .itemOutputs(new ItemStack(Blocks.gravel, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.gravel, 1, 0)) + .itemOutputs(new ItemStack(Blocks.sand, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.sandstone, 1, 32767)) + .itemOutputs(new ItemStack(Blocks.sand, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.ice, 1, 0)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.packed_ice, 1, 0)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.brick_block, 1, 0)) + .itemOutputs(new ItemStack(Items.brick, 3, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.nether_brick, 1, 0)) + .itemOutputs(new ItemStack(Items.netherbrick, 3, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.stained_glass, 1, 32767)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.glass, 1, 32767)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(10) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.stained_glass_pane, 1, 32767)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.glass_pane, 1, 32767)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Brick.getIngots(1)) + .itemOutputs(Materials.Brick.getDustSmall(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Firebrick.get(1)) + .itemOutputs(Materials.Brick.getDust(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Firebricks.get(1)) + .itemOutputs(ItemList.Firebrick.get(3)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(16) + .addTo(sHammerRecipes); if (GTPlusPlus.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Tesseract.get(1L), getModItem(GTPlusPlus.modID, "MU-metaitem.01", 1, 32105)) - .noItemOutputs().fluidInputs(Materials.SpaceTime.getMolten(2880L)) - .fluidOutputs(Materials.Space.getMolten(1440L), Materials.Time.getMolten(1440L)) - .duration(10 * SECONDS).eut(TierEU.RECIPE_UXV).addTo(sHammerRecipes); + .itemInputs( + ItemList.Tesseract.get(1L), + getModItem(GTPlusPlus.modID, "MU-metaitem.01", 1, 32105)) + .noItemOutputs() + .fluidInputs(Materials.SpaceTime.getMolten(2880L)) + .fluidOutputs(Materials.Space.getMolten(1440L), Materials.Time.getMolten(1440L)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_UXV) + .addTo(sHammerRecipes); } if (HardcoreEnderExpansion.isModLoaded()) { - GT_Values.RA.stdBuilder().itemInputs(getModItem(HardcoreEnderExpansion.modID, "endium_ore", 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 1)).noFluidInputs() - .noFluidOutputs().duration(16).eut(10).addTo(sHammerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(HardcoreEnderExpansion.modID, "endium_ore", 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(16) + .eut(10) + .addTo(sHammerRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java index 8b3479a3e8..c53e0df19e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java @@ -20,133 +20,211 @@ public class FormingPressRecipes implements Runnable { public void run() { if (BuildCraftSilicon.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 1)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), + getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 1)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), + getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 2)).noFluidInputs() - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), + getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 3)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), + getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 2L, 4)).noFluidInputs() - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.EnderPearl, 1L), + getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 2L, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 5)).noFluidInputs() - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), + getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 5)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Items.comparator, 1, 32767), - getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) - .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 6)).noFluidInputs() - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sPressRecipes); + .itemInputs( + new ItemStack(Items.comparator, 1, 32767), + getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 0)) + .itemOutputs(getModItem(BuildCraftSilicon.modID, "redstoneChipset", 1L, 6)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sPressRecipes); } if (AppliedEnergistics2.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 13)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 16)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(16).addTo(sPressRecipes); + .itemInputs( + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 10), + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 13)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 16)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CertusQuartz, 1L), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 13)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 16)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(16).addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CertusQuartz, 1L), + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 13)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 16)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 14)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 17)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(16).addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 14)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 17)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 15)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 18)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(16).addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L), + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 15)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 18)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SiliconSG, 1L), - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 19)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(16).addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SiliconSG, 1L), + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 0L, 19)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 20)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sPressRecipes); } - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Dough_Sugar.get(4L), ItemList.Shape_Mold_Cylinder.get(0L)) - .itemOutputs(ItemList.Food_Raw_Cake.get(1L)).noFluidInputs().noFluidOutputs() - .duration(19 * SECONDS + 4 * TICKS).eut(4).addTo(sPressRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Dough_Sugar.get(4L), ItemList.Shape_Mold_Cylinder.get(0L)) + .itemOutputs(ItemList.Food_Raw_Cake.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(19 * SECONDS + 4 * TICKS) + .eut(4) + .addTo(sPressRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.glass, 1, 32767), ItemList.Shape_Mold_Arrow.get(0L)) - .itemOutputs(ItemList.Arrow_Head_Glass_Emtpy.get(1L)).noFluidInputs().noFluidOutputs() - .duration(3 * SECONDS + 4 * TICKS).eut(4).addTo(sPressRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.glass, 1, 32767), ItemList.Shape_Mold_Arrow.get(0L)) + .itemOutputs(ItemList.Arrow_Head_Glass_Emtpy.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(4) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Cupronickel, 1L), - ItemList.Shape_Mold_Credit.get(0L)) - .itemOutputs(ItemList.Credit_Greg_Cupronickel.get(4L)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(16).addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Cupronickel, 1L), + ItemList.Shape_Mold_Credit.get(0L)) + .itemOutputs(ItemList.Credit_Greg_Cupronickel.get(4L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Brass, 1L), - ItemList.Shape_Mold_Credit.get(0L)) - .itemOutputs(ItemList.Coin_Doge.get(4L)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(16) - .addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Brass, 1L), + ItemList.Shape_Mold_Credit.get(0L)) + .itemOutputs(ItemList.Coin_Doge.get(4L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), - ItemList.Shape_Mold_Credit.get(0L)) - .itemOutputs(ItemList.Credit_Iron.get(4L)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), + ItemList.Shape_Mold_Credit.get(0L)) + .itemOutputs(ItemList.Credit_Iron.get(4L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), - ItemList.Shape_Mold_Credit.get(0L)) - .itemOutputs(ItemList.Credit_Iron.get(4L)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), + ItemList.Shape_Mold_Credit.get(0L)) + .itemOutputs(ItemList.Credit_Iron.get(4L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sPressRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brick, 1L), - ItemList.Shape_Mold_Ingot.get(0L)) - .itemOutputs(new ItemStack(Items.brick, 1, 0)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(16).addTo(sPressRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brick, 1L), + ItemList.Shape_Mold_Ingot.get(0L)) + .itemOutputs(new ItemStack(Items.brick, 1, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(16) + .addTo(sPressRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java index 124c7b59f2..a412b822e1 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java @@ -20,75 +20,194 @@ public class FuelRecipes implements Runnable { @Override public void run() { if (!GregTech_API.mIC2Classic) { - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("biogasCell", 1L)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 40).metadata(FUEL_TYPE, 1).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("biogasCell", 1L)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 40) + .metadata(FUEL_TYPE, 1) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); } - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.golden_apple, 1, 1)) - .itemOutputs(new ItemStack(Items.apple, 1)).noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 6400) - .metadata(FUEL_TYPE, 5).duration(0).eut(0).addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.golden_apple, 1, 1)) + .itemOutputs(new ItemStack(Items.apple, 1)) + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 6400) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Thaumcraft.modID, "ItemShard", 1L, 6)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Thaumcraft.modID, "ItemShard", 1L, 6)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(ForbiddenMagic.modID, "GluttonyShard", 1L)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(ForbiddenMagic.modID, "GluttonyShard", 1L)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(ForbiddenMagic.modID, "FMResource", 1L, 3)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(ForbiddenMagic.modID, "FMResource", 1L, 3)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 1)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 1)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 2)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 2)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 3)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 3)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 4)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 4)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 5)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 5)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 6)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(ForbiddenMagic.modID, "NetherShard", 1L, 6)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(TaintedMagic.modID, "WarpedShard", 1L)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(TaintedMagic.modID, "WarpedShard", 1L)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(TaintedMagic.modID, "FluxShard", 1L)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(TaintedMagic.modID, "FluxShard", 1L)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(TaintedMagic.modID, "EldritchShard", 1L)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(TaintedMagic.modID, "EldritchShard", 1L)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 6)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 6)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder().itemInputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 7)).noItemOutputs() - .noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 720).metadata(FUEL_TYPE, 5).duration(0).eut(0) - .addTo(GT_RecipeConstants.Fuel); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(ThaumicTinkerer.modID, "kamiResource", 1L, 7)) + .noItemOutputs() + .noFluidInputs() + .noFluidOutputs() + .metadata(FUEL_VALUE, 720) + .metadata(FUEL_TYPE, 5) + .duration(0) + .eut(0) + .addTo(GT_RecipeConstants.Fuel); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java index df0cddca83..3890b7628a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java @@ -20,181 +20,356 @@ public class FusionReactorRecipes implements Runnable { // F FT2, FT3 - fusion tier required, + - requires different startup recipe (startup cost bigger than // available on the tier) - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Lithium.getMolten(16), Materials.Tungsten.getMolten(16)) - .fluidOutputs(Materials.Iridium.getMolten(16)).duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LuV) - .metadata(FUSION_THRESHOLD, 300000000).addTo(sFusionRecipes); // FT1+ - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Deuterium.getGas(125), Materials.Tritium.getGas(125)) - .fluidOutputs(Materials.Helium.getPlasma(125)).duration(16 * TICKS).eut(4096) - .metadata(FUSION_THRESHOLD, 40000000).addTo(sFusionRecipes); // FT1 Cheap - farmable - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Deuterium.getGas(125), Materials.Helium_3.getGas(125)) - .fluidOutputs(Materials.Helium.getPlasma(125)).duration(16 * TICKS).eut(2048) - .metadata(FUSION_THRESHOLD, 60000000).addTo(sFusionRecipes); // FT1 Expensive // - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Carbon.getMolten(125), Materials.Helium_3.getGas(125)) - .fluidOutputs(Materials.Oxygen.getPlasma(125)).duration(1 * SECONDS + 12 * TICKS).eut(4096) - .metadata(FUSION_THRESHOLD, 80000000).addTo(sFusionRecipes); // FT1 Expensive // - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Aluminium.getMolten(16), Materials.Lithium.getMolten(16)) - .fluidOutputs(Materials.Sulfur.getPlasma(144)).duration(1 * SECONDS + 12 * TICKS).eut(10240) - .metadata(FUSION_THRESHOLD, 240000000).addTo(sFusionRecipes); // FT1+ Cheap - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Beryllium.getMolten(16), Materials.Deuterium.getGas(375)) - .fluidOutputs(Materials.Nitrogen.getPlasma(125)).duration(16 * TICKS).eut(16384) - .metadata(FUSION_THRESHOLD, 180000000).addTo(sFusionRecipes); // FT1+ Expensive // - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Silicon.getMolten(16), Materials.Magnesium.getMolten(16)) - .fluidOutputs(Materials.Iron.getPlasma(144)).duration(1 * SECONDS + 12 * TICKS).eut(8192) - .metadata(FUSION_THRESHOLD, 360000000).addTo(sFusionRecipes); // FT1++ Cheap // - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Potassium.getMolten(16), Materials.Fluorine.getGas(144)) - .fluidOutputs(Materials.Nickel.getPlasma(144)).duration(16 * TICKS).eut(TierEU.RECIPE_LuV) - .metadata(FUSION_THRESHOLD, 480000000).addTo(sFusionRecipes); // FT1++ Expensive // - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Beryllium.getMolten(16), Materials.Tungsten.getMolten(16)) - .fluidOutputs(Materials.Platinum.getMolten(16)).duration(1 * SECONDS + 12 * TICKS) - .eut(TierEU.RECIPE_LuV).metadata(FUSION_THRESHOLD, 150000000).addTo(sFusionRecipes); // FT1 - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Neodymium.getMolten(16), Materials.Hydrogen.getGas(48)) - .fluidOutputs(Materials.Europium.getMolten(16)).duration(1 * SECONDS + 12 * TICKS).eut(24576) - .metadata(FUSION_THRESHOLD, 150000000).addTo(sFusionRecipes); // FT1 - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Lutetium.getMolten(16), Materials.Chrome.getMolten(16)) - .fluidOutputs(Materials.Americium.getMolten(16)).duration(4 * SECONDS + 16 * TICKS).eut(49152) - .metadata(FUSION_THRESHOLD, 200000000).addTo(sFusionRecipes); // FT2 - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Plutonium.getMolten(16), Materials.Thorium.getMolten(16)) - .fluidOutputs(Materials.Naquadah.getMolten(16)).duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LuV) - .metadata(FUSION_THRESHOLD, 300000000).addTo(sFusionRecipes); // FT1+ - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Americium.getMolten(144), Materials.Naquadria.getMolten(144)) - .fluidOutputs(Materials.Neutronium.getMolten(144)).duration(12 * SECONDS).eut(TierEU.RECIPE_ZPM) - .metadata(FUSION_THRESHOLD, 640000000).addTo(sFusionRecipes); // FT3 - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Glowstone.getMolten(16), Materials.Helium.getPlasma(4)) - .fluidOutputs(Materials.Sunnarium.getMolten(16)).duration(1 * SECONDS + 12 * TICKS) - .eut(TierEU.RECIPE_IV).metadata(FUSION_THRESHOLD, 40000000).addTo(sFusionRecipes); // Mark 1 Expensive - // // - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Tungsten.getMolten(16), Materials.Helium.getGas(16)) - .fluidOutputs(Materials.Osmium.getMolten(16)).duration(12 * SECONDS + 16 * TICKS).eut(24578) - .metadata(FUSION_THRESHOLD, 150000000).addTo(sFusionRecipes); // FT1 - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Manganese.getMolten(16), Materials.Hydrogen.getGas(16)) - .fluidOutputs(Materials.Iron.getMolten(16)).duration(3 * SECONDS + 4 * TICKS).eut(8192) - .metadata(FUSION_THRESHOLD, 120000000).addTo(sFusionRecipes); // FT1 - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Magnesium.getMolten(128), Materials.Oxygen.getGas(128)) - .fluidOutputs(Materials.Calcium.getPlasma(16)).duration(6 * SECONDS + 8 * TICKS).eut(8192) - .metadata(FUSION_THRESHOLD, 120000000).addTo(sFusionRecipes); // - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Mercury.getFluid(16), Materials.Magnesium.getMolten(16)) - .fluidOutputs(Materials.Uranium.getMolten(16)).duration(3 * SECONDS + 4 * TICKS).eut(49152) - .metadata(FUSION_THRESHOLD, 240000000).addTo(sFusionRecipes); // FT2 - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Gold.getMolten(16), Materials.Aluminium.getMolten(16)) - .fluidOutputs(Materials.Uranium.getMolten(16)).duration(3 * SECONDS + 4 * TICKS).eut(49152) - .metadata(FUSION_THRESHOLD, 240000000).addTo(sFusionRecipes); // FT2 - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Uranium.getMolten(16), Materials.Helium.getGas(16)) - .fluidOutputs(Materials.Plutonium.getMolten(16)).duration(6 * SECONDS + 8 * TICKS).eut(49152) - .metadata(FUSION_THRESHOLD, 480000000).addTo(sFusionRecipes); // FT2+ - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Vanadium.getMolten(16), Materials.Hydrogen.getGas(125)) - .fluidOutputs(Materials.Chrome.getMolten(16)).duration(3 * SECONDS + 4 * TICKS).eut(24576) - .metadata(FUSION_THRESHOLD, 140000000).addTo(sFusionRecipes); // FT1 - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Gallium.getMolten(16), Materials.Radon.getGas(125)) - .fluidOutputs(Materials.Duranium.getMolten(16)).duration(3 * SECONDS + 4 * TICKS).eut(16384) - .metadata(FUSION_THRESHOLD, 140000000).addTo(sFusionRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Titanium.getMolten(48), Materials.Duranium.getMolten(32)) - .fluidOutputs(Materials.Tritanium.getMolten(16)).duration(3 * SECONDS + 4 * TICKS) - .eut(TierEU.RECIPE_LuV).metadata(FUSION_THRESHOLD, 200000000).addTo(sFusionRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Tantalum.getMolten(16), Materials.Tritium.getGas(16)) - .fluidOutputs(Materials.Tungsten.getMolten(16)).duration(16 * TICKS).eut(24576) - .metadata(FUSION_THRESHOLD, 200000000).addTo(sFusionRecipes); // - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Silver.getMolten(16), Materials.Lithium.getMolten(16)) - .fluidOutputs(Materials.Indium.getMolten(16)).duration(1 * SECONDS + 12 * TICKS).eut(24576) - .metadata(FUSION_THRESHOLD, 380000000).addTo(sFusionRecipes); // + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Lithium.getMolten(16), Materials.Tungsten.getMolten(16)) + .fluidOutputs(Materials.Iridium.getMolten(16)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(TierEU.RECIPE_LuV) + .metadata(FUSION_THRESHOLD, 300000000) + .addTo(sFusionRecipes); // FT1+ - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Deuterium.getGas(125), Materials.Tritium.getGas(125)) + .fluidOutputs(Materials.Helium.getPlasma(125)) + .duration(16 * TICKS) + .eut(4096) + .metadata(FUSION_THRESHOLD, 40000000) + .addTo(sFusionRecipes); // FT1 Cheap - farmable + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Deuterium.getGas(125), Materials.Helium_3.getGas(125)) + .fluidOutputs(Materials.Helium.getPlasma(125)) + .duration(16 * TICKS) + .eut(2048) + .metadata(FUSION_THRESHOLD, 60000000) + .addTo(sFusionRecipes); // FT1 Expensive // + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Carbon.getMolten(125), Materials.Helium_3.getGas(125)) + .fluidOutputs(Materials.Oxygen.getPlasma(125)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(4096) + .metadata(FUSION_THRESHOLD, 80000000) + .addTo(sFusionRecipes); // FT1 Expensive // + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Aluminium.getMolten(16), Materials.Lithium.getMolten(16)) + .fluidOutputs(Materials.Sulfur.getPlasma(144)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(10240) + .metadata(FUSION_THRESHOLD, 240000000) + .addTo(sFusionRecipes); // FT1+ Cheap + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Beryllium.getMolten(16), Materials.Deuterium.getGas(375)) + .fluidOutputs(Materials.Nitrogen.getPlasma(125)) + .duration(16 * TICKS) + .eut(16384) + .metadata(FUSION_THRESHOLD, 180000000) + .addTo(sFusionRecipes); // FT1+ Expensive // + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Silicon.getMolten(16), Materials.Magnesium.getMolten(16)) + .fluidOutputs(Materials.Iron.getPlasma(144)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(8192) + .metadata(FUSION_THRESHOLD, 360000000) + .addTo(sFusionRecipes); // FT1++ Cheap // + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Potassium.getMolten(16), Materials.Fluorine.getGas(144)) + .fluidOutputs(Materials.Nickel.getPlasma(144)) + .duration(16 * TICKS) + .eut(TierEU.RECIPE_LuV) + .metadata(FUSION_THRESHOLD, 480000000) + .addTo(sFusionRecipes); // FT1++ Expensive // + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Beryllium.getMolten(16), Materials.Tungsten.getMolten(16)) + .fluidOutputs(Materials.Platinum.getMolten(16)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(TierEU.RECIPE_LuV) + .metadata(FUSION_THRESHOLD, 150000000) + .addTo(sFusionRecipes); // FT1 - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Neodymium.getMolten(16), Materials.Hydrogen.getGas(48)) + .fluidOutputs(Materials.Europium.getMolten(16)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(24576) + .metadata(FUSION_THRESHOLD, 150000000) + .addTo(sFusionRecipes); // FT1 - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Lutetium.getMolten(16), Materials.Chrome.getMolten(16)) + .fluidOutputs(Materials.Americium.getMolten(16)) + .duration(4 * SECONDS + 16 * TICKS) + .eut(49152) + .metadata(FUSION_THRESHOLD, 200000000) + .addTo(sFusionRecipes); // FT2 - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Plutonium.getMolten(16), Materials.Thorium.getMolten(16)) + .fluidOutputs(Materials.Naquadah.getMolten(16)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(TierEU.RECIPE_LuV) + .metadata(FUSION_THRESHOLD, 300000000) + .addTo(sFusionRecipes); // FT1+ - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Americium.getMolten(144), Materials.Naquadria.getMolten(144)) + .fluidOutputs(Materials.Neutronium.getMolten(144)) + .duration(12 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .metadata(FUSION_THRESHOLD, 640000000) + .addTo(sFusionRecipes); // FT3 - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Glowstone.getMolten(16), Materials.Helium.getPlasma(4)) + .fluidOutputs(Materials.Sunnarium.getMolten(16)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(TierEU.RECIPE_IV) + .metadata(FUSION_THRESHOLD, 40000000) + .addTo(sFusionRecipes); // Mark 1 Expensive + // // + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Tungsten.getMolten(16), Materials.Helium.getGas(16)) + .fluidOutputs(Materials.Osmium.getMolten(16)) + .duration(12 * SECONDS + 16 * TICKS) + .eut(24578) + .metadata(FUSION_THRESHOLD, 150000000) + .addTo(sFusionRecipes); // FT1 - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Manganese.getMolten(16), Materials.Hydrogen.getGas(16)) + .fluidOutputs(Materials.Iron.getMolten(16)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(8192) + .metadata(FUSION_THRESHOLD, 120000000) + .addTo(sFusionRecipes); // FT1 - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Magnesium.getMolten(128), Materials.Oxygen.getGas(128)) + .fluidOutputs(Materials.Calcium.getPlasma(16)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(8192) + .metadata(FUSION_THRESHOLD, 120000000) + .addTo(sFusionRecipes); // + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Mercury.getFluid(16), Materials.Magnesium.getMolten(16)) + .fluidOutputs(Materials.Uranium.getMolten(16)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(49152) + .metadata(FUSION_THRESHOLD, 240000000) + .addTo(sFusionRecipes); // FT2 - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Gold.getMolten(16), Materials.Aluminium.getMolten(16)) + .fluidOutputs(Materials.Uranium.getMolten(16)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(49152) + .metadata(FUSION_THRESHOLD, 240000000) + .addTo(sFusionRecipes); // FT2 - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Uranium.getMolten(16), Materials.Helium.getGas(16)) + .fluidOutputs(Materials.Plutonium.getMolten(16)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(49152) + .metadata(FUSION_THRESHOLD, 480000000) + .addTo(sFusionRecipes); // FT2+ - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Vanadium.getMolten(16), Materials.Hydrogen.getGas(125)) + .fluidOutputs(Materials.Chrome.getMolten(16)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(24576) + .metadata(FUSION_THRESHOLD, 140000000) + .addTo(sFusionRecipes); // FT1 - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Gallium.getMolten(16), Materials.Radon.getGas(125)) + .fluidOutputs(Materials.Duranium.getMolten(16)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(16384) + .metadata(FUSION_THRESHOLD, 140000000) + .addTo(sFusionRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Titanium.getMolten(48), Materials.Duranium.getMolten(32)) + .fluidOutputs(Materials.Tritanium.getMolten(16)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(TierEU.RECIPE_LuV) + .metadata(FUSION_THRESHOLD, 200000000) + .addTo(sFusionRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Tantalum.getMolten(16), Materials.Tritium.getGas(16)) + .fluidOutputs(Materials.Tungsten.getMolten(16)) + .duration(16 * TICKS) + .eut(24576) + .metadata(FUSION_THRESHOLD, 200000000) + .addTo(sFusionRecipes); // + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Silver.getMolten(16), Materials.Lithium.getMolten(16)) + .fluidOutputs(Materials.Indium.getMolten(16)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(24576) + .metadata(FUSION_THRESHOLD, 380000000) + .addTo(sFusionRecipes); // // NEW RECIPES FOR FUSION - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Magnesium.getMolten(144), Materials.Carbon.getMolten(144)) - .fluidOutputs(Materials.Argon.getPlasma(125)).duration(1 * SECONDS + 12 * TICKS).eut(24576) - .metadata(FUSION_THRESHOLD, 180000000).addTo(sFusionRecipes); // FT1+ - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Copper.getMolten(72), Materials.Tritium.getGas(250)) - .fluidOutputs(Materials.Zinc.getPlasma(72)).duration(16 * TICKS).eut(49152) - .metadata(FUSION_THRESHOLD, 180000000).addTo(sFusionRecipes); // FT2 - farmable - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Cobalt.getMolten(144), Materials.Silicon.getMolten(144)) - .fluidOutputs(Materials.Niobium.getPlasma(144)).duration(16 * TICKS).eut(49152) - .metadata(FUSION_THRESHOLD, 200000000).addTo(sFusionRecipes); // FT2 - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Gold.getMolten(144), Materials.Arsenic.getMolten(144)) - .fluidOutputs(Materials.Silver.getPlasma(144)).duration(16 * TICKS).eut(49152) - .metadata(FUSION_THRESHOLD, 350000000).addTo(sFusionRecipes); // FT2+ - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Silver.getMolten(144), Materials.Helium_3.getGas(375)) - .fluidOutputs(Materials.Tin.getPlasma(144)).duration(16 * TICKS).eut(49152) - .metadata(FUSION_THRESHOLD, 280000000).addTo(sFusionRecipes); // FT2 - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Tungsten.getMolten(144), Materials.Carbon.getMolten(144)) - .fluidOutputs(Materials.Mercury.getPlasma(144)).duration(16 * TICKS).eut(49152) - .metadata(FUSION_THRESHOLD, 300000000).addTo(sFusionRecipes); // FT2 - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Tantalum.getMolten(144), Materials.Zinc.getPlasma(72)) - .fluidOutputs(Materials.Bismuth.getPlasma(144)).duration(16 * TICKS).eut(98304) - .metadata(FUSION_THRESHOLD, 350000000).addTo(sFusionRecipes); // FT3 - farmable - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Caesium.getMolten(144), Materials.Carbon.getMolten(144)) - .fluidOutputs(Materials.Promethium.getMolten(144)).duration(3 * SECONDS + 4 * TICKS).eut(49152) - .metadata(FUSION_THRESHOLD, 400000000).addTo(sFusionRecipes); // FT3 - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Iridium.getMolten(144), Materials.Fluorine.getGas(500)) - .fluidOutputs(Materials.Radon.getPlasma(144)).duration(1 * SECONDS + 12 * TICKS).eut(98304) - .metadata(FUSION_THRESHOLD, 450000000).addTo(sFusionRecipes); // FT3 - utility - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Plutonium241.getMolten(144), Materials.Hydrogen.getGas(2000)) - .fluidOutputs(Materials.Americium.getPlasma(144)).duration(3 * SECONDS + 4 * TICKS).eut(98304) - .metadata(FUSION_THRESHOLD, 500000000).addTo(sFusionRecipes); // FT3 + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Magnesium.getMolten(144), Materials.Carbon.getMolten(144)) + .fluidOutputs(Materials.Argon.getPlasma(125)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(24576) + .metadata(FUSION_THRESHOLD, 180000000) + .addTo(sFusionRecipes); // FT1+ - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Copper.getMolten(72), Materials.Tritium.getGas(250)) + .fluidOutputs(Materials.Zinc.getPlasma(72)) + .duration(16 * TICKS) + .eut(49152) + .metadata(FUSION_THRESHOLD, 180000000) + .addTo(sFusionRecipes); // FT2 - farmable + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Cobalt.getMolten(144), Materials.Silicon.getMolten(144)) + .fluidOutputs(Materials.Niobium.getPlasma(144)) + .duration(16 * TICKS) + .eut(49152) + .metadata(FUSION_THRESHOLD, 200000000) + .addTo(sFusionRecipes); // FT2 - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Gold.getMolten(144), Materials.Arsenic.getMolten(144)) + .fluidOutputs(Materials.Silver.getPlasma(144)) + .duration(16 * TICKS) + .eut(49152) + .metadata(FUSION_THRESHOLD, 350000000) + .addTo(sFusionRecipes); // FT2+ + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Silver.getMolten(144), Materials.Helium_3.getGas(375)) + .fluidOutputs(Materials.Tin.getPlasma(144)) + .duration(16 * TICKS) + .eut(49152) + .metadata(FUSION_THRESHOLD, 280000000) + .addTo(sFusionRecipes); // FT2 + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Tungsten.getMolten(144), Materials.Carbon.getMolten(144)) + .fluidOutputs(Materials.Mercury.getPlasma(144)) + .duration(16 * TICKS) + .eut(49152) + .metadata(FUSION_THRESHOLD, 300000000) + .addTo(sFusionRecipes); // FT2 + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Tantalum.getMolten(144), Materials.Zinc.getPlasma(72)) + .fluidOutputs(Materials.Bismuth.getPlasma(144)) + .duration(16 * TICKS) + .eut(98304) + .metadata(FUSION_THRESHOLD, 350000000) + .addTo(sFusionRecipes); // FT3 - farmable + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Caesium.getMolten(144), Materials.Carbon.getMolten(144)) + .fluidOutputs(Materials.Promethium.getMolten(144)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(49152) + .metadata(FUSION_THRESHOLD, 400000000) + .addTo(sFusionRecipes); // FT3 + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Iridium.getMolten(144), Materials.Fluorine.getGas(500)) + .fluidOutputs(Materials.Radon.getPlasma(144)) + .duration(1 * SECONDS + 12 * TICKS) + .eut(98304) + .metadata(FUSION_THRESHOLD, 450000000) + .addTo(sFusionRecipes); // FT3 - utility + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Plutonium241.getMolten(144), Materials.Hydrogen.getGas(2000)) + .fluidOutputs(Materials.Americium.getPlasma(144)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(98304) + .metadata(FUSION_THRESHOLD, 500000000) + .addTo(sFusionRecipes); // FT3 } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java index 365c11c01d..c25262933c 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java @@ -64,22 +64,43 @@ public class ImplosionCompressorRecipes implements Runnable { int tITNT = Math.max(1, tExplosives >> 2); // the best if (tGunpowder < 65) { - GT_Values.RA.stdBuilder().itemInputs(input, ItemList.Block_Powderbarrel.get(tGunpowder)) - .itemOutputs(outputs).noFluidInputs().noFluidOutputs().duration(1 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sImplosionRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(input, ItemList.Block_Powderbarrel.get(tGunpowder)) + .itemOutputs(outputs) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sImplosionRecipes); } if (tDynamite < 17) { - GT_Values.RA.stdBuilder().itemInputs(input, GT_ModHandler.getIC2Item("dynamite", tDynamite, null)) - .itemOutputs(outputs).noFluidInputs().noFluidOutputs().duration(1 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sImplosionRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(input, GT_ModHandler.getIC2Item("dynamite", tDynamite, null)) + .itemOutputs(outputs) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sImplosionRecipes); } - GT_Values.RA.stdBuilder().itemInputs(input, new ItemStack(Blocks.tnt, tTNT)).itemOutputs(outputs) - .noFluidInputs().noFluidOutputs().duration(1 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sImplosionRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(input, new ItemStack(Blocks.tnt, tTNT)) + .itemOutputs(outputs) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sImplosionRecipes); - GT_Values.RA.stdBuilder().itemInputs(input, GT_ModHandler.getIC2Item("industrialTnt", tITNT)) - .itemOutputs(outputs).noFluidInputs().noFluidOutputs().duration(1 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sImplosionRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(input, GT_ModHandler.getIC2Item("industrialTnt", tITNT)) + .itemOutputs(outputs) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sImplosionRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java index 3605c16785..6791780c0e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java @@ -13,25 +13,45 @@ public class LaserEngraverRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000)) - .fluidOutputs(Materials.ExcitedDTCC.getFluid(1000)).requiresCleanRoom() - .duration(41 * MINUTES + 40 * SECONDS).eut((int) TierEU.RECIPE_ZPM).addTo(sLaserEngraverRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000)) - .fluidOutputs(Materials.ExcitedDTPC.getFluid(1000)).requiresCleanRoom() - .duration(41 * MINUTES + 40 * SECONDS).eut((int) TierEU.RECIPE_UV).addTo(sLaserEngraverRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000)) - .fluidOutputs(Materials.ExcitedDTRC.getFluid(1000)).requiresCleanRoom() - .duration(41 * MINUTES + 40 * SECONDS).eut((int) TierEU.RECIPE_UHV).addTo(sLaserEngraverRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.DimensionallyTranscendentExoticCatalyst.getFluid(1000)) - .fluidOutputs(Materials.ExcitedDTEC.getFluid(1000)).requiresCleanRoom() - .duration(41 * MINUTES + 40 * SECONDS).eut((int) TierEU.RECIPE_UEV).addTo(sLaserEngraverRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000)) + .fluidOutputs(Materials.ExcitedDTCC.getFluid(1000)) + .requiresCleanRoom() + .duration(41 * MINUTES + 40 * SECONDS) + .eut((int) TierEU.RECIPE_ZPM) + .addTo(sLaserEngraverRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000)) + .fluidOutputs(Materials.ExcitedDTPC.getFluid(1000)) + .requiresCleanRoom() + .duration(41 * MINUTES + 40 * SECONDS) + .eut((int) TierEU.RECIPE_UV) + .addTo(sLaserEngraverRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000)) + .fluidOutputs(Materials.ExcitedDTRC.getFluid(1000)) + .requiresCleanRoom() + .duration(41 * MINUTES + 40 * SECONDS) + .eut((int) TierEU.RECIPE_UHV) + .addTo(sLaserEngraverRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.DimensionallyTranscendentExoticCatalyst.getFluid(1000)) + .fluidOutputs(Materials.ExcitedDTEC.getFluid(1000)) + .requiresCleanRoom() + .duration(41 * MINUTES + 40 * SECONDS) + .eut((int) TierEU.RECIPE_UEV) + .addTo(sLaserEngraverRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java index 544e398172..dc136d7f74 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java @@ -19,16 +19,26 @@ public class LatheRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.wooden_slab, 1, GT_Values.W)) - .itemOutputs( - new ItemStack(Items.bowl, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1)) - .noFluidInputs().noFluidOutputs().duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(sLatheRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.wooden_slab, 1, GT_Values.W)) + .itemOutputs( + new ItemStack(Items.bowl, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(8) + .addTo(sLatheRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Forestry.modID, "slabs", 1L, GT_Values.W)) - .itemOutputs( - new ItemStack(Items.bowl, 1), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1)) - .noFluidInputs().noFluidOutputs().duration(2 * SECONDS + 10 * TICKS).eut(8).addTo(sLatheRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Forestry.modID, "slabs", 1L, GT_Values.W)) + .itemOutputs( + new ItemStack(Items.bowl, 1), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(8) + .addTo(sLatheRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java index 4955440f58..9b4bcf87d9 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MatterAmplifierRecipes.java @@ -12,12 +12,22 @@ public class MatterAmplifierRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Scrap.get(9L)).noItemOutputs().noFluidInputs() - .fluidOutputs(Materials.UUAmplifier.getFluid(1)).duration(9 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sAmplifiers); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Scrap.get(9L)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.UUAmplifier.getFluid(1)) + .duration(9 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAmplifiers); - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Scrapbox.get(1L)).noItemOutputs().noFluidInputs() - .fluidOutputs(Materials.UUAmplifier.getFluid(1)).duration(9 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sAmplifiers); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Scrapbox.get(1L)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(Materials.UUAmplifier.getFluid(1)) + .duration(9 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sAmplifiers); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java index 34f3a437ac..fa0c97c2d0 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java @@ -43,1162 +43,1717 @@ public class MixerRecipes implements Runnable { registerSingleBlockAndMulti(); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnderPearl, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.EnderEye, OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(48).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.Electrum, 2L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.Invar, 3L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Invar, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Manganese, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.getDust(Materials.StainlessSteel, 9L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(45 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.Kanthal, 3L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.Brass, 4L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(2 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.Bronze, 4L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(2 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.Cupronickel, 2L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(24).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs( - GT_OreDictUnificator.getDust(Materials.SterlingSilver, 5L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(25 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Electrum, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.BlackBronze, 5L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(25 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.getDust(Materials.BismuthBronze, 5L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(25 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackBronze, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 3), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.BlackSteel, 5L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(25 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SterlingSilver, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BismuthBronze, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.RedSteel, 8L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(40 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RoseGold, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.BlueSteel, 8L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(40 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 15), - GT_Utility.getIntegratedCircuit(14)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.BlackSteel, 25L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 20), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 10), - GT_Utility.getIntegratedCircuit(15)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.RedSteel, 40L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 19), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 16), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 16), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 40), - GT_Utility.getIntegratedCircuit(16)) - .itemOutputs( - GT_OreDictUnificator.getDust(Materials.BlueSteel, 64L * OrePrefixes.dust.mMaterialAmount), - GT_OreDictUnificator.getDust(Materials.BlueSteel, 64L * OrePrefixes.dust.mMaterialAmount), - GT_OreDictUnificator.getDust(Materials.BlueSteel, 32L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(3 * MINUTES).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Molybdenum, 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.Ultimet, 9L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(45 * SECONDS).eut(500).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 7), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.CobaltBrass, 9L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(45 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 3), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Charcoal, 3), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 3), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator - .getDust(Materials.IndiumGalliumPhosphide, 3L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brick, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.Fireclay, 2L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.Nichrome, 5L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(25 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 3), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.Osmiridium, 4L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(2 * SECONDS).eut(2000).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Niobium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.getDust(Materials.NiobiumTitanium, 2L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(2000).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.getDust(Materials.VanadiumGallium, 4L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(2 * SECONDS).eut(2000).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.getDust(Materials.TungstenCarbide, 2L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(500).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs( - GT_OreDictUnificator.getDust(Materials.TungstenSteel, 2L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_EV) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.TPV, 7L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(8 * SECONDS + 15 * TICKS).eut(TierEU.RECIPE_EV) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Molybdenum, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.HSSG, 9L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 6), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Manganese, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.HSSE, 9L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(35 * SECONDS).eut(4096).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 6), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.getDust(Materials.HSSS, 9L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_IV).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4)) - .itemOutputs( - GT_OreDictUnificator.getDust(Materials.FerriteMixture, 6L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 7)) - .itemOutputs( - GT_OreDictUnificator - .getDust(Materials.BorosilicateGlass, 8L * OrePrefixes.dust.mMaterialAmount)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Items.rotten_flesh, 1, 0), - new ItemStack(Items.fermented_spider_eye, 1, 0), - ItemList.IC2_Scrap.get(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1)) - .itemOutputs(ItemList.Food_Chum.get(4)).fluidInputs(getFluidStack("potion.purpledrink", 750)) - .fluidOutputs(getFluidStack("sludge", 1000)).duration(6 * SECONDS + 8 * TICKS).eut(24) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1)) - .itemOutputs(ItemList.Food_Dough.get(2)).fluidInputs(Materials.Water.getFluid(1000)).noFluidOutputs() - .duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1), - ItemList.Food_PotatoChips.get(1)) - .itemOutputs(ItemList.Food_ChiliChips.get(1)).noFluidInputs().noFluidOutputs() - .duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Redstone, 5), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ruby, 4)) - .itemOutputs(ItemList.IC2_Energium_Dust.get(1)).noFluidInputs().noFluidOutputs().duration(15 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ruby, 4)) - .itemOutputs(ItemList.IC2_Energium_Dust.get(9)).noFluidInputs().noFluidOutputs().duration(30 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1), - new ItemStack(Blocks.brown_mushroom, 1), - new ItemStack(Items.spider_eye, 1)) - .itemOutputs(new ItemStack(Items.fermented_spider_eye, 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.LiveRoot, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IronWood, 2)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.LiveRoot, 9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IronWood, 18)).noFluidInputs() - .noFluidOutputs().duration(45 * SECONDS).eut(8).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Fluix, 2)) - .fluidInputs(Materials.Water.getFluid(500)).noFluidOutputs().duration(20 * TICKS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Fluix, 2)) - .fluidInputs(GT_ModHandler.getDistilledWater(500)).noFluidOutputs().duration(20 * TICKS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.IC2_Fertilizer.get(1), - new ItemStack(Blocks.dirt, 8, 32767), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)).fluidInputs(Materials.Water.getFluid(1000)) - .noFluidOutputs().duration(3 * SECONDS + 4 * TICKS).eut(16).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.FR_Fertilizer.get(1), - new ItemStack(Blocks.dirt, 8, 32767), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)).fluidInputs(Materials.Water.getFluid(1000)) - .noFluidOutputs().duration(3 * SECONDS + 4 * TICKS).eut(16).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.FR_Compost.get(1), - new ItemStack(Blocks.dirt, 8, 32767), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)).fluidInputs(Materials.Water.getFluid(1000)) - .noFluidOutputs().duration(3 * SECONDS + 4 * TICKS).eut(16).addTo(sMixerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnderPearl, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.getDust(Materials.EnderEye, OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(48) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.FR_Mulch.get(8), - new ItemStack(Blocks.dirt, 8, 32767), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)).fluidInputs(Materials.Water.getFluid(1000)) - .noFluidOutputs().duration(3 * SECONDS + 4 * TICKS).eut(16).addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.Electrum, 2L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.sand, 1, 32767), - new ItemStack(Blocks.dirt, 1, 32767), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(Forestry.modID, "soil", 2L, 1)).fluidInputs(Materials.Water.getFluid(250)) - .noFluidOutputs().duration(16 * TICKS).eut(16).addTo(sMixerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.getDust(Materials.Invar, 3L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 5), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 6)).noFluidInputs() - .noFluidOutputs().duration(16 * TICKS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Invar, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Manganese, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.getDust( + Materials.StainlessSteel, + 9L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(45 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 5), - Materials.Empty.getCells(1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 6)) - .fluidInputs(Materials.HeavyFuel.getFluid(1000)).noFluidOutputs().duration(16 * TICKS) - .eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.getDust(Materials.Kanthal, 3L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1), - Materials.Empty.getCells(5), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 6)) - .fluidInputs(Materials.LightFuel.getFluid(5000)).noFluidOutputs().duration(16 * TICKS) - .eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.getDust(Materials.Brass, 4L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 5), - GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(Materials.Empty.getCells(5)).fluidInputs(Materials.HeavyFuel.getFluid(1000)) - .fluidOutputs(Materials.Fuel.getFluid(6000)).duration(16 * TICKS).eut(TierEU.RECIPE_MV) - .addTo(sMixerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.getDust(Materials.Bronze, 4L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1), - GT_Utility.getIntegratedCircuit(6)) - .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(Materials.LightFuel.getFluid(5000)) - .fluidOutputs(Materials.Fuel.getFluid(6000)).duration(16 * TICKS).eut(TierEU.RECIPE_MV) - .addTo(sMixerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.Cupronickel, 2L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(24) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1)) - .itemOutputs(Materials.Empty.getCells(5)).fluidInputs(Materials.Lubricant.getFluid(20)) - .fluidOutputs(new FluidStack(ItemList.sDrillingFluid, 5000)).duration(3 * SECONDS + 4 * TICKS).eut(16) - .addTo(sMixerRecipes); - + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + GT_OreDictUnificator.getDust( + Materials.SterlingSilver, + 5L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1), - GT_Utility.getIntegratedCircuit(4)) - .noItemOutputs().fluidInputs(Materials.Water.getFluid(125)) - .fluidOutputs(getFluidStack("ic2coolant", 125)).duration(12 * SECONDS + 16 * TICKS).eut(48) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1), - GT_Utility.getIntegratedCircuit(4)) - .noItemOutputs().fluidInputs(GT_ModHandler.getDistilledWater(1000)) - .fluidOutputs(getFluidStack("ic2coolant", 1000)).duration(12 * SECONDS + 16 * TICKS).eut(48) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.SFMixture.get(4)).fluidInputs(Materials.AdvancedGlue.getFluid(200)) - .noFluidOutputs().duration(40 * SECONDS).eut(16).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.SFMixture.get(8)).fluidInputs(Materials.AdvancedGlue.getFluid(200)) - .noFluidOutputs().duration(40 * SECONDS).eut(16).addTo(sMixerRecipes); - + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Electrum, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.BlackBronze, 5L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Caesium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.SFMixture.get(12)).fluidInputs(Materials.AdvancedGlue.getFluid(200)) - .noFluidOutputs().duration(40 * SECONDS).eut(16).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.SFMixture.get(2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnderEye, 1)) - .itemOutputs(ItemList.MSFMixture.get(4)).fluidInputs(Materials.Mercury.getFluid(1000)).noFluidOutputs() - .duration(15 * SECONDS).eut(64).addTo(sMixerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.getDust( + Materials.BismuthBronze, + 5L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.SFMixture.get(1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1)) - .itemOutputs(ItemList.MSFMixture.get(1)).fluidInputs(Materials.Mercury.getFluid(500)).noFluidOutputs() - .duration(15 * SECONDS).eut(64).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 4), - ItemList.MSFMixture.get(24), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_MSSFUEL.get(4)).fluidInputs(Materials.NitroFuel.getFluid(4000)) - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 4), - ItemList.MSFMixture.get(16), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_MSSFUEL.get(4)).fluidInputs(Materials.NitroFuel.getFluid(3000)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 4), - ItemList.MSFMixture.get(8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_MSSFUEL.get(4)).fluidInputs(Materials.NitroFuel.getFluid(2000)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); - + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackBronze, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 3), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.BlackSteel, 5L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SterlingSilver, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BismuthBronze, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.RedSteel, 8L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 4), - ItemList.MSFMixture.get(24), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_MSSFUEL.get(4)).fluidInputs(Materials.GasolinePremium.getFluid(1600)) - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RoseGold, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.BlueSteel, 8L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 4), - ItemList.MSFMixture.get(16), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_MSSFUEL.get(4)).fluidInputs(Materials.GasolinePremium.getFluid(1200)) - .noFluidOutputs().duration(15 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 5), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 15), + GT_Utility.getIntegratedCircuit(14)) + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.BlackSteel, 25L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 4), - ItemList.MSFMixture.get(8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_MSSFUEL.get(4)).fluidInputs(Materials.GasolinePremium.getFluid(800)) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 20), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 10), + GT_Utility.getIntegratedCircuit(15)) + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.RedSteel, 40L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); - if (Thaumcraft.isModLoaded()) { - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 19), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 5), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.BlackSteel, 16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 40), + GT_Utility.getIntegratedCircuit(16)) + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.BlueSteel, 64L * OrePrefixes.dust.mMaterialAmount), + GT_OreDictUnificator.getDust(Materials.BlueSteel, 64L * OrePrefixes.dust.mMaterialAmount), + GT_OreDictUnificator.getDust(Materials.BlueSteel, 32L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * MINUTES) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 5), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Molybdenum, 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(GT_OreDictUnificator.getDust(Materials.Ultimet, 9L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(45 * SECONDS) + .eut(500) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() .itemInputs( - ItemList.SFMixture.get(20), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedAir, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brass, 7), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.MSFMixture.get(20)).fluidInputs(Materials.FierySteel.getFluid(50)) - .noFluidOutputs().duration(10 * SECONDS).eut(64).addTo(sMixerRecipes); + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.CobaltBrass, 9L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(45 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - ItemList.SFMixture.get(20), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedEarth, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 3), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.MSFMixture.get(20)).fluidInputs(Materials.FierySteel.getFluid(50)) - .noFluidOutputs().duration(10 * SECONDS).eut(64).addTo(sMixerRecipes); + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - ItemList.SFMixture.get(20), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedEntropy, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Charcoal, 3), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.MSFMixture.get(20)).fluidInputs(Materials.FierySteel.getFluid(50)) - .noFluidOutputs().duration(10 * SECONDS).eut(64).addTo(sMixerRecipes); + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - ItemList.SFMixture.get(20), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedFire, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 3), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.MSFMixture.get(20)).fluidInputs(Materials.FierySteel.getFluid(50)) - .noFluidOutputs().duration(10 * SECONDS).eut(64).addTo(sMixerRecipes); + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.Gunpowder, 6L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - ItemList.SFMixture.get(20), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedOrder, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.MSFMixture.get(20)).fluidInputs(Materials.FierySteel.getFluid(50)) - .noFluidOutputs().duration(10 * SECONDS).eut(64).addTo(sMixerRecipes); + .itemOutputs( + GT_OreDictUnificator.getDust( + Materials.IndiumGalliumPhosphide, + 3L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - ItemList.SFMixture.get(20), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedWater, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Brick, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1)) + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.Fireclay, 2L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.MSFMixture.get(20)).fluidInputs(Materials.FierySteel.getFluid(50)) - .noFluidOutputs().duration(10 * SECONDS).eut(64).addTo(sMixerRecipes); + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.Nichrome, 5L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); - FluidStack tFD = getFluidStack("fluiddeath", 30); - if (tFD != null && tFD.getFluid() != null && tFD.amount > 0) { - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 3), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.getDust(Materials.Osmiridium, 4L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS) + .eut(2000) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Niobium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.getDust( + Materials.NiobiumTitanium, + 2L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(2000) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.getDust( + Materials.VanadiumGallium, + 4L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS) + .eut(2000) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.getDust( + Materials.TungstenCarbide, + 2L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(500) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + GT_OreDictUnificator.getDust( + Materials.TungstenSteel, + 2L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.getDust(Materials.TPV, 7L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(8 * SECONDS + 15 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 5), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Molybdenum, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.getDust(Materials.HSSG, 9L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 6), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Manganese, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.getDust(Materials.HSSE, 9L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(35 * SECONDS) + .eut(4096) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 6), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(GT_OreDictUnificator.getDust(Materials.HSSS, 9L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4)) + .itemOutputs( + GT_OreDictUnificator.getDust( + Materials.FerriteMixture, + 6L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 7)) + .itemOutputs( + GT_OreDictUnificator.getDust( + Materials.BorosilicateGlass, + 8L * OrePrefixes.dust.mMaterialAmount)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Items.rotten_flesh, 1, 0), + new ItemStack(Items.fermented_spider_eye, 1, 0), + ItemList.IC2_Scrap.get(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1)) + .itemOutputs(ItemList.Food_Chum.get(4)) + .fluidInputs(getFluidStack("potion.purpledrink", 750)) + .fluidOutputs(getFluidStack("sludge", 1000)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(24) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1)) + .itemOutputs(ItemList.Food_Dough.get(2)) + .fluidInputs(Materials.Water.getFluid(1000)) + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(8) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1), + ItemList.Food_PotatoChips.get(1)) + .itemOutputs(ItemList.Food_ChiliChips.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(8) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Redstone, 5), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ruby, 4)) + .itemOutputs(ItemList.IC2_Energium_Dust.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 5), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ruby, 4)) + .itemOutputs(ItemList.IC2_Energium_Dust.get(9)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1), + new ItemStack(Blocks.brown_mushroom, 1), + new ItemStack(Items.spider_eye, 1)) + .itemOutputs(new ItemStack(Items.fermented_spider_eye, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.LiveRoot, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IronWood, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 9), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.LiveRoot, 9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IronWood, 18)) + .noFluidInputs() + .noFluidOutputs() + .duration(45 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Fluix, 2)) + .fluidInputs(Materials.Water.getFluid(500)) + .noFluidOutputs() + .duration(20 * TICKS) + .eut(16) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Fluix, 2)) + .fluidInputs(GT_ModHandler.getDistilledWater(500)) + .noFluidOutputs() + .duration(20 * TICKS) + .eut(16) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.IC2_Fertilizer.get(1), + new ItemStack(Blocks.dirt, 8, 32767), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)) + .fluidInputs(Materials.Water.getFluid(1000)) + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.FR_Fertilizer.get(1), + new ItemStack(Blocks.dirt, 8, 32767), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)) + .fluidInputs(Materials.Water.getFluid(1000)) + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.FR_Compost.get(1), + new ItemStack(Blocks.dirt, 8, 32767), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)) + .fluidInputs(Materials.Water.getFluid(1000)) + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.FR_Mulch.get(8), + new ItemStack(Blocks.dirt, 8, 32767), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Forestry.modID, "soil", 8L, 0)) + .fluidInputs(Materials.Water.getFluid(1000)) + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.sand, 1, 32767), + new ItemStack(Blocks.dirt, 1, 32767), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(getModItem(Forestry.modID, "soil", 2L, 1)) + .fluidInputs(Materials.Water.getFluid(250)) + .noFluidOutputs() + .duration(16 * TICKS) + .eut(16) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 5), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 6)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 5), + Materials.Empty.getCells(1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 6)) + .fluidInputs(Materials.HeavyFuel.getFluid(1000)) + .noFluidOutputs() + .duration(16 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1), + Materials.Empty.getCells(5), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 6)) + .fluidInputs(Materials.LightFuel.getFluid(5000)) + .noFluidOutputs() + .duration(16 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 5), + GT_Utility.getIntegratedCircuit(5)) + .itemOutputs(Materials.Empty.getCells(5)) + .fluidInputs(Materials.HeavyFuel.getFluid(1000)) + .fluidOutputs(Materials.Fuel.getFluid(6000)) + .duration(16 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1), + GT_Utility.getIntegratedCircuit(6)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.LightFuel.getFluid(5000)) + .fluidOutputs(Materials.Fuel.getFluid(6000)) + .duration(16 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 5), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1)) + .itemOutputs(Materials.Empty.getCells(5)) + .fluidInputs(Materials.Lubricant.getFluid(20)) + .fluidOutputs(new FluidStack(ItemList.sDrillingFluid, 5000)) + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1), + GT_Utility.getIntegratedCircuit(4)) + .noItemOutputs() + .fluidInputs(Materials.Water.getFluid(125)) + .fluidOutputs(getFluidStack("ic2coolant", 125)) + .duration(12 * SECONDS + 16 * TICKS) + .eut(48) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 1), + GT_Utility.getIntegratedCircuit(4)) + .noItemOutputs() + .fluidInputs(GT_ModHandler.getDistilledWater(1000)) + .fluidOutputs(getFluidStack("ic2coolant", 1000)) + .duration(12 * SECONDS + 16 * TICKS) + .eut(48) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.SFMixture.get(4)) + .fluidInputs(Materials.AdvancedGlue.getFluid(200)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.SFMixture.get(8)) + .fluidInputs(Materials.AdvancedGlue.getFluid(200)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Caesium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.SFMixture.get(12)) + .fluidInputs(Materials.AdvancedGlue.getFluid(200)) + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.SFMixture.get(2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.EnderEye, 1)) + .itemOutputs(ItemList.MSFMixture.get(4)) + .fluidInputs(Materials.Mercury.getFluid(1000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(64) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.SFMixture.get(1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1)) + .itemOutputs(ItemList.MSFMixture.get(1)) + .fluidInputs(Materials.Mercury.getFluid(500)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(64) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 4), + ItemList.MSFMixture.get(24), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_MSSFUEL.get(4)) + .fluidInputs(Materials.NitroFuel.getFluid(4000)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 4), + ItemList.MSFMixture.get(16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_MSSFUEL.get(4)) + .fluidInputs(Materials.NitroFuel.getFluid(3000)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 4), + ItemList.MSFMixture.get(8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_MSSFUEL.get(4)) + .fluidInputs(Materials.NitroFuel.getFluid(2000)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 4), + ItemList.MSFMixture.get(24), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_MSSFUEL.get(4)) + .fluidInputs(Materials.GasolinePremium.getFluid(1600)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 4), + ItemList.MSFMixture.get(16), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_MSSFUEL.get(4)) + .fluidInputs(Materials.GasolinePremium.getFluid(1200)) + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 4), + ItemList.MSFMixture.get(8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Diamond, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_MSSFUEL.get(4)) + .fluidInputs(Materials.GasolinePremium.getFluid(800)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + if (Thaumcraft.isModLoaded()) { + GT_Values.RA.stdBuilder() .itemInputs( - ItemList.SFMixture.get(30), + ItemList.SFMixture.get(20), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedAir, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.MSFMixture.get(30)).fluidInputs(tFD).noFluidOutputs() - .duration(10 * SECONDS).eut(64).addTo(sMixerRecipes); + .itemOutputs(ItemList.MSFMixture.get(20)) + .fluidInputs(Materials.FierySteel.getFluid(50)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - ItemList.SFMixture.get(30), + ItemList.SFMixture.get(20), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedEarth, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.MSFMixture.get(30)).fluidInputs(tFD).noFluidOutputs() - .duration(10 * SECONDS).eut(64).addTo(sMixerRecipes); + .itemOutputs(ItemList.MSFMixture.get(20)) + .fluidInputs(Materials.FierySteel.getFluid(50)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - ItemList.SFMixture.get(30), + ItemList.SFMixture.get(20), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedEntropy, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.MSFMixture.get(30)).fluidInputs(tFD).noFluidOutputs() - .duration(10 * SECONDS).eut(64).addTo(sMixerRecipes); + .itemOutputs(ItemList.MSFMixture.get(20)) + .fluidInputs(Materials.FierySteel.getFluid(50)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - ItemList.SFMixture.get(30), + ItemList.SFMixture.get(20), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedFire, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.MSFMixture.get(30)).fluidInputs(tFD).noFluidOutputs() - .duration(10 * SECONDS).eut(64).addTo(sMixerRecipes); + .itemOutputs(ItemList.MSFMixture.get(20)) + .fluidInputs(Materials.FierySteel.getFluid(50)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - ItemList.SFMixture.get(30), + ItemList.SFMixture.get(20), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedOrder, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.MSFMixture.get(30)).fluidInputs(tFD).noFluidOutputs() - .duration(10 * SECONDS).eut(64).addTo(sMixerRecipes); + .itemOutputs(ItemList.MSFMixture.get(20)) + .fluidInputs(Materials.FierySteel.getFluid(50)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - ItemList.SFMixture.get(30), + ItemList.SFMixture.get(20), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedWater, 1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.MSFMixture.get(30)).fluidInputs(tFD).noFluidOutputs() - .duration(10 * SECONDS).eut(64).addTo(sMixerRecipes); + .itemOutputs(ItemList.MSFMixture.get(20)) + .fluidInputs(Materials.FierySteel.getFluid(50)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sMixerRecipes); + FluidStack tFD = getFluidStack("fluiddeath", 30); + if (tFD != null && tFD.getFluid() != null && tFD.amount > 0) { GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), - ItemList.MSFMixture.get(6), - getModItem(Thaumcraft.modID, "ItemResource", 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_MSSFUEL.get(1)).fluidInputs(Materials.NitroFuel.getFluid(1000)) - .noFluidOutputs().duration(7 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + .itemInputs( + ItemList.SFMixture.get(30), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedAir, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.MSFMixture.get(30)) + .fluidInputs(tFD) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), - ItemList.MSFMixture.get(4), - getModItem(Thaumcraft.modID, "ItemResource", 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_MSSFUEL.get(1)).fluidInputs(Materials.NitroFuel.getFluid(750)) - .noFluidOutputs().duration(6 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + .itemInputs( + ItemList.SFMixture.get(30), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedEarth, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.MSFMixture.get(30)) + .fluidInputs(tFD) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), - ItemList.MSFMixture.get(2), - getModItem(Thaumcraft.modID, "ItemResource", 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_MSSFUEL.get(1)).fluidInputs(Materials.NitroFuel.getFluid(500)) - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + .itemInputs( + ItemList.SFMixture.get(30), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedEntropy, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.MSFMixture.get(30)) + .fluidInputs(tFD) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), - ItemList.MSFMixture.get(6), - getModItem(Thaumcraft.modID, "ItemResource", 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_MSSFUEL.get(1)).fluidInputs(Materials.GasolinePremium.getFluid(400)) - .noFluidOutputs().duration(7 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + .itemInputs( + ItemList.SFMixture.get(30), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedFire, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.MSFMixture.get(30)) + .fluidInputs(tFD) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), - ItemList.MSFMixture.get(4), - getModItem(Thaumcraft.modID, "ItemResource", 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_MSSFUEL.get(1)).fluidInputs(Materials.GasolinePremium.getFluid(300)) - .noFluidOutputs().duration(6 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + .itemInputs( + ItemList.SFMixture.get(30), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedOrder, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.MSFMixture.get(30)) + .fluidInputs(tFD) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), - ItemList.MSFMixture.get(2), - getModItem(Thaumcraft.modID, "ItemResource", 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_MSSFUEL.get(1)).fluidInputs(Materials.GasolinePremium.getFluid(200)) - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + .itemInputs( + ItemList.SFMixture.get(30), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.InfusedWater, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.MSFMixture.get(30)) + .fluidInputs(tFD) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(64) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), + ItemList.MSFMixture.get(6), + getModItem(Thaumcraft.modID, "ItemResource", 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_MSSFUEL.get(1)) + .fluidInputs(Materials.NitroFuel.getFluid(1000)) + .noFluidOutputs() + .duration(7 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), + ItemList.MSFMixture.get(4), + getModItem(Thaumcraft.modID, "ItemResource", 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_MSSFUEL.get(1)) + .fluidInputs(Materials.NitroFuel.getFluid(750)) + .noFluidOutputs() + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), + ItemList.MSFMixture.get(2), + getModItem(Thaumcraft.modID, "ItemResource", 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_MSSFUEL.get(1)) + .fluidInputs(Materials.NitroFuel.getFluid(500)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), + ItemList.MSFMixture.get(6), + getModItem(Thaumcraft.modID, "ItemResource", 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_MSSFUEL.get(1)) + .fluidInputs(Materials.GasolinePremium.getFluid(400)) + .noFluidOutputs() + .duration(7 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), + ItemList.MSFMixture.get(4), + getModItem(Thaumcraft.modID, "ItemResource", 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_MSSFUEL.get(1)) + .fluidInputs(Materials.GasolinePremium.getFluid(300)) + .noFluidOutputs() + .duration(6 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), + ItemList.MSFMixture.get(2), + getModItem(Thaumcraft.modID, "ItemResource", 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_MSSFUEL.get(1)) + .fluidInputs(Materials.GasolinePremium.getFluid(200)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); } } GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), - ItemList.SFMixture.get(6), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_SSFUEL.get(1)).fluidInputs(Materials.NitroFuel.getFluid(1000)) - .noFluidOutputs().duration(7 * SECONDS).eut(250).addTo(sMixerRecipes); - + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), + ItemList.SFMixture.get(6), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_SSFUEL.get(1)) + .fluidInputs(Materials.NitroFuel.getFluid(1000)) + .noFluidOutputs() + .duration(7 * SECONDS) + .eut(250) + .addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), - ItemList.SFMixture.get(4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_SSFUEL.get(1)).fluidInputs(Materials.NitroFuel.getFluid(750)) - .noFluidOutputs().duration(6 * SECONDS).eut(250).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), - ItemList.SFMixture.get(2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_SSFUEL.get(1)).fluidInputs(Materials.NitroFuel.getFluid(500)) - .noFluidOutputs().duration(5 * SECONDS).eut(250).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), - ItemList.SFMixture.get(6), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_SSFUEL.get(1)).fluidInputs(Materials.GasolinePremium.getFluid(400)) - .noFluidOutputs().duration(7 * SECONDS).eut(250).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), - ItemList.SFMixture.get(4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_SSFUEL.get(1)).fluidInputs(Materials.GasolinePremium.getFluid(300)) - .noFluidOutputs().duration(6 * SECONDS).eut(250).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), - ItemList.SFMixture.get(2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_SSFUEL.get(1)).fluidInputs(Materials.GasolinePremium.getFluid(200)) - .noFluidOutputs().duration(5 * SECONDS).eut(250).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Cell_Empty.get(1)).fluidInputs(Materials.NitricAcid.getFluid(1000)) - .fluidOutputs(new FluidStack(ItemList.sNitrationMixture, 2000)).duration(24 * SECONDS).eut(2) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitricAcid, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitrationMixture, 2)).noFluidInputs() - .noFluidOutputs().duration(24 * SECONDS).eut(2).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 32767), - new ItemStack(Items.wheat, 4, 32767), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - new ItemStack(Items.wheat, 4, 32767), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 32767), - getModItem(BiomesOPlanty.modID, "plants", 4, 6), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(BiomesOPlanty.modID, "plants", 4, 6), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 32767), - getModItem(PamsHarvestCraft.modID, "oatsItem", 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.modID, "oatsItem", 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 32767), - getModItem(PamsHarvestCraft.modID, "ryeItem", 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.modID, "ryeItem", 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 32767), - getModItem(PamsHarvestCraft.modID, "barleyItem", 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(PamsHarvestCraft.modID, "barleyItem", 4, 6), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 32767), - getModItem(Natura.modID, "barleyFood", 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - getModItem(Natura.modID, "barleyFood", 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 32767), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - new ItemStack(Blocks.dirt, 1, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4), - GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) - .fluidInputs(Materials.Water.getFluid(100)).noFluidOutputs().duration(10 * SECONDS).eut(16) - .addTo(sMixerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), + ItemList.SFMixture.get(4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_SSFUEL.get(1)) + .fluidInputs(Materials.NitroFuel.getFluid(750)) + .noFluidOutputs() + .duration(6 * SECONDS) + .eut(250) + .addTo(sMixerRecipes); - // radiation manufacturing + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), + ItemList.SFMixture.get(2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_SSFUEL.get(1)) + .fluidInputs(Materials.NitroFuel.getFluid(500)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(250) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("fuelRod", 1), new ItemStack(Items.glowstone_dust, 9), NI, NI) - .itemOutputs(ItemList.GlowstoneCell.get(1)).fluidInputs(Materials.Helium.getGas(250)).fluidOutputs(NF) - .duration(1 * SECONDS + 10 * TICKS).eut(16).addTo(sMixerRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Lignite, 1), + ItemList.SFMixture.get(6), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_SSFUEL.get(1)) + .fluidInputs(Materials.GasolinePremium.getFluid(400)) + .noFluidOutputs() + .duration(7 * SECONDS) + .eut(250) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(MaterialsOreAlum.SluiceSand.getDust(1)).noItemOutputs() - .fluidInputs(Materials.Water.getFluid(500)).fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(1000)) - .duration(5 * SECONDS).eut(16).addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Charcoal, 1), + ItemList.SFMixture.get(4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_SSFUEL.get(1)) + .fluidInputs(Materials.GasolinePremium.getFluid(300)) + .noFluidOutputs() + .duration(6 * SECONDS) + .eut(250) + .addTo(sMixerRecipes); - // NaCl + H2O = (NaCl·H2O) + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 1), + ItemList.SFMixture.get(2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_SSFUEL.get(1)) + .fluidInputs(Materials.GasolinePremium.getFluid(200)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(250) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Salt.getDust(2), GT_Utility.getIntegratedCircuit(3)) - .noItemOutputs().fluidInputs(Materials.Water.getFluid(1000)) - .fluidOutputs(Materials.SaltWater.getFluid(1000)).duration(5 * SECONDS).eut(8).addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Cell_Empty.get(1)) + .fluidInputs(Materials.NitricAcid.getFluid(1000)) + .fluidOutputs(new FluidStack(ItemList.sNitrationMixture, 2000)) + .duration(24 * SECONDS) + .eut(2) + .addTo(sMixerRecipes); - // CaCO3 + 2 CH3COOH = Ca(CH3COO)2 + H2O + CO2 + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1), + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitricAcid, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitrationMixture, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(24 * SECONDS) + .eut(2) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - Materials.Calcite.getDust(5), - Materials.Empty.getCells(2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Water.getCells(1), Materials.CarbonDioxide.getCells(1)) - .fluidInputs(Materials.AceticAcid.getFluid(2000)) - .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000)).duration(12 * SECONDS).eut(16) - .addTo(sMixerRecipes); + .itemInputs( + new ItemStack(Blocks.dirt, 1, 32767), + new ItemStack(Items.wheat, 4, 32767), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - Materials.Calcite.getDust(5), - Materials.Empty.getCells(2), - GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.CalciumAcetateSolution.getCells(1), Materials.CarbonDioxide.getCells(1)) - .fluidInputs(Materials.AceticAcid.getFluid(2000)).fluidOutputs(Materials.Water.getFluid(1000)) - .duration(12 * SECONDS).eut(16).addTo(sMixerRecipes); + .itemInputs( + new ItemStack(Blocks.dirt, 1, 2), + new ItemStack(Items.wheat, 4, 32767), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - Materials.Calcite.getDust(5), - Materials.Empty.getCells(2), - GT_Utility.getIntegratedCircuit(21)) - .itemOutputs(Materials.Water.getCells(1), Materials.CalciumAcetateSolution.getCells(1)) - .fluidInputs(Materials.AceticAcid.getFluid(2000)).fluidOutputs(Materials.CarbonDioxide.getGas(1000)) - .duration(12 * SECONDS).eut(16).addTo(sMixerRecipes); + .itemInputs( + new ItemStack(Blocks.dirt, 1, 32767), + getModItem(BiomesOPlanty.modID, "plants", 4, 6), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - Materials.Calcite.getDust(5), - Materials.Empty.getCells(1), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(Materials.CarbonDioxide.getCells(1)).fluidInputs(Materials.AceticAcid.getFluid(2000)) - .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000)).duration(12 * SECONDS).eut(16) - .addTo(sMixerRecipes); + .itemInputs( + new ItemStack(Blocks.dirt, 1, 2), + getModItem(BiomesOPlanty.modID, "plants", 4, 6), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - Materials.Calcite.getDust(5), - Materials.Empty.getCells(1), - GT_Utility.getIntegratedCircuit(14)) - .itemOutputs(Materials.CalciumAcetateSolution.getCells(1)) - .fluidInputs(Materials.AceticAcid.getFluid(2000)).fluidOutputs(Materials.CarbonDioxide.getGas(1000)) - .duration(12 * SECONDS).eut(16).addTo(sMixerRecipes); + .itemInputs( + new ItemStack(Blocks.dirt, 1, 32767), + getModItem(PamsHarvestCraft.modID, "oatsItem", 4), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); - // Ca + 2 CH3COOH = Ca(CH3COO)2 + 2H + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.dirt, 1, 2), + getModItem(PamsHarvestCraft.modID, "oatsItem", 4), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - Materials.Calcium.getDust(1), - Materials.Empty.getCells(2), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Hydrogen.getCells(2)).fluidInputs(Materials.AceticAcid.getFluid(2000)) - .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000)).duration(4 * SECONDS).eut(16) - .addTo(sMixerRecipes); + .itemInputs( + new ItemStack(Blocks.dirt, 1, 32767), + getModItem(PamsHarvestCraft.modID, "ryeItem", 4), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - Materials.Calcium.getDust(1), - Materials.Empty.getCells(1), - GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.CalciumAcetateSolution.getCells(1)) - .fluidInputs(Materials.AceticAcid.getFluid(2000)).fluidOutputs(Materials.Hydrogen.getGas(2000)) - .duration(4 * SECONDS).eut(16).addTo(sMixerRecipes); + .itemInputs( + new ItemStack(Blocks.dirt, 1, 2), + getModItem(PamsHarvestCraft.modID, "ryeItem", 4), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); - // CaO + 2 CH3COOH = Ca(CH3COO)2 + H2O + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.dirt, 1, 32767), + getModItem(PamsHarvestCraft.modID, "barleyItem", 4), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - Materials.Quicklime.getDust(2), - Materials.Empty.getCells(1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Water.getCells(1)).fluidInputs(Materials.AceticAcid.getFluid(2000)) - .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000)).duration(4 * SECONDS).eut(16) - .addTo(sMixerRecipes); + .itemInputs( + new ItemStack(Blocks.dirt, 1, 2), + getModItem(PamsHarvestCraft.modID, "barleyItem", 4, 6), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - Materials.Quicklime.getDust(2), - Materials.Empty.getCells(1), - GT_Utility.getIntegratedCircuit(11)) - .itemOutputs(Materials.CalciumAcetateSolution.getCells(1)) - .fluidInputs(Materials.AceticAcid.getFluid(2000)).fluidOutputs(Materials.Water.getFluid(1000)) - .duration(4 * SECONDS).eut(16).addTo(sMixerRecipes); + .itemInputs( + new ItemStack(Blocks.dirt, 1, 32767), + getModItem(Natura.modID, "barleyFood", 4), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); - // 2CH3COOCH3 + 3CH3COCH3/(C4H6O2)n = 5Glue + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.dirt, 1, 2), + getModItem(Natura.modID, "barleyFood", 4), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Acetone.getCells(3)).itemOutputs(Materials.Empty.getCells(3)) - .fluidInputs(Materials.PolyvinylAcetate.getFluid(2000)) - .fluidOutputs(Materials.AdvancedGlue.getFluid(5000)).duration(5 * SECONDS).eut(8).addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.dirt, 1, 32767), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.PolyvinylAcetate.getCells(2)) - .itemOutputs(Materials.Empty.getCells(2)).fluidInputs(Materials.Acetone.getFluid(3000)) - .fluidOutputs(Materials.AdvancedGlue.getFluid(5000)).duration(5 * SECONDS).eut(8).addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Blocks.dirt, 1, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(getModItem(Forestry.modID, "fertilizerBio", 1L, 0)) + .fluidInputs(Materials.Water.getFluid(100)) + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.MethylAcetate.getCells(3)) - .itemOutputs(Materials.Empty.getCells(3)).fluidInputs(Materials.PolyvinylAcetate.getFluid(2000)) - .fluidOutputs(Materials.AdvancedGlue.getFluid(5000)).duration(5 * SECONDS).eut(8).addTo(sMixerRecipes); + // radiation manufacturing - GT_Values.RA.stdBuilder().itemInputs(Materials.PolyvinylAcetate.getCells(2)) - .itemOutputs(Materials.Empty.getCells(2)).fluidInputs(Materials.MethylAcetate.getFluid(3000)) - .fluidOutputs(Materials.AdvancedGlue.getFluid(5000)).duration(5 * SECONDS).eut(8).addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("fuelRod", 1), new ItemStack(Items.glowstone_dust, 9), NI, NI) + .itemOutputs(ItemList.GlowstoneCell.get(1)) + .fluidInputs(Materials.Helium.getGas(250)) + .fluidOutputs(NF) + .duration(1 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Sugar.getDust(4)).itemOutputs(Materials.Charcoal.getGems(1)) - .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)).duration(60 * SECONDS).eut(2) - .addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(MaterialsOreAlum.SluiceSand.getDust(1)) + .noItemOutputs() + .fluidInputs(Materials.Water.getFluid(500)) + .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(1000)) + .duration(5 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Wood.getDust(4)).itemOutputs(Materials.Charcoal.getGems(1)) - .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) - .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)).duration(60 * SECONDS).eut(2) - .addTo(sMixerRecipes); + // NaCl + H2O = (NaCl·H2O) - GT_Values.RA.stdBuilder().itemInputs(Materials.Fuel.getCells(1)).itemOutputs(Materials.Empty.getCells(1)) - .fluidInputs(Materials.Tetranitromethane.getFluid(20)).fluidOutputs(Materials.NitroFuel.getFluid(1000)) - .duration(20 * TICKS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Salt.getDust(2), GT_Utility.getIntegratedCircuit(3)) + .noItemOutputs() + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(Materials.SaltWater.getFluid(1000)) + .duration(5 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.BioDiesel.getCells(1)).itemOutputs(Materials.Empty.getCells(1)) - .fluidInputs(Materials.Tetranitromethane.getFluid(40)).fluidOutputs(Materials.NitroFuel.getFluid(900)) - .duration(20 * TICKS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + // CaCO3 + 2 CH3COOH = Ca(CH3COO)2 + H2O + CO2 - // CH4O + C4H8 = C5H12O + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.Calcite.getDust(5), + Materials.Empty.getCells(2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Water.getCells(1), Materials.CarbonDioxide.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(2000)) + .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000)) + .duration(12 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Methanol.getCells(1), Materials.Butene.getCells(1)) - .itemOutputs(Materials.MTBEMixture.getCells(1), Materials.Empty.getCells(1)).noFluidInputs() - .noFluidOutputs().duration(20 * TICKS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.Calcite.getDust(5), + Materials.Empty.getCells(2), + GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.CalciumAcetateSolution.getCells(1), Materials.CarbonDioxide.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(2000)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(12 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - Materials.Naphtha.getCells(16), - Materials.Gas.getCells(2), - Materials.Methanol.getCells(1), - Materials.Acetone.getCells(1)) - .itemOutputs(Materials.GasolineRaw.getCells(20)).noFluidInputs().noFluidOutputs().duration(5 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + .itemInputs( + Materials.Calcite.getDust(5), + Materials.Empty.getCells(2), + GT_Utility.getIntegratedCircuit(21)) + .itemOutputs(Materials.Water.getCells(1), Materials.CalciumAcetateSolution.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(2000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - Materials.GasolineRegular.getCells(20), - Materials.Octane.getCells(2), - Materials.NitrousOxide.getCells(6), - Materials.Toluene.getCells(1)) - .itemOutputs(Materials.Empty.getCells(29)).fluidInputs(Materials.AntiKnock.getFluid(3000)) - .fluidOutputs(Materials.GasolinePremium.getFluid(32000)).duration(2 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_EV).addTo(sMixerRecipes); + .itemInputs( + Materials.Calcite.getDust(5), + Materials.Empty.getCells(1), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(Materials.CarbonDioxide.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(2000)) + .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000)) + .duration(12 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); - if (Railcraft.isModLoaded()) { - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - EnumCube.COKE_BLOCK.getItem(), - ItemList.SFMixture.get(2), + Materials.Calcite.getDust(5), + Materials.Empty.getCells(1), + GT_Utility.getIntegratedCircuit(14)) + .itemOutputs(Materials.CalciumAcetateSolution.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(2000)) + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .duration(12 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); + + // Ca + 2 CH3COOH = Ca(CH3COO)2 + 2H + + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.Calcium.getDust(1), + Materials.Empty.getCells(2), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_SSFUEL.get(1)).fluidInputs(Materials.NitroFuel.getFluid(300)) - .noFluidOutputs().duration(5 * SECONDS).eut(250).addTo(sMixerRecipes); + .itemOutputs(Materials.Hydrogen.getCells(2)) + .fluidInputs(Materials.AceticAcid.getFluid(2000)) + .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000)) + .duration(4 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); - GT_Values.RA.stdBuilder() + GT_Values.RA.stdBuilder() .itemInputs( - EnumCube.COKE_BLOCK.getItem(), - ItemList.SFMixture.get(2), + Materials.Calcium.getDust(1), + Materials.Empty.getCells(1), + GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.CalciumAcetateSolution.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(2000)) + .fluidOutputs(Materials.Hydrogen.getGas(2000)) + .duration(4 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); + + // CaO + 2 CH3COOH = Ca(CH3COO)2 + H2O + + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.Quicklime.getDust(2), + Materials.Empty.getCells(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_SSFUEL.get(1)).fluidInputs(Materials.GasolinePremium.getFluid(120)) - .noFluidOutputs().duration(5 * SECONDS).eut(250).addTo(sMixerRecipes); + .itemOutputs(Materials.Water.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(2000)) + .fluidOutputs(Materials.CalciumAcetateSolution.getFluid(1000)) + .duration(4 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.Quicklime.getDust(2), + Materials.Empty.getCells(1), + GT_Utility.getIntegratedCircuit(11)) + .itemOutputs(Materials.CalciumAcetateSolution.getCells(1)) + .fluidInputs(Materials.AceticAcid.getFluid(2000)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(4 * SECONDS) + .eut(16) + .addTo(sMixerRecipes); + + // 2CH3COOCH3 + 3CH3COCH3/(C4H6O2)n = 5Glue + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Acetone.getCells(3)) + .itemOutputs(Materials.Empty.getCells(3)) + .fluidInputs(Materials.PolyvinylAcetate.getFluid(2000)) + .fluidOutputs(Materials.AdvancedGlue.getFluid(5000)) + .duration(5 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.PolyvinylAcetate.getCells(2)) + .itemOutputs(Materials.Empty.getCells(2)) + .fluidInputs(Materials.Acetone.getFluid(3000)) + .fluidOutputs(Materials.AdvancedGlue.getFluid(5000)) + .duration(5 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.MethylAcetate.getCells(3)) + .itemOutputs(Materials.Empty.getCells(3)) + .fluidInputs(Materials.PolyvinylAcetate.getFluid(2000)) + .fluidOutputs(Materials.AdvancedGlue.getFluid(5000)) + .duration(5 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.PolyvinylAcetate.getCells(2)) + .itemOutputs(Materials.Empty.getCells(2)) + .fluidInputs(Materials.MethylAcetate.getFluid(3000)) + .fluidOutputs(Materials.AdvancedGlue.getFluid(5000)) + .duration(5 * SECONDS) + .eut(8) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Sugar.getDust(4)) + .itemOutputs(Materials.Charcoal.getGems(1)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)) + .duration(60 * SECONDS) + .eut(2) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Wood.getDust(4)) + .itemOutputs(Materials.Charcoal.getGems(1)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .fluidOutputs(Materials.DilutedSulfuricAcid.getFluid(1000)) + .duration(60 * SECONDS) + .eut(2) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Fuel.getCells(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Tetranitromethane.getFluid(20)) + .fluidOutputs(Materials.NitroFuel.getFluid(1000)) + .duration(20 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.BioDiesel.getCells(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Tetranitromethane.getFluid(40)) + .fluidOutputs(Materials.NitroFuel.getFluid(900)) + .duration(20 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + // CH4O + C4H8 = C5H12O + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Methanol.getCells(1), Materials.Butene.getCells(1)) + .itemOutputs(Materials.MTBEMixture.getCells(1), Materials.Empty.getCells(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.Naphtha.getCells(16), + Materials.Gas.getCells(2), + Materials.Methanol.getCells(1), + Materials.Acetone.getCells(1)) + .itemOutputs(Materials.GasolineRaw.getCells(20)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.GasolineRegular.getCells(20), + Materials.Octane.getCells(2), + Materials.NitrousOxide.getCells(6), + Materials.Toluene.getCells(1)) + .itemOutputs(Materials.Empty.getCells(29)) + .fluidInputs(Materials.AntiKnock.getFluid(3000)) + .fluidOutputs(Materials.GasolinePremium.getFluid(32000)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(sMixerRecipes); + + if (Railcraft.isModLoaded()) { + GT_Values.RA.stdBuilder() + .itemInputs( + EnumCube.COKE_BLOCK.getItem(), + ItemList.SFMixture.get(2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_SSFUEL.get(1)) + .fluidInputs(Materials.NitroFuel.getFluid(300)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(250) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + EnumCube.COKE_BLOCK.getItem(), + ItemList.SFMixture.get(2), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_SSFUEL.get(1)) + .fluidInputs(Materials.GasolinePremium.getFluid(120)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(250) + .addTo(sMixerRecipes); } if (Thaumcraft.isModLoaded() && Railcraft.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs( - EnumCube.COKE_BLOCK.getItem(), - ItemList.MSFMixture.get(2), - getModItem(Thaumcraft.modID, "ItemResource", 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_MSSFUEL.get(1)).fluidInputs(Materials.NitroFuel.getFluid(300)) - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + .itemInputs( + EnumCube.COKE_BLOCK.getItem(), + ItemList.MSFMixture.get(2), + getModItem(Thaumcraft.modID, "ItemResource", 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_MSSFUEL.get(1)) + .fluidInputs(Materials.NitroFuel.getFluid(300)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - EnumCube.COKE_BLOCK.getItem(), - ItemList.MSFMixture.get(2), - getModItem(Thaumcraft.modID, "ItemResource", 4), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Block_MSSFUEL.get(1)).fluidInputs(Materials.GasolinePremium.getFluid(120)) - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sMixerRecipes); + .itemInputs( + EnumCube.COKE_BLOCK.getItem(), + ItemList.MSFMixture.get(2), + getModItem(Thaumcraft.modID, "ItemResource", 4), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(ItemList.Block_MSSFUEL.get(1)) + .fluidInputs(Materials.GasolinePremium.getFluid(120)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMixerRecipes); } } @@ -1211,78 +1766,123 @@ public class MixerRecipes implements Runnable { boolean splashLong = !(FluidRegistry.getFluid("potion." + aName + ".long") == null || FluidRegistry.getFluid("potion." + aName + ".long.splash") == null); - if (splash) - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1)) - .noItemOutputs().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion." + aName), 750)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion." + aName + ".splash"), 750)) - .duration(10 * SECONDS).eut(24).addTo(sMixerRecipes); + if (splash) GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1)) + .noItemOutputs() + .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion." + aName), 750)) + .fluidOutputs( + new FluidStack(FluidRegistry.getFluid("potion." + aName + ".splash"), 750)) + .duration(10 * SECONDS) + .eut(24) + .addTo(sMixerRecipes); if (splashStrong) GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1)).noItemOutputs() - .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion." + aName + ".strong"), 750)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion." + aName + ".strong.splash"), 750)) - .duration(10 * SECONDS).eut(24).addTo(sMixerRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1)) + .noItemOutputs() + .fluidInputs( + new FluidStack( + FluidRegistry.getFluid("potion." + aName + ".strong"), + 750)) + .fluidOutputs( + new FluidStack( + FluidRegistry.getFluid("potion." + aName + ".strong.splash"), + 750)) + .duration(10 * SECONDS) + .eut(24) + .addTo(sMixerRecipes); if (splashLong) GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1)).noItemOutputs() - .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion." + aName + ".long"), 750)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion." + aName + ".long.splash"), 750)) - .duration(10 * SECONDS).eut(24).addTo(sMixerRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gunpowder, 1)) + .noItemOutputs() + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("potion." + aName + ".long"), 750)) + .fluidOutputs( + new FluidStack( + FluidRegistry.getFluid("potion." + aName + ".long.splash"), + 750)) + .duration(10 * SECONDS) + .eut(24) + .addTo(sMixerRecipes); } public void registerSingleBlockAndMulti() { GT_Values.RA.stdBuilder() - .itemInputs( - Materials.NaquadahEnriched.getDust(8), - Materials.Holmium.getDust(2), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(Materials.EnrichedHolmium.getDust(10)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(sMixerRecipes); + .itemInputs( + Materials.NaquadahEnriched.getDust(8), + Materials.Holmium.getDust(2), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(Materials.EnrichedHolmium.getDust(10)) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sMixerRecipes); // Catalysts for Plasma Forge. { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)).noItemOutputs() - .fluidInputs( - Materials.Helium.getPlasma(1000L), - Materials.Iron.getPlasma(1000L), - Materials.Calcium.getPlasma(1000L), - Materials.Niobium.getPlasma(1000L)) - .fluidOutputs(Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L)) - .duration(41 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)).noItemOutputs() - .fluidInputs( - Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L), - Materials.Radon.getPlasma(1000L), - Materials.Nickel.getPlasma(1000L), - Materials.Boron.getPlasma(1000L), - Materials.Sulfur.getPlasma(1000L)) - .fluidOutputs(Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L)) - .duration(41 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(11)).noItemOutputs() - .fluidInputs( - Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L), - Materials.Nitrogen.getPlasma(1000L), - Materials.Zinc.getPlasma(1000L), - Materials.Silver.getPlasma(1000L), - Materials.Titanium.getPlasma(1000L)) - .fluidOutputs(Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L)) - .duration(41 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(sMixerRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(12)).noItemOutputs() - .fluidInputs( - Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L), - Materials.Americium.getPlasma(1000L), - Materials.Bismuth.getPlasma(1000L), - Materials.Oxygen.getPlasma(1000L), - Materials.Tin.getPlasma(1000L)) - .fluidOutputs(Materials.DimensionallyTranscendentExoticCatalyst.getFluid(1000L)) - .duration(41 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9)) + .noItemOutputs() + .fluidInputs( + Materials.Helium.getPlasma(1000L), + Materials.Iron.getPlasma(1000L), + Materials.Calcium.getPlasma(1000L), + Materials.Niobium.getPlasma(1000L)) + .fluidOutputs(Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L)) + .duration(41 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(10)) + .noItemOutputs() + .fluidInputs( + Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L), + Materials.Radon.getPlasma(1000L), + Materials.Nickel.getPlasma(1000L), + Materials.Boron.getPlasma(1000L), + Materials.Sulfur.getPlasma(1000L)) + .fluidOutputs(Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L)) + .duration(41 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(11)) + .noItemOutputs() + .fluidInputs( + Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L), + Materials.Nitrogen.getPlasma(1000L), + Materials.Zinc.getPlasma(1000L), + Materials.Silver.getPlasma(1000L), + Materials.Titanium.getPlasma(1000L)) + .fluidOutputs(Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L)) + .duration(41 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(12)) + .noItemOutputs() + .fluidInputs( + Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L), + Materials.Americium.getPlasma(1000L), + Materials.Bismuth.getPlasma(1000L), + Materials.Oxygen.getPlasma(1000L), + Materials.Tin.getPlasma(1000L)) + .fluidOutputs(Materials.DimensionallyTranscendentExoticCatalyst.getFluid(1000L)) + .duration(41 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sMixerRecipes); } - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Spray_WeedEx.get(1)).noItemOutputs() - .fluidInputs(MaterialsKevlar.NaphthenicAcid.getFluid(10)) - .fluidOutputs(Materials.WeedEX9000.getFluid(750)).duration(5 * SECONDS).eut(100).addTo(sMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Spray_WeedEx.get(1)) + .noItemOutputs() + .fluidInputs(MaterialsKevlar.NaphthenicAcid.getFluid(10)) + .fluidOutputs(Materials.WeedEX9000.getFluid(750)) + .duration(5 * SECONDS) + .eut(100) + .addTo(sMixerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java index 621bfae743..760c7a5969 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PackagerRecipes.java @@ -14,29 +14,46 @@ public class PackagerRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(ItemList.IC2_Scrap.get(9), ItemList.Schematic_3by3.get(0)) - .itemOutputs(ItemList.IC2_Scrapbox.get(1)).noFluidInputs().noFluidOutputs().duration(16 * TICKS).eut(1) - .addTo(sBoxinatorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.IC2_Scrap.get(9), ItemList.Schematic_3by3.get(0)) + .itemOutputs(ItemList.IC2_Scrapbox.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * TICKS) + .eut(1) + .addTo(sBoxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Food_Fries.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1)) - .itemOutputs(ItemList.Food_Packaged_Fries.get(1)).noFluidInputs().noFluidOutputs() - .duration(3 * SECONDS + 4 * TICKS).eut(16).addTo(sBoxinatorRecipes); + .itemInputs( + ItemList.Food_Fries.get(1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1)) + .itemOutputs(ItemList.Food_Packaged_Fries.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(sBoxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Food_PotatoChips.get(1), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1)) - .itemOutputs(ItemList.Food_Packaged_PotatoChips.get(1)).noFluidInputs().noFluidOutputs() - .duration(3 * SECONDS + 4 * TICKS).eut(16).addTo(sBoxinatorRecipes); + .itemInputs( + ItemList.Food_PotatoChips.get(1), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1)) + .itemOutputs(ItemList.Food_Packaged_PotatoChips.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(sBoxinatorRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Food_ChiliChips.get(1), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1)) - .itemOutputs(ItemList.Food_Packaged_ChiliChips.get(1)).noFluidInputs().noFluidOutputs() - .duration(3 * SECONDS + 4 * TICKS).eut(16).addTo(sBoxinatorRecipes); + .itemInputs( + ItemList.Food_ChiliChips.get(1), + GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1)) + .itemOutputs(ItemList.Food_Packaged_ChiliChips.get(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS + 4 * TICKS) + .eut(16) + .addTo(sBoxinatorRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java index 00e089b0bc..bc680c40e5 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java @@ -15,26 +15,34 @@ public class PlasmaForgeRecipes implements Runnable { public void run() { // Giga chad trophy. GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Field_Generator_UEV.get(64), - ItemList.Field_Generator_UIV.get(64), - ItemList.Field_Generator_UMV.get(64)) - .fluidInputs( - Materials.ExcitedDTEC.getFluid(100_000_000), - Materials.SpaceTime.getMolten(64 * 2 * 9 * 144)) - .itemOutputs(ItemList.GigaChad.get(1)).noFluidOutputs().duration(86400 * 20 * 2).eut(2_000_000_000) - .metadata(COIL_HEAT, 13500).addTo(sPlasmaForgeRecipes); + .itemInputs( + ItemList.Field_Generator_UEV.get(64), + ItemList.Field_Generator_UIV.get(64), + ItemList.Field_Generator_UMV.get(64)) + .fluidInputs( + Materials.ExcitedDTEC.getFluid(100_000_000), + Materials.SpaceTime.getMolten(64 * 2 * 9 * 144)) + .itemOutputs(ItemList.GigaChad.get(1)) + .noFluidOutputs() + .duration(86400 * 20 * 2) + .eut(2_000_000_000) + .metadata(COIL_HEAT, 13500) + .addTo(sPlasmaForgeRecipes); // Quantum anomaly recipe bypass for UXV. Avoids RNG. GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(NewHorizonsCoreMod.modID, "item.ChromaticLens", 1), - getModItem(GoodGenerator.modID, "huiCircuit", 1, 4)) - .fluidInputs( - Materials.WhiteDwarfMatter.getMolten(144), - getFluidStack("molten.shirabon", 72), - Materials.BlackDwarfMatter.getMolten(144)) - .itemOutputs(getModItem(GTPlusPlus.modID, "MU-metaitem.01", 1, 32105)).noFluidOutputs() - .duration(50 * 20).eut((int) TierEU.RECIPE_UXV).metadata(COIL_HEAT, 13500).addTo(sPlasmaForgeRecipes); + .itemInputs( + getModItem(NewHorizonsCoreMod.modID, "item.ChromaticLens", 1), + getModItem(GoodGenerator.modID, "huiCircuit", 1, 4)) + .fluidInputs( + Materials.WhiteDwarfMatter.getMolten(144), + getFluidStack("molten.shirabon", 72), + Materials.BlackDwarfMatter.getMolten(144)) + .itemOutputs(getModItem(GTPlusPlus.modID, "MU-metaitem.01", 1, 32105)) + .noFluidOutputs() + .duration(50 * 20) + .eut((int) TierEU.RECIPE_UXV) + .metadata(COIL_HEAT, 13500) + .addTo(sPlasmaForgeRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java index 4df41eb779..f839e7efc0 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PrinterRecipes.java @@ -18,28 +18,52 @@ public class PrinterRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L)) - .itemOutputs(ItemList.Paper_Punch_Card_Empty.get(1L)).fluidInputs(getFluidStack("squidink", 36)) - .noFluidOutputs().duration(5 * SECONDS).eut(2).addTo(sPrinterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Paper_Punch_Card_Empty.get(1L)) - .specialItem(ItemList.Tool_DataStick.getWithName(0L, "With Punch Card Data")) - .itemOutputs(ItemList.Paper_Punch_Card_Encoded.get(1L)).fluidInputs(getFluidStack("squidink", 36)) - .noFluidOutputs().duration(5 * SECONDS).eut(2).addTo(sPrinterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3L)) - .specialItem(ItemList.Tool_DataStick.getWithName(0L, "With Scanned Book Data")) - .itemOutputs(ItemList.Paper_Printed_Pages.get(1L)).fluidInputs(getFluidStack("squidink", 144)) - .noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sPrinterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.map, 1, 32767)) - .specialItem(ItemList.Tool_DataStick.getWithName(0L, "With Scanned Map Data")) - .itemOutputs(new ItemStack(Items.filled_map, 1, 0)).fluidInputs(getFluidStack("squidink", 144)) - .noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sPrinterRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.book, 1, 32767)) - .itemOutputs(GT_Utility.getWrittenBook("Manual_Printer", ItemList.Book_Written_01.get(1L))) - .fluidInputs(getFluidStack("squidink", 144)).noFluidOutputs().duration(20 * SECONDS).eut(2) - .addTo(sPrinterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L)) + .itemOutputs(ItemList.Paper_Punch_Card_Empty.get(1L)) + .fluidInputs(getFluidStack("squidink", 36)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(2) + .addTo(sPrinterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Paper_Punch_Card_Empty.get(1L)) + .specialItem(ItemList.Tool_DataStick.getWithName(0L, "With Punch Card Data")) + .itemOutputs(ItemList.Paper_Punch_Card_Encoded.get(1L)) + .fluidInputs(getFluidStack("squidink", 36)) + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(2) + .addTo(sPrinterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3L)) + .specialItem(ItemList.Tool_DataStick.getWithName(0L, "With Scanned Book Data")) + .itemOutputs(ItemList.Paper_Printed_Pages.get(1L)) + .fluidInputs(getFluidStack("squidink", 144)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sPrinterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.map, 1, 32767)) + .specialItem(ItemList.Tool_DataStick.getWithName(0L, "With Scanned Map Data")) + .itemOutputs(new ItemStack(Items.filled_map, 1, 0)) + .fluidInputs(getFluidStack("squidink", 144)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sPrinterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.book, 1, 32767)) + .itemOutputs(GT_Utility.getWrittenBook("Manual_Printer", ItemList.Book_Written_01.get(1L))) + .fluidInputs(getFluidStack("squidink", 144)) + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sPrinterRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java index ce101f00e1..675cb3eade 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java +++ b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java @@ -18,396 +18,718 @@ public class Pulverizer implements Runnable { public void run() { // recycling Long Distance Pipes { - GT_Values.RA.stdBuilder().itemInputs(ItemList.Long_Distance_Pipeline_Fluid.get(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 19)).noFluidInputs() - .noFluidOutputs().duration(15 * SECONDS).eut(4).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Long_Distance_Pipeline_Item.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 12), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 7)) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(4).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 2)).noFluidInputs() - .noFluidOutputs().duration(10 * TICKS).eut(4).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Long_Distance_Pipeline_Item_Pipe.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 1)) - .noFluidInputs().noFluidOutputs().duration(10 * TICKS).eut(4).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Long_Distance_Pipeline_Fluid.get(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 19)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(4) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Long_Distance_Pipeline_Item.get(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 12), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 7)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(4) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(4) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Long_Distance_Pipeline_Item_Pipe.get(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Steel, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(4) + .addTo(sMaceratorRecipes); } // marbe dust( stone dust - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Marble, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Marble, 1)).noFluidInputs() - .noFluidOutputs().duration(8 * SECONDS).eut(4).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Thaumcraft.modID, "ItemResource", 1, 18)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1)).noFluidInputs() - .noFluidOutputs().duration(1 * SECONDS + 1 * TICKS).eut(4).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.reeds, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1)).noFluidInputs() - .noFluidOutputs().duration(2 * SECONDS + 10 * TICKS).eut(2).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_Cupronickel.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cupronickel, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 2)) - .noFluidInputs().noFluidOutputs().duration(1 * MINUTES + 15 * SECONDS).eut(80).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_Kanthal.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Kanthal, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cupronickel, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 3)) - .noFluidInputs().noFluidOutputs().duration(1 * MINUTES + 15 * SECONDS).eut(80).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_Nichrome.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Kanthal, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 4)) - .noFluidInputs().noFluidOutputs().duration(1 * MINUTES + 15 * SECONDS).eut(80).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_TungstenSteel.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 5)) - .noFluidInputs().noFluidOutputs().duration(1 * MINUTES + 15 * SECONDS).eut(80).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_HSSG.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 6)) - .noFluidInputs().noFluidOutputs().duration(1 * MINUTES + 15 * SECONDS).eut(80).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_HSSS.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSS, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 7)) - .noFluidInputs().noFluidOutputs().duration(1 * MINUTES + 15 * SECONDS).eut(80).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_Naquadah.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSS, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 8)) - .noFluidInputs().noFluidOutputs().duration(1 * MINUTES + 15 * SECONDS).eut(80).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_NaquadahAlloy.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahAlloy, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 9)) - .noFluidInputs().noFluidOutputs().duration(1 * MINUTES + 15 * SECONDS).eut(80).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_Trinium.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 10)) - .noFluidInputs().noFluidOutputs().duration(1 * MINUTES + 15 * SECONDS).eut(80).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_ElectrumFlux.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 11)) - .noFluidInputs().noFluidOutputs().duration(1 * MINUTES + 15 * SECONDS).eut(80).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Coil_AwakenedDraconium.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 12)) - .noFluidInputs().noFluidOutputs().duration(1 * MINUTES + 15 * SECONDS).eut(80).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Marble, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Marble, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(8 * SECONDS) + .eut(4) + .addTo(sMaceratorRecipes); - if (Railcraft.isModLoaded()) { - // recycling RC Tanks - // Iron + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Thaumcraft.modID, "ItemResource", 1, 18)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 1 * TICKS) + .eut(4) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2)).outputChances(10000) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(2).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.reeds, 1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(2) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 1)) + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Cupronickel.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(2) + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cupronickel, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tin, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 2)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 15 * SECONDS) + .eut(80) .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Kanthal.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 12), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(2) + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Kanthal, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cupronickel, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 3)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 15 * SECONDS) + .eut(80) .addTo(sMaceratorRecipes); - // Steel - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2)).outputChances(10000) - .noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(2).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 14)) + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Nichrome.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(2) + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Kanthal, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 15 * SECONDS) + .eut(80) .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_TungstenSteel.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 12), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Steel, 3)) - .outputChances(10000).noFluidInputs().noFluidOutputs().duration(15 * SECONDS).eut(2) + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 5)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 15 * SECONDS) + .eut(80) .addTo(sMaceratorRecipes); - // Aluminium - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 2)) - .outputChances(10000).noFluidInputs().noFluidOutputs().duration(22 * SECONDS + 10 * TICKS).eut(8) + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_HSSG.get(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 6)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 15 * SECONDS) + .eut(80) .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 1)) + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_HSSS.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(22 * SECONDS + 10 * TICKS) - .eut(8).addTo(sMaceratorRecipes); + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSS, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 7)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 15 * SECONDS) + .eut(80) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Naquadah.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 12), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Aluminium, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(22 * SECONDS + 10 * TICKS) - .eut(8).addTo(sMaceratorRecipes); - - // Stainless Steel - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 2)) - .outputChances(10000).noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(16) + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSS, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 8)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 15 * SECONDS) + .eut(80) .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 4)) + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_NaquadahAlloy.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(16) + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahAlloy, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 9)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 15 * SECONDS) + .eut(80) .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_Trinium.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 12), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.StainlessSteel, 3)) - .outputChances(10000).noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(16) + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahAlloy, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 10)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 15 * SECONDS) + .eut(80) .addTo(sMaceratorRecipes); - // Titanium - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 2)).outputChances(10000) - .noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(30).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 7)) + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_ElectrumFlux.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(30) + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 11)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 15 * SECONDS) + .eut(80) .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Coil_AwakenedDraconium.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 12), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 3)) - .outputChances(10000).noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(30) + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 12)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 15 * SECONDS) + .eut(80) .addTo(sMaceratorRecipes); - // Tungesten Steel - - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 2)) - .outputChances(10000).noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(30) - .addTo(sMaceratorRecipes); + if (Railcraft.isModLoaded()) { + // recycling RC Tanks + // Iron - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 10)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(30) - .addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 0)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 12), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 12), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TungstenSteel, 3)) - .outputChances(10000).noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(30) - .addTo(sMaceratorRecipes); + // Steel - // Palladium + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 13)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 14)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.beta", 1L, 15)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 12), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Steel, 3)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 2)) - .outputChances(10000).noFluidInputs().noFluidOutputs().duration(37 * SECONDS + 10 * TICKS).eut(64) - .addTo(sMaceratorRecipes); + // Aluminium - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 13)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(37 * SECONDS + 10 * TICKS) - .eut(64).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 0)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 2)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(22 * SECONDS + 10 * TICKS) + .eut(8) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(22 * SECONDS + 10 * TICKS) + .eut(8) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plastic, 12), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Aluminium, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(22 * SECONDS + 10 * TICKS) + .eut(8) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NiobiumTitanium, 12), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Chrome, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(37 * SECONDS + 10 * TICKS) - .eut(64).addTo(sMaceratorRecipes); + // Stainless Steel - // Iridium + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 3)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 2)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(16) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 4)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(16) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 5)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.StainlessSteel, 12), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.StainlessSteel, 3)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(16) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2)).outputChances(10000) - .noFluidInputs().noFluidOutputs().duration(45 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sMaceratorRecipes); + // Titanium - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(45 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 6)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 2)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(30) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 7)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(30) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 8)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 12), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 3)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(30) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Enderium, 12), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iridium, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(45 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(sMaceratorRecipes); + // Tungesten Steel - // Osmium + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 9)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 2)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(30) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 10)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(30) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 11)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 12), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TungstenSteel, 3)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(30) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 2)).outputChances(10000) - .noFluidInputs().noFluidOutputs().duration(52 * SECONDS + 10 * TICKS).eut(256) - .addTo(sMaceratorRecipes); + // Palladium - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 4)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(52 * SECONDS + 10 * TICKS) - .eut(256).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 12)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 2)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(37 * SECONDS + 10 * TICKS) + .eut(64) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 13)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(37 * SECONDS + 10 * TICKS) + .eut(64) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.zeta", 1L, 14)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NiobiumTitanium, 12), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Chrome, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(37 * SECONDS + 10 * TICKS) + .eut(64) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 12), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Osmium, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(52 * SECONDS + 10 * TICKS) - .eut(256).addTo(sMaceratorRecipes); + // Iridium - // Neutronium + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 0)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 2)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(45 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(45 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 2)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Enderium, 12), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iridium, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(45 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 2)) - .outputChances(10000).noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sMaceratorRecipes); + // Osmium - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 7)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) - .outputChances(10000, 10000).noFluidInputs().noFluidOutputs().duration(60 * SECONDS) - .eut(TierEU.RECIPE_HV).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 3)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 2)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(52 * SECONDS + 10 * TICKS) + .eut(256) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 4)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Osmium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(52 * SECONDS + 10 * TICKS) + .eut(256) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 5)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 12), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Osmium, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(52 * SECONDS + 10 * TICKS) + .eut(256) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 12), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neutronium, 3)) - .outputChances(10000).noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sMaceratorRecipes); + // Neutronium - GT_Values.RA.stdBuilder().itemInputs(getModItem(Railcraft.modID, "cube.crushed.obsidian", 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L)).noFluidInputs() - .noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 6)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 2)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 7)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + .outputChances(10000, 10000) + .noFluidInputs() + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "machine.eta", 1L, 8)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 12), + GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Neutronium, 3)) + .outputChances(10000) + .noFluidInputs() + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(Railcraft.modID, "cube.crushed.obsidian", 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); } if (AppliedEnergistics2.isModLoaded()) { - GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "tile.BlockSkyStone", 1L, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 45)) - .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sMaceratorRecipes); - - GT_Values.RA.stdBuilder().itemInputs(getModItem(AppliedEnergistics2.modID, "tile.BlockSkyChest", 1L, 32767)) - .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 45)) - .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(AppliedEnergistics2.modID, "tile.BlockSkyStone", 1L, 32767)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 1L, 45)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(AppliedEnergistics2.modID, "tile.BlockSkyChest", 1L, 32767)) + .itemOutputs(getModItem(AppliedEnergistics2.modID, "item.ItemMultiMaterial", 8L, 45)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); } - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.blaze_rod, 1)) - .itemOutputs(new ItemStack(Items.blaze_powder, 3), new ItemStack(Items.blaze_powder, 1)) - .outputChances(10000, 5000).noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(2) - .addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.blaze_rod, 1)) + .itemOutputs(new ItemStack(Items.blaze_powder, 3), new ItemStack(Items.blaze_powder, 1)) + .outputChances(10000, 5000) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.web, 1, 0)) - .itemOutputs(new ItemStack(Items.string, 1), new ItemStack(Items.string, 1)).outputChances(10000, 5000) - .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.web, 1, 0)) + .itemOutputs(new ItemStack(Items.string, 1), new ItemStack(Items.string, 1)) + .outputChances(10000, 5000) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.red_mushroom, 1, 32767)) - .itemOutputs(ItemList.IC2_Grin_Powder.get(1L)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS) - .eut(2).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.red_mushroom, 1, 32767)) + .itemOutputs(ItemList.IC2_Grin_Powder.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.item_frame, 1, 32767)) - .itemOutputs( - new ItemStack(Items.leather, 1), - GT_OreDictUnificator.getDust(Materials.Wood, OrePrefixes.stick.mMaterialAmount * 4L)) - .outputChances(10000, 9500).noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(2) - .addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.item_frame, 1, 32767)) + .itemOutputs( + new ItemStack(Items.leather, 1), + GT_OreDictUnificator.getDust(Materials.Wood, OrePrefixes.stick.mMaterialAmount * 4L)) + .outputChances(10000, 9500) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.bow, 1, 0)) - .itemOutputs( - new ItemStack(Items.string, 3), - GT_OreDictUnificator.getDust(Materials.Wood, OrePrefixes.stick.mMaterialAmount * 3)) - .outputChances(10000, 9500).noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(2) - .addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Items.bow, 1, 0)) + .itemOutputs( + new ItemStack(Items.string, 3), + GT_OreDictUnificator.getDust(Materials.Wood, OrePrefixes.stick.mMaterialAmount * 3)) + .outputChances(10000, 9500) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Brick.getIngots(1)).itemOutputs(Materials.Brick.getDustSmall(1)) - .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Brick.getIngots(1)) + .itemOutputs(Materials.Brick.getDustSmall(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.brick_stairs, 1, 0)) - .itemOutputs(Materials.Brick.getDustSmall(6)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS) - .eut(2).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.brick_stairs, 1, 0)) + .itemOutputs(Materials.Brick.getDustSmall(6)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.CompressedFireclay.get(1)) - .itemOutputs(Materials.Fireclay.getDustSmall(1)).noFluidInputs().noFluidOutputs().duration(20 * SECONDS) - .eut(2).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.CompressedFireclay.get(1)) + .itemOutputs(Materials.Fireclay.getDustSmall(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Firebrick.get(1)).itemOutputs(Materials.Brick.getDust(1)) - .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Firebrick.get(1)) + .itemOutputs(Materials.Brick.getDust(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Casing_Firebricks.get(1)).itemOutputs(Materials.Brick.getDust(4)) - .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(2).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Casing_Firebricks.get(1)) + .itemOutputs(Materials.Brick.getDust(4)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Machine_Bricked_BlastFurnace.get(1)) - .itemOutputs(Materials.Brick.getDust(8), Materials.Iron.getDust(1)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(2).addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Machine_Bricked_BlastFurnace.get(1)) + .itemOutputs(Materials.Brick.getDust(8), Materials.Iron.getDust(1)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); if (HardcoreEnderExpansion.isModLoaded()) { - GT_Values.RA.stdBuilder().itemInputs(getModItem(HardcoreEnderExpansion.modID, "endium_ore", 1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1)) - .outputChances(10000, 5000).noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(2) - .addTo(sMaceratorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(HardcoreEnderExpansion.modID, "endium_ore", 1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.HeeEndium, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Endstone, 1)) + .outputChances(10000, 5000) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(2) + .addTo(sMaceratorRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java index 4490270219..64201ce719 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java @@ -27,80 +27,124 @@ public class PyrolyseRecipes implements Runnable { public void run() { if (Railcraft.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(RailcraftToolItems.getCoalCoke(16)).noFluidInputs() - .fluidOutputs(Materials.Creosote.getFluid(8000)).duration(32 * SECONDS).eut(64) - .addTo(sPyrolyseRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(RailcraftToolItems.getCoalCoke(16)) + .noFluidInputs() + .fluidOutputs(Materials.Creosote.getFluid(8000)) + .duration(32 * SECONDS) + .eut(64) + .addTo(sPyrolyseRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(RailcraftToolItems.getCoalCoke(16)).fluidInputs(Materials.Nitrogen.getGas(1000)) - .fluidOutputs(Materials.Creosote.getFluid(8000)).duration(16 * SECONDS).eut(96) - .addTo(sPyrolyseRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(RailcraftToolItems.getCoalCoke(16)) + .fluidInputs(Materials.Nitrogen.getGas(1000)) + .fluidOutputs(Materials.Creosote.getFluid(8000)) + .duration(16 * SECONDS) + .eut(96) + .addTo(sPyrolyseRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 8), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(EnumCube.COKE_BLOCK.getItem(8)).noFluidInputs() - .fluidOutputs(Materials.Creosote.getFluid(32000)).duration(2 * MINUTES + 8 * SECONDS).eut(64) - .addTo(sPyrolyseRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 8), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(EnumCube.COKE_BLOCK.getItem(8)) + .noFluidInputs() + .fluidOutputs(Materials.Creosote.getFluid(32000)) + .duration(2 * MINUTES + 8 * SECONDS) + .eut(64) + .addTo(sPyrolyseRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 8), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(EnumCube.COKE_BLOCK.getItem(8)).fluidInputs(Materials.Nitrogen.getGas(1000)) - .fluidOutputs(Materials.Creosote.getFluid(32000)).duration(1 * MINUTES + 4 * SECONDS).eut(96) - .addTo(sPyrolyseRecipes); + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.block, Materials.Coal, 8), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(EnumCube.COKE_BLOCK.getItem(8)) + .fluidInputs(Materials.Nitrogen.getGas(1000)) + .fluidOutputs(Materials.Creosote.getFluid(32000)) + .duration(1 * MINUTES + 4 * SECONDS) + .eut(96) + .addTo(sPyrolyseRecipes); } if (!GregTech_API.mIC2Classic) { GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("biochaff", 4), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().fluidInputs(Materials.Water.getFluid(4000)) - .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5000)).duration(45 * SECONDS) - .eut(10).addTo(sPyrolyseRecipes); + .itemInputs(GT_ModHandler.getIC2Item("biochaff", 4), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.Water.getFluid(4000)) + .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5000)) + .duration(45 * SECONDS) + .eut(10) + .addTo(sPyrolyseRecipes); } if (Forestry.isModLoaded()) { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "fertilizerBio", 4), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().fluidInputs(Materials.Water.getFluid(4000)) - .fluidOutputs(Materials.Biomass.getFluid(5000)).duration(45 * SECONDS).eut(10) - .addTo(sPyrolyseRecipes); + .itemInputs(getModItem(Forestry.modID, "fertilizerBio", 4), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.Water.getFluid(4000)) + .fluidOutputs(Materials.Biomass.getFluid(5000)) + .duration(45 * SECONDS) + .eut(10) + .addTo(sPyrolyseRecipes); GT_Values.RA.stdBuilder() - .itemInputs(getModItem(Forestry.modID, "mulch", 32), GT_Utility.getIntegratedCircuit(1)) - .noItemOutputs().fluidInputs(Materials.Water.getFluid(4000)) - .fluidOutputs(Materials.Biomass.getFluid(5000)).duration(45 * SECONDS).eut(10) - .addTo(sPyrolyseRecipes); + .itemInputs(getModItem(Forestry.modID, "mulch", 32), GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.Water.getFluid(4000)) + .fluidOutputs(Materials.Biomass.getFluid(5000)) + .duration(45 * SECONDS) + .eut(10) + .addTo(sPyrolyseRecipes); } GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getIC2Item("biochaff", 1), GT_Utility.getIntegratedCircuit(2)).noItemOutputs() - .fluidInputs(Materials.Water.getFluid(1500)).fluidOutputs(Materials.FermentedBiomass.getFluid(1500)) - .duration(10 * SECONDS).eut(10).addTo(sPyrolyseRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 1000)) - .fluidOutputs(Materials.FermentedBiomass.getFluid(1000)).duration(5 * SECONDS).eut(10) - .addTo(sPyrolyseRecipes); - - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.Biomass.getFluid(1000)) - .fluidOutputs(Materials.FermentedBiomass.getFluid(1000)).duration(5 * SECONDS).eut(10) - .addTo(sPyrolyseRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Sugar.getDust(23), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.Charcoal.getDust(12)).noFluidInputs() - .fluidOutputs(Materials.Water.getFluid(1500)).duration(16 * SECONDS).eut(64).addTo(sPyrolyseRecipes); - - GT_Values.RA.stdBuilder().itemInputs(Materials.Sugar.getDust(23), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(Materials.Charcoal.getDust(12)).fluidInputs(Materials.Nitrogen.getGas(500)) - .fluidOutputs(Materials.Water.getFluid(1500)).duration(8 * SECONDS).eut(96).addTo(sPyrolyseRecipes); + .itemInputs(GT_ModHandler.getIC2Item("biochaff", 1), GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs(Materials.Water.getFluid(1500)) + .fluidOutputs(Materials.FermentedBiomass.getFluid(1500)) + .duration(10 * SECONDS) + .eut(10) + .addTo(sPyrolyseRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 1000)) + .fluidOutputs(Materials.FermentedBiomass.getFluid(1000)) + .duration(5 * SECONDS) + .eut(10) + .addTo(sPyrolyseRecipes); + + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Biomass.getFluid(1000)) + .fluidOutputs(Materials.FermentedBiomass.getFluid(1000)) + .duration(5 * SECONDS) + .eut(10) + .addTo(sPyrolyseRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Sugar.getDust(23), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Charcoal.getDust(12)) + .noFluidInputs() + .fluidOutputs(Materials.Water.getFluid(1500)) + .duration(16 * SECONDS) + .eut(64) + .addTo(sPyrolyseRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Sugar.getDust(23), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.Charcoal.getDust(12)) + .fluidInputs(Materials.Nitrogen.getGas(500)) + .fluidOutputs(Materials.Water.getFluid(1500)) + .duration(8 * SECONDS) + .eut(96) + .addTo(sPyrolyseRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java b/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java index 0f0ad6077e..52736232b9 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java +++ b/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java @@ -115,13 +115,13 @@ public class RecipeRemover implements Runnable { if (!GregTech_API.mIC2Classic) { try { - Map<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tLiqExchange = ic2.api.recipe.Recipes.liquidCooldownManager - .getHeatExchangeProperties(); - Iterator<Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty>> tIterator = tLiqExchange - .entrySet().iterator(); + Map<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tLiqExchange = ic2.api.recipe.Recipes.liquidCooldownManager.getHeatExchangeProperties(); + Iterator<Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty>> tIterator = tLiqExchange.entrySet() + .iterator(); while (tIterator.hasNext()) { Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tEntry = tIterator.next(); - if (tEntry.getKey().equals("ic2hotcoolant")) { + if (tEntry.getKey() + .equals("ic2hotcoolant")) { tIterator.remove(); Recipes.liquidCooldownManager.addFluid("ic2hotcoolant", "ic2coolant", 100); } @@ -131,13 +131,13 @@ public class RecipeRemover implements Runnable { } try { - Map<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tLiqExchange = ic2.api.recipe.Recipes.liquidHeatupManager - .getHeatExchangeProperties(); - Iterator<Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty>> tIterator = tLiqExchange - .entrySet().iterator(); + Map<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tLiqExchange = ic2.api.recipe.Recipes.liquidHeatupManager.getHeatExchangeProperties(); + Iterator<Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty>> tIterator = tLiqExchange.entrySet() + .iterator(); while (tIterator.hasNext()) { Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tEntry = tIterator.next(); - if (tEntry.getKey().equals("ic2coolant")) { + if (tEntry.getKey() + .equals("ic2coolant")) { tIterator.remove(); Recipes.liquidHeatupManager.addFluid("ic2coolant", "ic2hotcoolant", 100); } @@ -150,13 +150,13 @@ public class RecipeRemover implements Runnable { public void removeSmelting() { GT_ModHandler.removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Graphite, 1L)); - GT_ModHandler - .removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Graphite, 1L)); + GT_ModHandler.removeFurnaceSmelting( + GT_OreDictUnificator.get(OrePrefixes.oreBlackgranite, Materials.Graphite, 1L)); GT_ModHandler.removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Graphite, 1L)); - GT_ModHandler - .removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Graphite, 1L)); - GT_ModHandler - .removeFurnaceSmelting(GT_OreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Graphite, 1L)); + GT_ModHandler.removeFurnaceSmelting( + GT_OreDictUnificator.get(OrePrefixes.oreNetherrack, Materials.Graphite, 1L)); + GT_ModHandler.removeFurnaceSmelting( + GT_OreDictUnificator.get(OrePrefixes.oreRedgranite, Materials.Graphite, 1L)); GT_ModHandler.removeFurnaceSmelting(ItemList.IC2_Resin.get(1L)); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java index 30daf240ca..c6d02c3c97 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/SifterRecipes.java @@ -16,26 +16,36 @@ public class SifterRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.gravel, 1, 0)) - .itemOutputs( - new ItemStack(Items.flint, 1, 0), - new ItemStack(Items.flint, 1, 0), - new ItemStack(Items.flint, 1, 0), - new ItemStack(Items.flint, 1, 0), - new ItemStack(Items.flint, 1, 0), - new ItemStack(Items.flint, 1, 0)) - .outputChances(10000, 9000, 8000, 6000, 3300, 2500).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(16).addTo(sSifterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.gravel, 1, 0)) + .itemOutputs( + new ItemStack(Items.flint, 1, 0), + new ItemStack(Items.flint, 1, 0), + new ItemStack(Items.flint, 1, 0), + new ItemStack(Items.flint, 1, 0), + new ItemStack(Items.flint, 1, 0), + new ItemStack(Items.flint, 1, 0)) + .outputChances(10000, 9000, 8000, 6000, 3300, 2500) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(16) + .addTo(sSifterRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Coal, 1L)) - .itemOutputs( - new ItemStack(Items.coal, 1, 0), - new ItemStack(Items.coal, 1, 0), - new ItemStack(Items.coal, 1, 0), - new ItemStack(Items.coal, 1, 0), - new ItemStack(Items.coal, 1, 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L)) - .outputChances(10000, 9000, 8000, 7000, 6000, 5000).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(16).addTo(sSifterRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Coal, 1L)) + .itemOutputs( + new ItemStack(Items.coal, 1, 0), + new ItemStack(Items.coal, 1, 0), + new ItemStack(Items.coal, 1, 0), + new ItemStack(Items.coal, 1, 0), + new ItemStack(Items.coal, 1, 0), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L)) + .outputChances(10000, 9000, 8000, 7000, 6000, 5000) + .noFluidInputs() + .noFluidOutputs() + .duration(30 * SECONDS) + .eut(16) + .addTo(sSifterRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java index 1165f3ebb3..05c0a53f69 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/SlicerRecipes.java @@ -11,20 +11,40 @@ public class SlicerRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Dough_Chocolate.get(1), ItemList.Shape_Slicer_Flat.get(0)) - .itemOutputs(ItemList.Food_Raw_Cookie.get(4)).noFluidInputs().noFluidOutputs() - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sSlicerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Dough_Chocolate.get(1), ItemList.Shape_Slicer_Flat.get(0)) + .itemOutputs(ItemList.Food_Raw_Cookie.get(4)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sSlicerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Baked_Bun.get(1), ItemList.Shape_Slicer_Flat.get(0)) - .itemOutputs(ItemList.Food_Sliced_Bun.get(2)).noFluidInputs().noFluidOutputs() - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sSlicerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Baked_Bun.get(1), ItemList.Shape_Slicer_Flat.get(0)) + .itemOutputs(ItemList.Food_Sliced_Bun.get(2)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sSlicerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Baked_Bread.get(1), ItemList.Shape_Slicer_Flat.get(0)) - .itemOutputs(ItemList.Food_Sliced_Bread.get(2)).noFluidInputs().noFluidOutputs() - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sSlicerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Baked_Bread.get(1), ItemList.Shape_Slicer_Flat.get(0)) + .itemOutputs(ItemList.Food_Sliced_Bread.get(2)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sSlicerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Food_Baked_Baguette.get(1), ItemList.Shape_Slicer_Flat.get(0)) - .itemOutputs(ItemList.Food_Sliced_Baguette.get(2)).noFluidInputs().noFluidOutputs() - .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(sSlicerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Food_Baked_Baguette.get(1), ItemList.Shape_Slicer_Flat.get(0)) + .itemOutputs(ItemList.Food_Sliced_Baguette.get(2)) + .noFluidInputs() + .noFluidOutputs() + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sSlicerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/SmelterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/SmelterRecipes.java index f244969687..7507c1f58e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/SmelterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/SmelterRecipes.java @@ -26,11 +26,13 @@ public class SmelterRecipes implements Runnable { GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Baguette.get(1L), ItemList.Food_Baked_Baguette.get(1L)); - GT_ModHandler - .addSmeltingRecipe(ItemList.Food_Raw_Pizza_Veggie.get(1L), ItemList.Food_Baked_Pizza_Veggie.get(1L)); + GT_ModHandler.addSmeltingRecipe( + ItemList.Food_Raw_Pizza_Veggie.get(1L), + ItemList.Food_Baked_Pizza_Veggie.get(1L)); - GT_ModHandler - .addSmeltingRecipe(ItemList.Food_Raw_Pizza_Cheese.get(1L), ItemList.Food_Baked_Pizza_Cheese.get(1L)); + GT_ModHandler.addSmeltingRecipe( + ItemList.Food_Raw_Pizza_Cheese.get(1L), + ItemList.Food_Baked_Pizza_Cheese.get(1L)); GT_ModHandler.addSmeltingRecipe(ItemList.Food_Raw_Pizza_Meat.get(1L), ItemList.Food_Baked_Pizza_Meat.get(1L)); diff --git a/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java index 2463be534f..d2b763d394 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java @@ -13,12 +13,16 @@ public class ThermalCentrifugeRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(ItemList.SunnariumCell.get(1)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 1), - new ItemStack(Items.glowstone_dust, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1)) - .noFluidInputs().noFluidOutputs().duration(25 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(sThermalCentrifugeRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.SunnariumCell.get(1)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 1), + new ItemStack(Items.glowstone_dust, 2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(sThermalCentrifugeRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java index 3a19f27c1c..141bb86886 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java @@ -34,65 +34,81 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).noItemOutputs() - .fluidInputs(Materials.ExcitedDTCC.getFluid(1000L)) - .fluidOutputs( - Materials.Helium.getPlasma(1000), - Materials.Iron.getPlasma(1000), - Materials.Calcium.getPlasma(1000), - Materials.Niobium.getPlasma(1000)) - .duration(100).eut(CRUDE_EU_PER_L).addTo(sTranscendentPlasmaMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.ExcitedDTCC.getFluid(1000L)) + .fluidOutputs( + Materials.Helium.getPlasma(1000), + Materials.Iron.getPlasma(1000), + Materials.Calcium.getPlasma(1000), + Materials.Niobium.getPlasma(1000)) + .duration(100) + .eut(CRUDE_EU_PER_L) + .addTo(sTranscendentPlasmaMixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)).noItemOutputs() - .fluidInputs(Materials.ExcitedDTPC.getFluid(1000L)) - .fluidOutputs( - Materials.Helium.getPlasma(1000), - Materials.Iron.getPlasma(1000), - Materials.Calcium.getPlasma(1000), - Materials.Niobium.getPlasma(1000), - Materials.Radon.getPlasma(1000), - Materials.Nickel.getPlasma(1000), - Materials.Boron.getPlasma(1000), - Materials.Sulfur.getPlasma(1000)) - .duration(100).eut(PROSAIC_EU_PER_L).addTo(sTranscendentPlasmaMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .noItemOutputs() + .fluidInputs(Materials.ExcitedDTPC.getFluid(1000L)) + .fluidOutputs( + Materials.Helium.getPlasma(1000), + Materials.Iron.getPlasma(1000), + Materials.Calcium.getPlasma(1000), + Materials.Niobium.getPlasma(1000), + Materials.Radon.getPlasma(1000), + Materials.Nickel.getPlasma(1000), + Materials.Boron.getPlasma(1000), + Materials.Sulfur.getPlasma(1000)) + .duration(100) + .eut(PROSAIC_EU_PER_L) + .addTo(sTranscendentPlasmaMixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(3)).noItemOutputs() - .fluidInputs(Materials.ExcitedDTRC.getFluid(1000L)) - .fluidOutputs( - Materials.Helium.getPlasma(1000), - Materials.Iron.getPlasma(1000), - Materials.Calcium.getPlasma(1000), - Materials.Niobium.getPlasma(1000), - Materials.Radon.getPlasma(1000), - Materials.Nickel.getPlasma(1000), - Materials.Boron.getPlasma(1000), - Materials.Sulfur.getPlasma(1000), - Materials.Nitrogen.getPlasma(1000), - Materials.Zinc.getPlasma(1000), - Materials.Silver.getPlasma(1000), - Materials.Titanium.getPlasma(1000)) - .duration(100).eut(RESPLENDENT_EU_PER_L).addTo(sTranscendentPlasmaMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(3)) + .noItemOutputs() + .fluidInputs(Materials.ExcitedDTRC.getFluid(1000L)) + .fluidOutputs( + Materials.Helium.getPlasma(1000), + Materials.Iron.getPlasma(1000), + Materials.Calcium.getPlasma(1000), + Materials.Niobium.getPlasma(1000), + Materials.Radon.getPlasma(1000), + Materials.Nickel.getPlasma(1000), + Materials.Boron.getPlasma(1000), + Materials.Sulfur.getPlasma(1000), + Materials.Nitrogen.getPlasma(1000), + Materials.Zinc.getPlasma(1000), + Materials.Silver.getPlasma(1000), + Materials.Titanium.getPlasma(1000)) + .duration(100) + .eut(RESPLENDENT_EU_PER_L) + .addTo(sTranscendentPlasmaMixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)).noItemOutputs() - .fluidInputs(Materials.ExcitedDTEC.getFluid(1000L)) - .fluidOutputs( - Materials.Helium.getPlasma(1000), - Materials.Iron.getPlasma(1000), - Materials.Calcium.getPlasma(1000), - Materials.Niobium.getPlasma(1000), - Materials.Radon.getPlasma(1000), - Materials.Nickel.getPlasma(1000), - Materials.Boron.getPlasma(1000), - Materials.Sulfur.getPlasma(1000), - Materials.Nitrogen.getPlasma(1000), - Materials.Zinc.getPlasma(1000), - Materials.Silver.getPlasma(1000), - Materials.Titanium.getPlasma(1000), - Materials.Americium.getPlasma(1000), - Materials.Bismuth.getPlasma(1000), - Materials.Oxygen.getPlasma(1000), - Materials.Tin.getPlasma(1000)) - .duration(100).eut(EXOTIC_EU_PER_L).addTo(sTranscendentPlasmaMixerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(4)) + .noItemOutputs() + .fluidInputs(Materials.ExcitedDTEC.getFluid(1000L)) + .fluidOutputs( + Materials.Helium.getPlasma(1000), + Materials.Iron.getPlasma(1000), + Materials.Calcium.getPlasma(1000), + Materials.Niobium.getPlasma(1000), + Materials.Radon.getPlasma(1000), + Materials.Nickel.getPlasma(1000), + Materials.Boron.getPlasma(1000), + Materials.Sulfur.getPlasma(1000), + Materials.Nitrogen.getPlasma(1000), + Materials.Zinc.getPlasma(1000), + Materials.Silver.getPlasma(1000), + Materials.Titanium.getPlasma(1000), + Materials.Americium.getPlasma(1000), + Materials.Bismuth.getPlasma(1000), + Materials.Oxygen.getPlasma(1000), + Materials.Tin.getPlasma(1000)) + .duration(100) + .eut(EXOTIC_EU_PER_L) + .addTo(sTranscendentPlasmaMixerRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java index a0411a5365..db006d1ef5 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java @@ -19,273 +19,519 @@ public class VacuumFreezerRecipes implements Runnable { { // reactor heat switch { - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitch", 1L, 32767)) - .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitch", 1L, 1)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitchCore", 1L, 32767)) - .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitchCore", 1L, 1)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitchSpread", 1L, 32767)) - .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitchSpread", 1L, 1)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitchDiamond", 1L, 32767)) - .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitchDiamond", 1L, 1)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitch", 1L, 32767)) + .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitch", 1L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitchCore", 1L, 32767)) + .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitchCore", 1L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitchSpread", 1L, 32767)) + .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitchSpread", 1L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("reactorHeatSwitchDiamond", 1L, 32767)) + .itemOutputs(GT_ModHandler.getIC2Item("reactorHeatSwitchDiamond", 1L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); } // reactor vent { - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("reactorVent", 1L, 32767)) - .itemOutputs(GT_ModHandler.getIC2Item("reactorVent", 1L, 1)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("reactorVentCore", 1L, 32767)) - .itemOutputs(GT_ModHandler.getIC2Item("reactorVentCore", 1L, 1)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("reactorVentGold", 1L, 32767)) - .itemOutputs(GT_ModHandler.getIC2Item("reactorVentGold", 1L, 1)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("reactorVentDiamond", 1L, 32767)) - .itemOutputs(GT_ModHandler.getIC2Item("reactorVentDiamond", 1L, 1)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("reactorVent", 1L, 32767)) + .itemOutputs(GT_ModHandler.getIC2Item("reactorVent", 1L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("reactorVentCore", 1L, 32767)) + .itemOutputs(GT_ModHandler.getIC2Item("reactorVentCore", 1L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("reactorVentGold", 1L, 32767)) + .itemOutputs(GT_ModHandler.getIC2Item("reactorVentGold", 1L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("reactorVentDiamond", 1L, 32767)) + .itemOutputs(GT_ModHandler.getIC2Item("reactorVentDiamond", 1L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); } // reactor vent spread - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("reactorVentSpread", 1L, 32767)) - .itemOutputs(GT_ModHandler.getIC2Item("reactorVentSpread", 1L, 0)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("reactorVentSpread", 1L, 32767)) + .itemOutputs(GT_ModHandler.getIC2Item("reactorVentSpread", 1L, 0)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); // reactor coolant { - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L, 32767)) - .itemOutputs(GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L, 1)).noFluidInputs() - .noFluidOutputs().duration(10 * TICKS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L, 32767)) + .itemOutputs(GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("reactorCoolantTriple", 1L, 32767)) + .itemOutputs(GT_ModHandler.getIC2Item("reactorCoolantTriple", 1L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("reactorCoolantSix", 1L, 32767)) + .itemOutputs(GT_ModHandler.getIC2Item("reactorCoolantSix", 1L, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Reactor_Coolant_He_1.getWildcard(1L)) + .itemOutputs(ItemList.Reactor_Coolant_He_1.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Reactor_Coolant_He_3.getWildcard(1L)) + .itemOutputs(ItemList.Reactor_Coolant_He_3.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(9 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Reactor_Coolant_He_6.getWildcard(1L)) + .itemOutputs(ItemList.Reactor_Coolant_He_6.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(18 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Reactor_Coolant_NaK_1.getWildcard(1L)) + .itemOutputs(ItemList.Reactor_Coolant_NaK_1.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Reactor_Coolant_NaK_3.getWildcard(1L)) + .itemOutputs(ItemList.Reactor_Coolant_NaK_3.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(9 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Reactor_Coolant_NaK_6.getWildcard(1L)) + .itemOutputs(ItemList.Reactor_Coolant_NaK_6.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(18 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.neutroniumHeatCapacitor.getWildcard(1L)) + .itemOutputs(ItemList.neutroniumHeatCapacitor.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(13 * HOURS + 53 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Reactor_Coolant_Sp_1.getWildcard(1L)) + .itemOutputs(ItemList.Reactor_Coolant_Sp_1.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(9 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Reactor_Coolant_Sp_2.getWildcard(1L)) + .itemOutputs(ItemList.Reactor_Coolant_Sp_2.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(18 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Reactor_Coolant_Sp_3.getWildcard(1L)) + .itemOutputs(ItemList.Reactor_Coolant_Sp_3.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(27 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Reactor_Coolant_Sp_6.getWildcard(1L)) + .itemOutputs(ItemList.Reactor_Coolant_Sp_6.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(54 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("reactorCoolantTriple", 1L, 32767)) - .itemOutputs(GT_ModHandler.getIC2Item("reactorCoolantTriple", 1L, 1)).noFluidInputs() - .noFluidOutputs().duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("reactorCoolantSix", 1L, 32767)) - .itemOutputs(GT_ModHandler.getIC2Item("reactorCoolantSix", 1L, 1)).noFluidInputs() - .noFluidOutputs().duration(3 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Reactor_Coolant_He_1.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_He_1.get(1L)).noFluidInputs().noFluidOutputs() - .duration(3 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Reactor_Coolant_He_3.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_He_3.get(1L)).noFluidInputs().noFluidOutputs() - .duration(9 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Reactor_Coolant_He_6.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_He_6.get(1L)).noFluidInputs().noFluidOutputs() - .duration(18 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Reactor_Coolant_NaK_1.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_NaK_1.get(1L)).noFluidInputs().noFluidOutputs() - .duration(3 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Reactor_Coolant_NaK_3.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_NaK_3.get(1L)).noFluidInputs().noFluidOutputs() - .duration(9 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + } + } - GT_Values.RA.stdBuilder().itemInputs(ItemList.Reactor_Coolant_NaK_6.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_NaK_6.get(1L)).noFluidInputs().noFluidOutputs() - .duration(18 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + // fluid vacuum + { + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ice, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.neutroniumHeatCapacitor.getWildcard(1L)) - .itemOutputs(ItemList.neutroniumHeatCapacitor.get(1L)).noFluidInputs().noFluidOutputs() - .duration(13 * HOURS + 53 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sVacuumRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Reactor_Coolant_Sp_1.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_1.get(1L)).noFluidInputs().noFluidOutputs() - .duration(9 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(60 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sVacuumRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Reactor_Coolant_Sp_2.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_2.get(1L)).noFluidInputs().noFluidOutputs() - .duration(18 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("airCell", 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 8 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sVacuumRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Reactor_Coolant_Sp_3.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_3.get(1L)).noFluidInputs().noFluidOutputs() - .duration(27 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Reactor_Coolant_Sp_1.getWildcard(1L)) + .itemOutputs(ItemList.Reactor_Coolant_Sp_1.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemList.Reactor_Coolant_Sp_6.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_6.get(1L)).noFluidInputs().noFluidOutputs() - .duration(54 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Reactor_Coolant_Sp_2.getWildcard(1L)) + .itemOutputs(ItemList.Reactor_Coolant_Sp_2.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(3 * MINUTES) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); - } - } + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Reactor_Coolant_Sp_3.getWildcard(1L)) + .itemOutputs(ItemList.Reactor_Coolant_Sp_3.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(4 * MINUTES + 30 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); - // fluid vacuum - { - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Water, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ice, 1L)).noFluidInputs() - .noFluidOutputs().duration(2 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L)).noFluidInputs() - .noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L)) - .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getIC2Item("airCell", 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L)).noFluidInputs() - .noFluidOutputs().duration(1 * SECONDS + 8 * TICKS).eut(TierEU.RECIPE_HV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Reactor_Coolant_Sp_1.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_1.get(1L)).noFluidInputs().noFluidOutputs() - .duration(1 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Reactor_Coolant_Sp_2.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_2.get(1L)).noFluidInputs().noFluidOutputs() - .duration(3 * MINUTES).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Reactor_Coolant_Sp_3.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_3.get(1L)).noFluidInputs().noFluidOutputs() - .duration(4 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs(ItemList.Reactor_Coolant_Sp_6.getWildcard(1L)) - .itemOutputs(ItemList.Reactor_Coolant_Sp_6.get(1L)).noFluidInputs().noFluidOutputs() - .duration(9 * MINUTES).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Reactor_Coolant_Sp_6.getWildcard(1L)) + .itemOutputs(ItemList.Reactor_Coolant_Sp_6.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(9 * MINUTES) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); } // Freeze superconductors. { GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Pentacadmiummagnesiumhexaoxid, 1L)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Pentacadmiummagnesiumhexaoxid, 1L)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Titaniumonabariumdecacoppereikosaoxid, 1L)) - .itemOutputs( - GT_OreDictUnificator - .get(OrePrefixes.ingot, Materials.Titaniumonabariumdecacoppereikosaoxid, 1L)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_HV) - .addTo(sVacuumRecipes); + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.ingotHot, + Materials.Pentacadmiummagnesiumhexaoxid, + 1L)) + .itemOutputs( + GT_OreDictUnificator.get( + OrePrefixes.ingot, + Materials.Pentacadmiummagnesiumhexaoxid, + 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Uraniumtriplatinid, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Uraniumtriplatinid, 1L)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_EV) - .addTo(sVacuumRecipes); + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.ingotHot, + Materials.Titaniumonabariumdecacoppereikosaoxid, + 1L)) + .itemOutputs( + GT_OreDictUnificator.get( + OrePrefixes.ingot, + Materials.Titaniumonabariumdecacoppereikosaoxid, + 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sVacuumRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Vanadiumtriindinid, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Vanadiumtriindinid, 1L)) - .noFluidInputs().noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_IV) - .addTo(sVacuumRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Uraniumtriplatinid, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Uraniumtriplatinid, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sVacuumRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get( - OrePrefixes.ingotHot, - Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, - 1L)) - .itemOutputs( - GT_OreDictUnificator.get( - OrePrefixes.ingot, - Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, - 1L)) - .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_LuV) - .addTo(sVacuumRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Vanadiumtriindinid, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Vanadiumtriindinid, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_IV) + .addTo(sVacuumRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator - .get(OrePrefixes.ingotHot, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 1L)) - .itemOutputs( - GT_OreDictUnificator - .get(OrePrefixes.ingot, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 1L)) - .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_ZPM) - .addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Longasssuperconductornameforuvwire, 1L)) - .itemOutputs( - GT_OreDictUnificator - .get(OrePrefixes.ingot, Materials.Longasssuperconductornameforuvwire, 1L)) - .noFluidInputs().noFluidOutputs().duration(40 * SECONDS).eut(TierEU.RECIPE_UV) - .addTo(sVacuumRecipes); - - GT_Values.RA.stdBuilder().itemInputs( - GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Longasssuperconductornameforuhvwire, 1L)) - .itemOutputs( - GT_OreDictUnificator - .get(OrePrefixes.ingot, Materials.Longasssuperconductornameforuhvwire, 1L)) - .noFluidInputs().noFluidOutputs().duration(1 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_UHV) - .addTo(sVacuumRecipes); + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.ingotHot, + Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, + 1L)) + .itemOutputs( + GT_OreDictUnificator.get( + OrePrefixes.ingot, + Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, + 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LuV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.ingotHot, + Materials.Tetranaquadahdiindiumhexaplatiumosminid, + 1L)) + .itemOutputs( + GT_OreDictUnificator.get( + OrePrefixes.ingot, + Materials.Tetranaquadahdiindiumhexaplatiumosminid, + 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_ZPM) + .addTo(sVacuumRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUEVBase, 1L)) - .noFluidInputs().noFluidOutputs().duration(2 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_UEV) - .addTo(sVacuumRecipes); + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.ingotHot, + Materials.Longasssuperconductornameforuvwire, + 1L)) + .itemOutputs( + GT_OreDictUnificator.get( + OrePrefixes.ingot, + Materials.Longasssuperconductornameforuvwire, + 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(40 * SECONDS) + .eut(TierEU.RECIPE_UV) + .addTo(sVacuumRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUIVBase, 1L)) - .noFluidInputs().noFluidOutputs().duration(2 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_UIV) - .addTo(sVacuumRecipes); + .itemInputs( + GT_OreDictUnificator.get( + OrePrefixes.ingotHot, + Materials.Longasssuperconductornameforuhvwire, + 1L)) + .itemOutputs( + GT_OreDictUnificator.get( + OrePrefixes.ingot, + Materials.Longasssuperconductornameforuhvwire, + 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_UHV) + .addTo(sVacuumRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUMVBase, 1L)) - .noFluidInputs().noFluidOutputs().duration(2 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_UMV) - .addTo(sVacuumRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUEVBase, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_UEV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUIVBase, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_UIV) + .addTo(sVacuumRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUMVBase, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_UMV) + .addTo(sVacuumRecipes); } // Plasma Freezing { GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Americium, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Americium, 1L)) - .noFluidInputs().noFluidOutputs().duration(20 * TICKS).eut(TierEU.RECIPE_LuV).addTo(sVacuumRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Americium, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Americium, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(20 * TICKS) + .eut(TierEU.RECIPE_LuV) + .addTo(sVacuumRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L)).noFluidInputs() - .noFluidOutputs().duration(5 * TICKS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Nitrogen, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L)).noFluidInputs() - .noFluidOutputs().duration(1 * SECONDS + 8 * TICKS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Nitrogen, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 8 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Oxygen, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)).noFluidInputs() - .noFluidOutputs().duration(1 * SECONDS + 12 * TICKS).eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Oxygen, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(1 * SECONDS + 12 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sVacuumRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Radon, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV).addTo(sVacuumRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Radon, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sVacuumRecipes); - GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs().fluidInputs(Materials.Boron.getPlasma(144L)) - .fluidOutputs(Materials.Boron.getPlasma(144L)).duration(20 * TICKS).eut(12).addTo(sVacuumRecipes); + GT_Values.RA.stdBuilder() + .noItemInputs() + .noItemOutputs() + .fluidInputs(Materials.Boron.getPlasma(144L)) + .fluidOutputs(Materials.Boron.getPlasma(144L)) + .duration(20 * TICKS) + .eut(12) + .addTo(sVacuumRecipes); } if (GTPlusPlus.isModLoaded()) { // hot transcendent metal ingot cooling GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.TranscendentMetal, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TranscendentMetal, 1L)) - .fluidInputs( - new FluidStack(FluidRegistry.getFluid("molten.titansteel"), 144), - Materials.SuperCoolant.getFluid(1000)) - .noFluidOutputs().duration(20 * TICKS).eut(TierEU.RECIPE_UIV).addTo(sVacuumRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.TranscendentMetal, 1L)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TranscendentMetal, 1L)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("molten.titansteel"), 144), + Materials.SuperCoolant.getFluid(1000)) + .noFluidOutputs() + .duration(20 * TICKS) + .eut(TierEU.RECIPE_UIV) + .addTo(sVacuumRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java index c6a8023686..3803d18c3f 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java @@ -20,96 +20,152 @@ public class WiremillRecipes implements Runnable { void registerWiremillRecipes(Materials materials, int baseDuration, int eut, OrePrefixes prefix1, OrePrefixes prefix2, int multiplier) { GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(prefix1, materials, 1L), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, materials, multiplier)).noFluidInputs() - .noFluidOutputs().duration(baseDuration).eut(eut).addTo(sWiremillRecipes); + .itemInputs(GT_OreDictUnificator.get(prefix1, materials, 1L), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, materials, multiplier)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration) + .eut(eut) + .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix1, materials, 2L / multiplier), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt02, materials, 1L)).noFluidInputs() - .noFluidOutputs().duration((int) (baseDuration * 1.5f)).eut(eut).addTo(sWiremillRecipes); + .itemInputs( + GT_OreDictUnificator.get(prefix1, materials, 2L / multiplier), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt02, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration((int) (baseDuration * 1.5f)) + .eut(eut) + .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix1, materials, 4L / multiplier), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt04, materials, 1L)).noFluidInputs() - .noFluidOutputs().duration(baseDuration * 2).eut(eut).addTo(sWiremillRecipes); + .itemInputs( + GT_OreDictUnificator.get(prefix1, materials, 4L / multiplier), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt04, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration * 2) + .eut(eut) + .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix1, materials, 8L / multiplier), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt08, materials, 1L)).noFluidInputs() - .noFluidOutputs().duration((int) (baseDuration * 2.5f)).eut(eut).addTo(sWiremillRecipes); + .itemInputs( + GT_OreDictUnificator.get(prefix1, materials, 8L / multiplier), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt08, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration((int) (baseDuration * 2.5f)) + .eut(eut) + .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix1, materials, 12L / multiplier), - GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt12, materials, 1L)).noFluidInputs() - .noFluidOutputs().duration(baseDuration * 3).eut(eut).addTo(sWiremillRecipes); + .itemInputs( + GT_OreDictUnificator.get(prefix1, materials, 12L / multiplier), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt12, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration * 3) + .eut(eut) + .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix1, materials, 16L / multiplier), - GT_Utility.getIntegratedCircuit(16)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt16, materials, 1L)).noFluidInputs() - .noFluidOutputs().duration((int) (baseDuration * 3.5f)).eut(eut).addTo(sWiremillRecipes); + .itemInputs( + GT_OreDictUnificator.get(prefix1, materials, 16L / multiplier), + GT_Utility.getIntegratedCircuit(16)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt16, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration((int) (baseDuration * 3.5f)) + .eut(eut) + .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix2, materials, 2L / multiplier), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, materials, 1L)).noFluidInputs() - .noFluidOutputs().duration(baseDuration / 2).eut(eut).addTo(sWiremillRecipes); + .itemInputs( + GT_OreDictUnificator.get(prefix2, materials, 2L / multiplier), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration / 2) + .eut(eut) + .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix2, materials, 4L / multiplier), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt02, materials, 1L)).noFluidInputs() - .noFluidOutputs().duration(baseDuration).eut(eut).addTo(sWiremillRecipes); + .itemInputs( + GT_OreDictUnificator.get(prefix2, materials, 4L / multiplier), + GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt02, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration) + .eut(eut) + .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix2, materials, 8L / multiplier), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt04, materials, 1L)).noFluidInputs() - .noFluidOutputs().duration((int) (baseDuration * 1.5f)).eut(eut).addTo(sWiremillRecipes); + .itemInputs( + GT_OreDictUnificator.get(prefix2, materials, 8L / multiplier), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt04, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration((int) (baseDuration * 1.5f)) + .eut(eut) + .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix2, materials, 16L / multiplier), - GT_Utility.getIntegratedCircuit(8)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt08, materials, 1L)).noFluidInputs() - .noFluidOutputs().duration(baseDuration * 2).eut(eut).addTo(sWiremillRecipes); + .itemInputs( + GT_OreDictUnificator.get(prefix2, materials, 16L / multiplier), + GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt08, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration * 2) + .eut(eut) + .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix2, materials, 24L / multiplier), - GT_Utility.getIntegratedCircuit(12)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt12, materials, 1L)).noFluidInputs() - .noFluidOutputs().duration((int) (baseDuration * 2.5f)).eut(eut).addTo(sWiremillRecipes); + .itemInputs( + GT_OreDictUnificator.get(prefix2, materials, 24L / multiplier), + GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt12, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration((int) (baseDuration * 2.5f)) + .eut(eut) + .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(prefix2, materials, 32L / multiplier), - GT_Utility.getIntegratedCircuit(16)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt16, materials, 1L)).noFluidInputs() - .noFluidOutputs().duration(baseDuration * 3).eut(eut).addTo(sWiremillRecipes); + .itemInputs( + GT_OreDictUnificator.get(prefix2, materials, 32L / multiplier), + GT_Utility.getIntegratedCircuit(16)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt16, materials, 1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration * 3) + .eut(eut) + .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(prefix1, materials, 1L), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, materials, 4L * multiplier)).noFluidInputs() - .noFluidOutputs().duration(baseDuration).eut(eut).addTo(sWiremillRecipes); + .itemInputs(GT_OreDictUnificator.get(prefix1, materials, 1L), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, materials, 4L * multiplier)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration) + .eut(eut) + .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(prefix2, materials, 1L), GT_Utility.getIntegratedCircuit(3)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, materials, 2L * multiplier)).noFluidInputs() - .noFluidOutputs().duration(baseDuration / 2).eut(eut).addTo(sWiremillRecipes); + .itemInputs(GT_OreDictUnificator.get(prefix2, materials, 1L), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireFine, materials, 2L * multiplier)) + .noFluidInputs() + .noFluidOutputs() + .duration(baseDuration / 2) + .eut(eut) + .addTo(sWiremillRecipes); } void registerWiremillRecipes(Materials aMaterial, int baseDuration, int aEUt) { @@ -129,35 +185,69 @@ public class WiremillRecipes implements Runnable { registerWiremillRecipes(Materials.SpaceTime, 20 * SECONDS, 32_000); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Polycaprolactam, 1L)) - .itemOutputs(new ItemStack(Items.string, 32)).noFluidInputs().noFluidOutputs().duration(4 * SECONDS) - .eut(48).addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Polycaprolactam, 1L)) + .itemOutputs(new ItemStack(Items.string, 32)) + .noFluidInputs() + .noFluidOutputs() + .duration(4 * SECONDS) + .eut(48) + .addTo(sWiremillRecipes); if (!GT_Mod.gregtechproxy.mDisableIC2Cables) { - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1L)) - .itemOutputs(GT_ModHandler.getIC2Item("copperCableItem", 3L)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(2).addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1L)) + .itemOutputs(GT_ModHandler.getIC2Item("copperCableItem", 3L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(2) + .addTo(sWiremillRecipes); GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnnealedCopper, 1L)) - .itemOutputs(GT_ModHandler.getIC2Item("copperCableItem", 3L)).noFluidInputs().noFluidOutputs() - .duration(5 * SECONDS).eut(2).addTo(sWiremillRecipes); + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnnealedCopper, 1L)) + .itemOutputs(GT_ModHandler.getIC2Item("copperCableItem", 3L)) + .noFluidInputs() + .noFluidOutputs() + .duration(5 * SECONDS) + .eut(2) + .addTo(sWiremillRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 1L)) - .itemOutputs(GT_ModHandler.getIC2Item("tinCableItem", 4L)).noFluidInputs().noFluidOutputs() - .duration(7 * SECONDS + 10 * TICKS).eut(1).addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 1L)) + .itemOutputs(GT_ModHandler.getIC2Item("tinCableItem", 4L)) + .noFluidInputs() + .noFluidOutputs() + .duration(7 * SECONDS + 10 * TICKS) + .eut(1) + .addTo(sWiremillRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L)) - .itemOutputs(GT_ModHandler.getIC2Item("ironCableItem", 6L)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(2).addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L)) + .itemOutputs(GT_ModHandler.getIC2Item("ironCableItem", 6L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(2) + .addTo(sWiremillRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L)) - .itemOutputs(GT_ModHandler.getIC2Item("ironCableItem", 6L)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(2).addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L)) + .itemOutputs(GT_ModHandler.getIC2Item("ironCableItem", 6L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(2) + .addTo(sWiremillRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L)) - .itemOutputs(GT_ModHandler.getIC2Item("goldCableItem", 6L)).noFluidInputs().noFluidOutputs() - .duration(10 * SECONDS).eut(1).addTo(sWiremillRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L)) + .itemOutputs(GT_ModHandler.getIC2Item("goldCableItem", 6L)) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(1) + .addTo(sWiremillRecipes); } } } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java index 4e9566c2d1..73ef51c411 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java @@ -71,13 +71,16 @@ public class GT_Loader_ItemData implements Runnable { GT_ModHandler.getModItem("appliedenergistics2", "tile.BlockQuartzChiseled", 1L, 32767), new ItemData(Materials.CertusQuartz, 14515200L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.wheat, 1, 32767), new ItemData(Materials.Wheat, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.hay_block, 1, 32767), new ItemData(Materials.Wheat, 32659200L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.hay_block, 1, 32767), + new ItemData(Materials.Wheat, 32659200L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Items.snowball, 1, 32767), + new ItemData(Materials.Snow, 907200L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.glowstone, 1, 32767), new ItemData(Materials.Glowstone, 14515200L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.glowstone, 1, 32767), + new ItemData(Materials.Glowstone, 14515200L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.redstone_lamp, 1, 32767), new ItemData( @@ -94,46 +97,60 @@ public class GT_Loader_ItemData implements Runnable { GT_ModHandler.getModItem("Forestry", "craftingMaterial", 1L, 5), new ItemData(Materials.Ice, 3628800L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.packed_ice, 1, 32767), new ItemData(Materials.Ice, 7257600L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Items.clay_ball, 1, 32767), new ItemData(Materials.Clay, 1814400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.packed_ice, 1, 32767), + new ItemData(Materials.Ice, 7257600L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Items.clay_ball, 1, 32767), + new ItemData(Materials.Clay, 1814400L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.clay, 1, 32767), new ItemData(Materials.Clay, 7257600L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.hardened_clay, 1, 32767), new ItemData(Materials.Clay, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.hardened_clay, 1, 32767), + new ItemData(Materials.Clay, 3628800L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.stained_hardened_clay, 1, 32767), new ItemData(Materials.Clay, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.brick_block, 1, 32767), new ItemData(Materials.Brick, 3628800L)); - GT_OreDictUnificator - .addItemData(GT_ModHandler.getIC2Item("Uran238", 1L), new ItemData(Materials.Uranium, 3628800L)); - GT_OreDictUnificator - .addItemData(GT_ModHandler.getIC2Item("Uran235", 1L), new ItemData(Materials.Uranium235, 3628800L)); - GT_OreDictUnificator - .addItemData(GT_ModHandler.getIC2Item("Plutonium", 1L), new ItemData(Materials.Plutonium, 3628800L)); - GT_OreDictUnificator - .addItemData(GT_ModHandler.getIC2Item("smallUran235", 1L), new ItemData(Materials.Uranium235, 403200L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.brick_block, 1, 32767), + new ItemData(Materials.Brick, 3628800L)); + GT_OreDictUnificator.addItemData( + GT_ModHandler.getIC2Item("Uran238", 1L), + new ItemData(Materials.Uranium, 3628800L)); + GT_OreDictUnificator.addItemData( + GT_ModHandler.getIC2Item("Uran235", 1L), + new ItemData(Materials.Uranium235, 3628800L)); + GT_OreDictUnificator.addItemData( + GT_ModHandler.getIC2Item("Plutonium", 1L), + new ItemData(Materials.Plutonium, 3628800L)); + GT_OreDictUnificator.addItemData( + GT_ModHandler.getIC2Item("smallUran235", 1L), + new ItemData(Materials.Uranium235, 403200L)); GT_OreDictUnificator.addItemData( GT_ModHandler.getIC2Item("smallPlutonium", 1L), new ItemData(Materials.Plutonium, 403200L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Iron.get(1L), new ItemData(Materials.Iron, 1814400L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Gold.get(1L), new ItemData(Materials.Gold, 1814400L)); - GT_OreDictUnificator - .addItemData(ItemList.IC2_Item_Casing_Bronze.get(1L), new ItemData(Materials.Bronze, 1814400L)); - GT_OreDictUnificator - .addItemData(ItemList.IC2_Item_Casing_Copper.get(1L), new ItemData(Materials.Copper, 1814400L)); + GT_OreDictUnificator.addItemData( + ItemList.IC2_Item_Casing_Bronze.get(1L), + new ItemData(Materials.Bronze, 1814400L)); + GT_OreDictUnificator.addItemData( + ItemList.IC2_Item_Casing_Copper.get(1L), + new ItemData(Materials.Copper, 1814400L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Tin.get(1L), new ItemData(Materials.Tin, 1814400L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Lead.get(1L), new ItemData(Materials.Lead, 1814400L)); - GT_OreDictUnificator - .addItemData(ItemList.IC2_Item_Casing_Steel.get(1L), new ItemData(Materials.Steel, 1814400L)); + GT_OreDictUnificator.addItemData( + ItemList.IC2_Item_Casing_Steel.get(1L), + new ItemData(Materials.Steel, 1814400L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Items.written_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Items.writable_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Items.enchanted_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Items.written_book, 1, 32767), + new ItemData(Materials.Paper, 10886400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Items.writable_book, 1, 32767), + new ItemData(Materials.Paper, 10886400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Items.enchanted_book, 1, 32767), + new ItemData(Materials.Paper, 10886400L)); GT_OreDictUnificator.addItemData( new ItemStack(Items.golden_apple, 1, 1), new ItemData(Materials.Gold, OrePrefixes.block.mMaterialAmount * 8L)); @@ -149,13 +166,15 @@ public class GT_Loader_ItemData implements Runnable { GT_OreDictUnificator.addItemData(new ItemStack(Items.minecart, 1), new ItemData(Materials.Iron, 18144000L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.iron_door, 1), new ItemData(Materials.Iron, 21772800L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.cauldron, 1), new ItemData(Materials.Iron, 25401600L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.iron_bars, 8, 32767), new ItemData(Materials.Iron, 10886400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.iron_bars, 8, 32767), + new ItemData(Materials.Iron, 10886400L)); GT_OreDictUnificator.addItemData( GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.SteelBars", 8L, 0), new ItemData(Materials.Steel, 10886400L)); - GT_OreDictUnificator - .addItemData(GT_ModHandler.getIC2Item("ironFurnace", 1L), new ItemData(Materials.Iron, 18144000L)); + GT_OreDictUnificator.addItemData( + GT_ModHandler.getIC2Item("ironFurnace", 1L), + new ItemData(Materials.Iron, 18144000L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Food_Can_Empty.get(1L), new ItemData(Materials.Tin, 1814400L)); GT_OreDictUnificator.addItemData(ItemList.IC2_Fuel_Rod_Empty.get(1L), new ItemData(Materials.Iron, 3628800L)); GT_OreDictUnificator.addItemData( @@ -188,17 +207,21 @@ public class GT_Loader_ItemData implements Runnable { OrePrefixes.ring.mMaterialAmount * 2L, new MaterialStack(Materials.Wood, 3628800L))); GT_OreDictUnificator.addItemData(ItemList.Bottle_Empty.get(1L), new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Items.potionitem, 1, 32767), new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stained_glass, 1, 32767), new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.glass, 1, 32767), new ItemData(Materials.Glass, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Items.potionitem, 1, 32767), + new ItemData(Materials.Glass, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stained_glass, 1, 32767), + new ItemData(Materials.Glass, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.glass, 1, 32767), + new ItemData(Materials.Glass, 3628800L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.stained_glass_pane, 1, 32767), new ItemData(Materials.Glass, 1360800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.glass_pane, 1, 32767), new ItemData(Materials.Glass, 1360800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.glass_pane, 1, 32767), + new ItemData(Materials.Glass, 1360800L)); GT_OreDictUnificator.addItemData( new ItemStack(Items.clock, 1, 32767), new ItemData(Materials.Gold, 14515200L, new MaterialStack(Materials.Redstone, 3628800L))); @@ -214,8 +237,9 @@ public class GT_Loader_ItemData implements Runnable { GT_OreDictUnificator.addItemData( new ItemStack(Items.diamond_horse_armor, 1, 32767), new ItemData(Materials.Diamond, 29030400L, new MaterialStack(Materials.Leather, 21772800L))); - GT_OreDictUnificator - .addItemData(new ItemStack(Items.leather, 1, 32767), new ItemData(Materials.Leather, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Items.leather, 1, 32767), + new ItemData(Materials.Leather, 3628800L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.beacon, 1, 32767), new ItemData( @@ -240,87 +264,120 @@ public class GT_Loader_ItemData implements Runnable { new ItemStack(Blocks.lever, 1, 32767), new ItemData(Materials.Stone, 3628800L, new MaterialStack(Materials.Wood, 1814400L))); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.packed_ice, 1, 32767), new ItemData(Materials.Ice, 7257600L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.packed_ice, 1, 32767), + new ItemData(Materials.Ice, 7257600L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Items.snowball, 1, 32767), + new ItemData(Materials.Snow, 907200L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow_layer, 1, 32767), new ItemData(Materials.Snow, -1L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.sand, 1, 32767), new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.sandstone, 1, 32767), new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone_slab, 1, 0), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone_slab, 1, 8), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 0), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 8), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone_slab, 1, 1), new ItemData(Materials.Sand, 1814400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone_slab, 1, 9), new ItemData(Materials.Sand, 1814400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 1), new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 9), new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone_slab, 1, 2), new ItemData(Materials.Wood, 1814400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone_slab, 1, 10), new ItemData(Materials.Wood, 1814400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 2), new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 10), new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone_slab, 1, 3), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone_slab, 1, 11), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 3), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 11), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone_slab, 1, 5), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone_slab, 1, 13), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 5), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 13), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.furnace, 1, 32767), new ItemData(Materials.Stone, 29030400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.lit_furnace, 1, 32767), new ItemData(Materials.Stone, 29030400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stonebrick, 1, 32767), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.cobblestone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.sandstone, 1, 32767), + new ItemData(Materials.Sand, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stone_slab, 1, 0), + new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stone_slab, 1, 8), + new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.double_stone_slab, 1, 0), + new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.double_stone_slab, 1, 8), + new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stone_slab, 1, 1), + new ItemData(Materials.Sand, 1814400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stone_slab, 1, 9), + new ItemData(Materials.Sand, 1814400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.double_stone_slab, 1, 1), + new ItemData(Materials.Sand, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.double_stone_slab, 1, 9), + new ItemData(Materials.Sand, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stone_slab, 1, 2), + new ItemData(Materials.Wood, 1814400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stone_slab, 1, 10), + new ItemData(Materials.Wood, 1814400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.double_stone_slab, 1, 2), + new ItemData(Materials.Wood, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.double_stone_slab, 1, 10), + new ItemData(Materials.Wood, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stone_slab, 1, 3), + new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stone_slab, 1, 11), + new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.double_stone_slab, 1, 3), + new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.double_stone_slab, 1, 11), + new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stone_slab, 1, 5), + new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stone_slab, 1, 13), + new ItemData(Materials.Stone, 1814400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.double_stone_slab, 1, 5), + new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.double_stone_slab, 1, 13), + new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stone, 1, 32767), + new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.furnace, 1, 32767), + new ItemData(Materials.Stone, 29030400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.lit_furnace, 1, 32767), + new ItemData(Materials.Stone, 29030400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stonebrick, 1, 32767), + new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.cobblestone, 1, 32767), + new ItemData(Materials.Stone, 3628800L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.mossy_cobblestone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone_button, 1, 32767), new ItemData(Materials.Stone, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.stone_button, 1, 32767), + new ItemData(Materials.Stone, 3628800L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.stone_pressure_plate, 1, 32767), new ItemData(Materials.Stone, 7257600L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.ladder, 1, 32767), new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.wooden_button, 1, 32767), new ItemData(Materials.Wood, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.ladder, 1, 32767), + new ItemData(Materials.Wood, 3628800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.wooden_button, 1, 32767), + new ItemData(Materials.Wood, 3628800L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.wooden_pressure_plate, 1, 32767), new ItemData(Materials.Wood, 7257600L)); GT_OreDictUnificator.addItemData(new ItemStack(Blocks.fence, 1, 32767), new ItemData(Materials.Wood, 5443200L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.bowl, 1, 32767), new ItemData(Materials.Wood, 3628800L)); GT_OreDictUnificator.addItemData(new ItemStack(Items.sign, 1, 32767), new ItemData(Materials.Wood, 7257600L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Items.wooden_door, 1, 32767), new ItemData(Materials.Wood, 21772800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.chest, 1, 32767), new ItemData(Materials.Wood, 29030400L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Items.wooden_door, 1, 32767), + new ItemData(Materials.Wood, 21772800L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.chest, 1, 32767), + new ItemData(Materials.Wood, 29030400L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.trapped_chest, 1, 32767), new ItemData( @@ -339,8 +396,9 @@ public class GT_Loader_ItemData implements Runnable { GT_OreDictUnificator.addItemData( new ItemStack(Blocks.jukebox, 1, 32767), new ItemData(Materials.Wood, 29030400L, new MaterialStack(Materials.Diamond, 3628800L))); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.crafting_table, 1, 32767), new ItemData(Materials.Wood, 14515200L)); + GT_OreDictUnificator.addItemData( + new ItemStack(Blocks.crafting_table, 1, 32767), + new ItemData(Materials.Wood, 14515200L)); GT_OreDictUnificator.addItemData( new ItemStack(Blocks.piston, 1, 32767), new ItemData(Materials.Stone, 14515200L, new MaterialStack(Materials.Wood, 10886400L))); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 9fa931d4a9..a03bd1f9fe 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -56,8 +56,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { @Override public void run() { - Materials.Water.mFluid = (Materials.Ice.mFluid = GT_ModHandler.getWater(1000L).getFluid()); - Materials.Lava.mFluid = GT_ModHandler.getLava(1000L).getFluid(); + Materials.Water.mFluid = (Materials.Ice.mFluid = GT_ModHandler.getWater(1000L) + .getFluid()); + Materials.Lava.mFluid = GT_ModHandler.getLava(1000L) + .getFluid(); GT_Log.out.println("GT_Mod: Register Books."); @@ -145,29 +147,29 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { false) : tItem); - ItemList.Neutron_Reflector - .set(new GT_NeutronReflector_Item("neutronreflector", "Iridium Neutron Reflector", 0)); - ItemList.Reactor_Coolant_He_1 - .set(GregTech_API.constructCoolantCellItem("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000)); - ItemList.Reactor_Coolant_He_3 - .set(GregTech_API.constructCoolantCellItem("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000)); - ItemList.Reactor_Coolant_He_6 - .set(GregTech_API.constructCoolantCellItem("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000)); - ItemList.Reactor_Coolant_NaK_1 - .set(GregTech_API.constructCoolantCellItem("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000)); - ItemList.Reactor_Coolant_NaK_3 - .set(GregTech_API.constructCoolantCellItem("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000)); - ItemList.Reactor_Coolant_NaK_6 - .set(GregTech_API.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000)); - - ItemList.Reactor_Coolant_Sp_1 - .set(GregTech_API.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000)); - - ItemList.Reactor_Coolant_Sp_2 - .set(GregTech_API.constructCoolantCellItem("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000)); - - ItemList.Reactor_Coolant_Sp_3 - .set(GregTech_API.constructCoolantCellItem("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000)); + ItemList.Neutron_Reflector.set( + new GT_NeutronReflector_Item("neutronreflector", "Iridium Neutron Reflector", 0)); + ItemList.Reactor_Coolant_He_1.set( + GregTech_API.constructCoolantCellItem("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000)); + ItemList.Reactor_Coolant_He_3.set( + GregTech_API.constructCoolantCellItem("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000)); + ItemList.Reactor_Coolant_He_6.set( + GregTech_API.constructCoolantCellItem("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000)); + ItemList.Reactor_Coolant_NaK_1.set( + GregTech_API.constructCoolantCellItem("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000)); + ItemList.Reactor_Coolant_NaK_3.set( + GregTech_API.constructCoolantCellItem("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000)); + ItemList.Reactor_Coolant_NaK_6.set( + GregTech_API.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000)); + + ItemList.Reactor_Coolant_Sp_1.set( + GregTech_API.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000)); + + ItemList.Reactor_Coolant_Sp_2.set( + GregTech_API.constructCoolantCellItem("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000)); + + ItemList.Reactor_Coolant_Sp_3.set( + GregTech_API.constructCoolantCellItem("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000)); ItemList.Reactor_Coolant_Sp_6.set( GregTech_API.constructCoolantCellItem("1080k_Space_Coolantcell", "1080k Sp Coolant Cell", 1080000)); @@ -190,16 +192,16 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { "1G Neutronium Heat Capacitor", 1000000000)); - ItemList.Depleted_Thorium_1 - .set(new GT_DepletetCell_Item("ThoriumcellDep", "Fuel Rod (Depleted Thorium)", 1)); - ItemList.Depleted_Thorium_2 - .set(new GT_DepletetCell_Item("Double_ThoriumcellDep", "Dual Fuel Rod (Depleted Thorium)", 1)); // TODO - // CHECK - // num - ItemList.Depleted_Thorium_4 - .set(new GT_DepletetCell_Item("Quad_ThoriumcellDep", "Quad Fuel Rod (Depleted Thorium)", 1)); // TODO - // CHECK - // num + ItemList.Depleted_Thorium_1.set( + new GT_DepletetCell_Item("ThoriumcellDep", "Fuel Rod (Depleted Thorium)", 1)); + ItemList.Depleted_Thorium_2.set( + new GT_DepletetCell_Item("Double_ThoriumcellDep", "Dual Fuel Rod (Depleted Thorium)", 1)); // TODO + // CHECK + // num + ItemList.Depleted_Thorium_4.set( + new GT_DepletetCell_Item("Quad_ThoriumcellDep", "Quad Fuel Rod (Depleted Thorium)", 1)); // TODO + // CHECK + // num ItemList.ThoriumCell_1.set( new GT_RadioactiveCellIC_Item( "Thoriumcell", @@ -253,12 +255,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6L)); - ItemList.Depleted_Naquadah_1 - .set(new GT_DepletetCell_Item("NaquadahcellDep", "Fuel Rod (Depleted Naquadah)", 1)); - ItemList.Depleted_Naquadah_2 - .set(new GT_DepletetCell_Item("Double_NaquadahcellDep", "Dual Fuel Rod (Depleted Naquadah)", 1)); - ItemList.Depleted_Naquadah_4 - .set(new GT_DepletetCell_Item("Quad_NaquadahcellDep", "Quad Fuel Rod (Depleted Naquadah)", 1)); + ItemList.Depleted_Naquadah_1.set( + new GT_DepletetCell_Item("NaquadahcellDep", "Fuel Rod (Depleted Naquadah)", 1)); + ItemList.Depleted_Naquadah_2.set( + new GT_DepletetCell_Item("Double_NaquadahcellDep", "Dual Fuel Rod (Depleted Naquadah)", 1)); + ItemList.Depleted_Naquadah_4.set( + new GT_DepletetCell_Item("Quad_NaquadahcellDep", "Quad Fuel Rod (Depleted Naquadah)", 1)); ItemList.NaquadahCell_1.set( new GT_RadioactiveCellIC_Item( "Naquadahcell", @@ -337,8 +339,8 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { 2000); ItemList.Depleted_MNq_1.set(new GT_DepletetCell_Item("MNqCellDep", "Fuel Rod (Depleted Nq*)", 1)); - ItemList.Depleted_MNq_2 - .set(new GT_DepletetCell_Item("Double_MNqCellDep", "Dual Fuel Rod (Depleted Nq*)", 1)); + ItemList.Depleted_MNq_2.set( + new GT_DepletetCell_Item("Double_MNqCellDep", "Dual Fuel Rod (Depleted Nq*)", 1)); ItemList.Depleted_MNq_4.set(new GT_DepletetCell_Item("Quad_MNqCellDep", "Quad Fuel Rod (Depleted Nq*)", 1)); ItemList.MNqCell_1.set( new GT_RadioactiveCellIC_Item( @@ -623,8 +625,11 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { } GT_Log.out.println("GT_Mod: Registering the BaseMetaTileEntity."); GameRegistry.registerTileEntity(tBaseMetaTileEntity.getClass(), "BaseMetaTileEntity"); - FMLInterModComms - .sendMessage("appliedenergistics2", "whitelist-spatial", tBaseMetaTileEntity.getClass().getName()); + FMLInterModComms.sendMessage( + "appliedenergistics2", + "whitelist-spatial", + tBaseMetaTileEntity.getClass() + .getName()); GT_Log.out.println("GT_Mod: Registering the BaseMetaPipeEntity."); GameRegistry.registerTileEntity(BaseMetaPipeEntity.class, "BaseMetaPipeEntity"); @@ -635,321 +640,583 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", GT_TileEntity_Ores.class.getName()); if (!GregTech_API.mIC2Classic) { GT_Log.out.println("GT_Mod: Registering Fluids."); - Materials.ConstructionFoam.mFluid = GT_Utility - .getFluidForFilledItem(GT_ModHandler.getIC2Item("CFCell", 1L), true).getFluid(); - Materials.UUMatter.mFluid = GT_Utility - .getFluidForFilledItem(GT_ModHandler.getIC2Item("uuMatterCell", 1L), true).getFluid(); + Materials.ConstructionFoam.mFluid = GT_Utility.getFluidForFilledItem( + GT_ModHandler.getIC2Item("CFCell", 1L), + true) + .getFluid(); + Materials.UUMatter.mFluid = GT_Utility.getFluidForFilledItem( + GT_ModHandler.getIC2Item("uuMatterCell", 1L), + true) + .getFluid(); } - GT_FluidFactory.builder("Air").withLocalizedName("Air").withStateAndTemperature(GAS, 295).buildAndRegister() - .configureMaterials(Materials.Air) - .registerContainers(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L), 2000); - GT_FluidFactory.builder("LiquidOxygen").withLocalizedName("Liquid Oxygen").withStateAndTemperature(GAS, 60) - .buildAndRegister().configureMaterials(Materials.LiquidOxygen).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("LiquidNitrogen").withLocalizedName("Liquid Nitrogen").withStateAndTemperature(GAS, 77) - .buildAndRegister().configureMaterials(Materials.LiquidNitrogen).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("LiquidAir").withLocalizedName("Liquid Air").withStateAndTemperature(LIQUID, 77) - .buildAndRegister().configureMaterials(Materials.LiquidAir).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Oxygen").withLocalizedName("Oxygen").withStateAndTemperature(GAS, 295) - .buildAndRegister().configureMaterials(Materials.Oxygen).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Hydrogen").withLocalizedName("Hydrogen").withStateAndTemperature(GAS, 295) - .buildAndRegister().configureMaterials(Materials.Hydrogen).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Deuterium").withLocalizedName("Deuterium").withStateAndTemperature(GAS, 295) - .buildAndRegister().configureMaterials(Materials.Deuterium).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Deuterium, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Tritium").withLocalizedName("Tritium").withStateAndTemperature(GAS, 295) - .buildAndRegister().configureMaterials(Materials.Tritium).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Tritium, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Helium").withLocalizedName("Helium").withStateAndTemperature(GAS, 295) - .buildAndRegister().configureMaterials(Materials.Helium).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Argon").withLocalizedName("Argon").withStateAndTemperature(GAS, 295).buildAndRegister() - .configureMaterials(Materials.Argon).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Radon").withLocalizedName("Radon").withStateAndTemperature(GAS, 295).buildAndRegister() - .configureMaterials(Materials.Radon).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L), - ItemList.Cell_Empty.get(1L)); - - GT_FluidFactory.builder("Fluorine").withLocalizedName("Fluorine").withStateAndTemperature(GAS, 53) - .buildAndRegister().configureMaterials(Materials.Fluorine).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Titaniumtetrachloride").withLocalizedName("Titaniumtetrachloride") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .configureMaterials(Materials.Titaniumtetrachloride).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Titaniumtetrachloride, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Helium-3").withLocalizedName("Helium-3").withStateAndTemperature(GAS, 295) - .buildAndRegister().configureMaterials(Materials.Helium_3).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium_3, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Methane").withLocalizedName("Methane").withStateAndTemperature(GAS, 295) - .buildAndRegister().configureMaterials(Materials.Methane).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Methane, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Nitrogen").withLocalizedName("Nitrogen").withStateAndTemperature(GAS, 295) - .buildAndRegister().configureMaterials(Materials.Nitrogen).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("NitrogenDioxide").withLocalizedName("Nitrogen Dioxide") - .withStateAndTemperature(GAS, 295).buildAndRegister().configureMaterials(Materials.NitrogenDioxide) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitrogenDioxide, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Steam").withLocalizedName("Steam").withStateAndTemperature(GAS, 375).buildAndRegister() - .configureMaterials(Materials.Water) - .registerBContainers(GT_ModHandler.getIC2Item("steamCell", 1), Materials.Empty.getCells(1)); + GT_FluidFactory.builder("Air") + .withLocalizedName("Air") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.Air) + .registerContainers(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L), 2000); + GT_FluidFactory.builder("LiquidOxygen") + .withLocalizedName("Liquid Oxygen") + .withStateAndTemperature(GAS, 60) + .buildAndRegister() + .configureMaterials(Materials.LiquidOxygen) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("LiquidNitrogen") + .withLocalizedName("Liquid Nitrogen") + .withStateAndTemperature(GAS, 77) + .buildAndRegister() + .configureMaterials(Materials.LiquidNitrogen) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("LiquidAir") + .withLocalizedName("Liquid Air") + .withStateAndTemperature(LIQUID, 77) + .buildAndRegister() + .configureMaterials(Materials.LiquidAir) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Oxygen") + .withLocalizedName("Oxygen") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.Oxygen) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Hydrogen") + .withLocalizedName("Hydrogen") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.Hydrogen) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Deuterium") + .withLocalizedName("Deuterium") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.Deuterium) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Deuterium, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Tritium") + .withLocalizedName("Tritium") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.Tritium) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Tritium, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Helium") + .withLocalizedName("Helium") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.Helium) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Argon") + .withLocalizedName("Argon") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.Argon) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Radon") + .withLocalizedName("Radon") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.Radon) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L), + ItemList.Cell_Empty.get(1L)); + + GT_FluidFactory.builder("Fluorine") + .withLocalizedName("Fluorine") + .withStateAndTemperature(GAS, 53) + .buildAndRegister() + .configureMaterials(Materials.Fluorine) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Titaniumtetrachloride") + .withLocalizedName("Titaniumtetrachloride") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Titaniumtetrachloride) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Titaniumtetrachloride, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Helium-3") + .withLocalizedName("Helium-3") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.Helium_3) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium_3, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Methane") + .withLocalizedName("Methane") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.Methane) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Methane, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Nitrogen") + .withLocalizedName("Nitrogen") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.Nitrogen) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("NitrogenDioxide") + .withLocalizedName("Nitrogen Dioxide") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.NitrogenDioxide) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitrogenDioxide, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Steam") + .withLocalizedName("Steam") + .withStateAndTemperature(GAS, 375) + .buildAndRegister() + .configureMaterials(Materials.Water) + .registerBContainers(GT_ModHandler.getIC2Item("steamCell", 1), Materials.Empty.getCells(1)); GT_Values.RA.addFluidCannerRecipe( Materials.Empty.getCells(1), GT_ModHandler.getIC2Item("steamCell", 1), GT_ModHandler.getSteam(1000), null); Materials.Ice.mGas = Materials.Water.mGas; - Materials.Water.mGas.setTemperature(375).setGaseous(true); + Materials.Water.mGas.setTemperature(375) + .setGaseous(true); ItemList.sOilExtraHeavy = GT_FluidFactory.of("liquid_extra_heavy_oil", "Very Heavy Oil", LIQUID, 295); - ItemList.sEpichlorhydrin = GT_FluidFactory.builder("liquid_epichlorhydrin").withLocalizedName("Epichlorohydrin") - .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.Epichlorohydrin) - .registerBContainers(Materials.Epichlorohydrin.getCells(1), Materials.Empty.getCells(1)).asFluid(); + ItemList.sEpichlorhydrin = GT_FluidFactory.builder("liquid_epichlorhydrin") + .withLocalizedName("Epichlorohydrin") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Epichlorohydrin) + .registerBContainers( + Materials.Epichlorohydrin.getCells(1), + Materials.Empty.getCells(1)) + .asFluid(); ItemList.sDrillingFluid = GT_FluidFactory.of("liquid_drillingfluid", "Drilling Fluid", LIQUID, 295); - ItemList.sToluene = GT_FluidFactory.builder("liquid_toluene").withLocalizedName("Toluene") - .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.Toluene) - .registerBContainers(Materials.Toluene.getCells(1), Materials.Empty.getCells(1)).asFluid(); + ItemList.sToluene = GT_FluidFactory.builder("liquid_toluene") + .withLocalizedName("Toluene") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Toluene) + .registerBContainers( + Materials.Toluene.getCells(1), + Materials.Empty.getCells(1)) + .asFluid(); ItemList.sNitrationMixture = GT_FluidFactory.builder("liquid_nitrationmixture") - .withLocalizedName("Nitration Mixture").withStateAndTemperature(LIQUID, 295).buildAndRegister() - .configureMaterials(Materials.NitrationMixture) - .registerBContainers(Materials.NitrationMixture.getCells(1), Materials.Empty.getCells(1)).asFluid(); - - GT_FluidFactory.builder("liquid_heavy_oil").withLocalizedName("Heavy Oil").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.OilHeavy).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilHeavy, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_medium_oil").withLocalizedName("Raw Oil").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.OilMedium).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilMedium, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_light_oil").withLocalizedName("Light Oil").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.OilLight).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilLight, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("gas_natural_gas").withLocalizedName("Natural Gas").withStateAndTemperature(GAS, 295) - .buildAndRegister().configureMaterials(Materials.NatruralGas).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NatruralGas, 1L), - ItemList.Cell_Empty.get(1L)); - ItemList.sHydricSulfur = GT_FluidFactory.builder("liquid_hydricsulfur").withLocalizedName("Hydrogen Sulfide") - .withStateAndTemperature(GAS, 295).buildAndRegister().configureMaterials(Materials.HydricSulfide) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), - ItemList.Cell_Empty.get(1L)) - .asFluid(); - GT_FluidFactory.builder("gas_sulfuricgas").withLocalizedName("Sulfuric Gas").withStateAndTemperature(GAS, 295) - .buildAndRegister().configureMaterials(Materials.SulfuricGas).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricGas, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("gas_gas").withLocalizedName("Refinery Gas").withStateAndTemperature(GAS, 295) - .buildAndRegister().configureMaterials(Materials.Gas).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_sulfuricnaphtha").withLocalizedName("Sulfuric Naphtha") - .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.SulfuricNaphtha) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricNaphtha, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_sufluriclight_fuel").withLocalizedName("Sulfuric Light Fuel") - .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.SulfuricLightFuel) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricLightFuel, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_sulfuricheavy_fuel").withLocalizedName("Sulfuric Heavy Fuel") - .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.SulfuricHeavyFuel) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricHeavyFuel, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_naphtha").withLocalizedName("Naphtha").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.Naphtha).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_light_fuel").withLocalizedName("Light Fuel") - .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.LightFuel) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_heavy_fuel").withLocalizedName("Heavy Fuel") - .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.HeavyFuel) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_lpg").withLocalizedName("LPG").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.LPG).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LPG, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("charcoal_byproducts").withTextureName("molten.autogenerated") - .withLocalizedName("Charcoal Byproducts").withColorRGBA(Materials.CharcoalByproducts.mRGBa) - .withStateAndTemperature(GAS, 775).buildAndRegister().configureMaterials(Materials.CharcoalByproducts) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.CharcoalByproducts, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("molten.bisphenol_a").withTextureName("molten.autogenerated") - .withLocalizedName("Molten Bisphenol A").withColorRGBA(Materials.BisphenolA.mRGBa) - .withStateAndTemperature(LIQUID, 432).buildAndRegister().configureMaterials(Materials.BisphenolA) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.BisphenolA, 1L), - ItemList.Cell_Empty.get(1L)); - - GT_FluidFactory.builder("UUAmplifier").withLocalizedName("UU Amplifier").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.UUAmplifier).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.UUAmplifier, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Chlorine").withLocalizedName("Chlorine").withStateAndTemperature(GAS, 295) - .buildAndRegister().configureMaterials(Materials.Chlorine).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Mercury").withLocalizedName("Mercury").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.Mercury).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Mercury, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("NitroFuel").withLocalizedName("Cetane-Boosted Diesel") - .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.NitroFuel) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitroFuel, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("SodiumPersulfate").withLocalizedName("Sodium Persulfate") - .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.SodiumPersulfate) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SodiumPersulfate, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Glyceryl").withLocalizedName("Glyceryl Trinitrate") - .withStateAndTemperature(LIQUID, 295).buildAndRegister().configureMaterials(Materials.Glyceryl) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glyceryl, 1L), - ItemList.Cell_Empty.get(1L)); - - GT_FluidFactory.builder("lubricant").withLocalizedName("Lubricant").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.Lubricant).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("creosote").withLocalizedName("Creosote Oil").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.Creosote).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Creosote, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("seedoil").withLocalizedName("Seed Oil").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.SeedOil).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SeedOil, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("fishoil").withLocalizedName("Fish Oil").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.FishOil).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FishOil, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("oil").withLocalizedName("Oil").withStateAndTemperature(LIQUID, 295).buildAndRegister() - .configureMaterials(Materials.Oil).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("fuel").withLocalizedName("Diesel").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.Fuel).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("for.honey").withLocalizedName("Honey").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.Honey).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Honey, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("biomass").withLocalizedName("Biomass").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.Biomass).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Biomass, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("bioethanol").withLocalizedName("Bio Ethanol").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.Ethanol).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethanol, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("sulfuricacid").withLocalizedName("Sulfuric Acid").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.SulfuricAcid).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("milk").withLocalizedName("Milk").withStateAndTemperature(LIQUID, 290) - .buildAndRegister().configureMaterials(Materials.Milk).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("mcguffium").withLocalizedName("Mc Guffium 239").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.McGuffium239).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("refinedGlue").withLocalizedName("Refined Glue").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.Glue).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("hotfryingoil").withLocalizedName("Hot Frying Oil").withStateAndTemperature(LIQUID, 400) - .buildAndRegister().configureMaterials(Materials.FryingOilHot).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FryingOilHot, 1L), - ItemList.Cell_Empty.get(1L)); + .withLocalizedName("Nitration Mixture") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.NitrationMixture) + .registerBContainers( + Materials.NitrationMixture.getCells(1), + Materials.Empty.getCells(1)) + .asFluid(); + + GT_FluidFactory.builder("liquid_heavy_oil") + .withLocalizedName("Heavy Oil") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.OilHeavy) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilHeavy, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("liquid_medium_oil") + .withLocalizedName("Raw Oil") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.OilMedium) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilMedium, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("liquid_light_oil") + .withLocalizedName("Light Oil") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.OilLight) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilLight, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("gas_natural_gas") + .withLocalizedName("Natural Gas") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.NatruralGas) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NatruralGas, 1L), + ItemList.Cell_Empty.get(1L)); + ItemList.sHydricSulfur = GT_FluidFactory.builder("liquid_hydricsulfur") + .withLocalizedName("Hydrogen Sulfide") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.HydricSulfide) + .registerBContainers( + GT_OreDictUnificator.get( + OrePrefixes.cell, + Materials.HydricSulfide, + 1L), + ItemList.Cell_Empty.get(1L)) + .asFluid(); + GT_FluidFactory.builder("gas_sulfuricgas") + .withLocalizedName("Sulfuric Gas") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.SulfuricGas) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricGas, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("gas_gas") + .withLocalizedName("Refinery Gas") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.Gas) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("liquid_sulfuricnaphtha") + .withLocalizedName("Sulfuric Naphtha") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.SulfuricNaphtha) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricNaphtha, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("liquid_sufluriclight_fuel") + .withLocalizedName("Sulfuric Light Fuel") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.SulfuricLightFuel) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricLightFuel, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("liquid_sulfuricheavy_fuel") + .withLocalizedName("Sulfuric Heavy Fuel") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.SulfuricHeavyFuel) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricHeavyFuel, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("liquid_naphtha") + .withLocalizedName("Naphtha") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Naphtha) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("liquid_light_fuel") + .withLocalizedName("Light Fuel") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.LightFuel) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("liquid_heavy_fuel") + .withLocalizedName("Heavy Fuel") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.HeavyFuel) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("liquid_lpg") + .withLocalizedName("LPG") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.LPG) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LPG, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("charcoal_byproducts") + .withTextureName("molten.autogenerated") + .withLocalizedName("Charcoal Byproducts") + .withColorRGBA(Materials.CharcoalByproducts.mRGBa) + .withStateAndTemperature(GAS, 775) + .buildAndRegister() + .configureMaterials(Materials.CharcoalByproducts) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.CharcoalByproducts, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("molten.bisphenol_a") + .withTextureName("molten.autogenerated") + .withLocalizedName("Molten Bisphenol A") + .withColorRGBA(Materials.BisphenolA.mRGBa) + .withStateAndTemperature(LIQUID, 432) + .buildAndRegister() + .configureMaterials(Materials.BisphenolA) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.BisphenolA, 1L), + ItemList.Cell_Empty.get(1L)); + + GT_FluidFactory.builder("UUAmplifier") + .withLocalizedName("UU Amplifier") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.UUAmplifier) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.UUAmplifier, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Chlorine") + .withLocalizedName("Chlorine") + .withStateAndTemperature(GAS, 295) + .buildAndRegister() + .configureMaterials(Materials.Chlorine) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Mercury") + .withLocalizedName("Mercury") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Mercury) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Mercury, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("NitroFuel") + .withLocalizedName("Cetane-Boosted Diesel") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.NitroFuel) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitroFuel, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("SodiumPersulfate") + .withLocalizedName("Sodium Persulfate") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.SodiumPersulfate) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SodiumPersulfate, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("Glyceryl") + .withLocalizedName("Glyceryl Trinitrate") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Glyceryl) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glyceryl, 1L), + ItemList.Cell_Empty.get(1L)); + + GT_FluidFactory.builder("lubricant") + .withLocalizedName("Lubricant") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Lubricant) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("creosote") + .withLocalizedName("Creosote Oil") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Creosote) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Creosote, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("seedoil") + .withLocalizedName("Seed Oil") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.SeedOil) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SeedOil, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("fishoil") + .withLocalizedName("Fish Oil") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.FishOil) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FishOil, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("oil") + .withLocalizedName("Oil") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Oil) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("fuel") + .withLocalizedName("Diesel") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Fuel) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("for.honey") + .withLocalizedName("Honey") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Honey) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Honey, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("biomass") + .withLocalizedName("Biomass") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Biomass) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Biomass, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("bioethanol") + .withLocalizedName("Bio Ethanol") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Ethanol) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethanol, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("sulfuricacid") + .withLocalizedName("Sulfuric Acid") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.SulfuricAcid) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("milk") + .withLocalizedName("Milk") + .withStateAndTemperature(LIQUID, 290) + .buildAndRegister() + .configureMaterials(Materials.Milk) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("mcguffium") + .withLocalizedName("Mc Guffium 239") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.McGuffium239) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("refinedGlue") + .withLocalizedName("Refined Glue") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Glue) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("hotfryingoil") + .withLocalizedName("Hot Frying Oil") + .withStateAndTemperature(LIQUID, 400) + .buildAndRegister() + .configureMaterials(Materials.FryingOilHot) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FryingOilHot, 1L), + ItemList.Cell_Empty.get(1L)); GT_FluidFactory.builder("DimensionallyTranscendentResidue") - .withLocalizedName("Dimensionally Transcendent Residue").withStateAndTemperature(LIQUID, 2000000000) - .buildAndRegister().configureMaterials(Materials.DimensionallyTranscendentResidue).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.DimensionallyTranscendentResidue, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("ExcitedDTCC").withLocalizedName("Excited Dimensionally Transcendent Crude Catalyst") - .withStateAndTemperature(LIQUID, 500000000).buildAndRegister().configureMaterials(Materials.ExcitedDTCC) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTCC, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("ExcitedDTPC").withLocalizedName("Excited Dimensionally Transcendent Prosaic Catalyst") - .withStateAndTemperature(LIQUID, 500000000).buildAndRegister().configureMaterials(Materials.ExcitedDTPC) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTPC, 1L), - ItemList.Cell_Empty.get(1L)); + .withLocalizedName("Dimensionally Transcendent Residue") + .withStateAndTemperature(LIQUID, 2000000000) + .buildAndRegister() + .configureMaterials(Materials.DimensionallyTranscendentResidue) + .registerBContainers( + GT_OreDictUnificator.get( + OrePrefixes.cell, + Materials.DimensionallyTranscendentResidue, + 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("ExcitedDTCC") + .withLocalizedName("Excited Dimensionally Transcendent Crude Catalyst") + .withStateAndTemperature(LIQUID, 500000000) + .buildAndRegister() + .configureMaterials(Materials.ExcitedDTCC) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTCC, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("ExcitedDTPC") + .withLocalizedName("Excited Dimensionally Transcendent Prosaic Catalyst") + .withStateAndTemperature(LIQUID, 500000000) + .buildAndRegister() + .configureMaterials(Materials.ExcitedDTPC) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTPC, 1L), + ItemList.Cell_Empty.get(1L)); GT_FluidFactory.builder("ExcitedDTRC") - .withLocalizedName("Excited Dimensionally Transcendent Resplendent Catalyst") - .withStateAndTemperature(LIQUID, 500000000).buildAndRegister().configureMaterials(Materials.ExcitedDTRC) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTRC, 1L), - ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("ExcitedDTEC").withLocalizedName("Excited Dimensionally Transcendent Exotic Catalyst") - .withStateAndTemperature(LIQUID, 500000000).buildAndRegister().configureMaterials(Materials.ExcitedDTEC) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTEC, 1L), - ItemList.Cell_Empty.get(1L)); - - GT_FluidFactory.builder(Materials.RawStarMatter.mName).withLocalizedName(Materials.RawStarMatter.mLocalizedName) - .withStateAndTemperature(LIQUID, 10_000_000).buildAndRegister() - .configureMaterials(Materials.RawStarMatter).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.RawStarMatter, 1L), - ItemList.Cell_Empty.get(1L)); - - GT_FluidFactory.builder(Materials.Space.mName).withLocalizedName(Materials.Space.mLocalizedName) - .withStateAndTemperature(MOLTEN, 0).buildAndRegister().configureMaterials(Materials.Space) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Space, 1L), - ItemList.Cell_Empty.get(1L)); - - GT_FluidFactory.builder(Materials.Time.mName).withLocalizedName(Materials.Time.mLocalizedName) - .withStateAndTemperature(MOLTEN, 0).buildAndRegister().configureMaterials(Materials.Time) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Time, 1L), - ItemList.Cell_Empty.get(1L)); - - GT_FluidFactory.builder("fieryblood").withLocalizedName("Fiery Blood").withStateAndTemperature(LIQUID, 6400) - .buildAndRegister().configureMaterials(Materials.FierySteel).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FierySteel, 1L), - ItemList.Cell_Empty.get(1L)); - - GT_FluidFactory.builder("holywater").withLocalizedName("Holy Water").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.HolyWater).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HolyWater, 1L), - ItemList.Cell_Empty.get(1L)); + .withLocalizedName("Excited Dimensionally Transcendent Resplendent Catalyst") + .withStateAndTemperature(LIQUID, 500000000) + .buildAndRegister() + .configureMaterials(Materials.ExcitedDTRC) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTRC, 1L), + ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("ExcitedDTEC") + .withLocalizedName("Excited Dimensionally Transcendent Exotic Catalyst") + .withStateAndTemperature(LIQUID, 500000000) + .buildAndRegister() + .configureMaterials(Materials.ExcitedDTEC) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTEC, 1L), + ItemList.Cell_Empty.get(1L)); + + GT_FluidFactory.builder(Materials.RawStarMatter.mName) + .withLocalizedName(Materials.RawStarMatter.mLocalizedName) + .withStateAndTemperature(LIQUID, 10_000_000) + .buildAndRegister() + .configureMaterials(Materials.RawStarMatter) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.RawStarMatter, 1L), + ItemList.Cell_Empty.get(1L)); + + GT_FluidFactory.builder(Materials.Space.mName) + .withLocalizedName(Materials.Space.mLocalizedName) + .withStateAndTemperature(MOLTEN, 0) + .buildAndRegister() + .configureMaterials(Materials.Space) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Space, 1L), + ItemList.Cell_Empty.get(1L)); + + GT_FluidFactory.builder(Materials.Time.mName) + .withLocalizedName(Materials.Time.mLocalizedName) + .withStateAndTemperature(MOLTEN, 0) + .buildAndRegister() + .configureMaterials(Materials.Time) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Time, 1L), + ItemList.Cell_Empty.get(1L)); + + GT_FluidFactory.builder("fieryblood") + .withLocalizedName("Fiery Blood") + .withStateAndTemperature(LIQUID, 6400) + .buildAndRegister() + .configureMaterials(Materials.FierySteel) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FierySteel, 1L), + ItemList.Cell_Empty.get(1L)); + + GT_FluidFactory.builder("holywater") + .withLocalizedName("Holy Water") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.HolyWater) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HolyWater, 1L), + ItemList.Cell_Empty.get(1L)); if (ItemList.TF_Vial_FieryBlood.get(1L) != null) { FluidContainerRegistry.registerFluidContainer( new FluidContainerRegistry.FluidContainerData( @@ -957,11 +1224,14 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.TF_Vial_FieryBlood.get(1L), ItemList.Bottle_Empty.get(1L))); - GT_FluidFactory.builder("liquid_sodium").withLocalizedName("Liquid Sodium") - .withStateAndTemperature(LIQUID, 495).buildAndRegister().configureMaterials(Materials.Sodium) - .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Sodium, 1L), - ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("liquid_sodium") + .withLocalizedName("Liquid Sodium") + .withStateAndTemperature(LIQUID, 495) + .buildAndRegister() + .configureMaterials(Materials.Sodium) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Sodium, 1L), + ItemList.Cell_Empty.get(1L)); } FluidContainerRegistry.registerFluidContainer( @@ -1001,44 +1271,76 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { Dyes tDye = Dyes.VALUES[i]; Fluid tFluid; tDye.addFluidDye( - GT_FluidFactory.builder("dye.watermixed." + tDye.name().toLowerCase(Locale.ENGLISH)) - .withTextureName("dyes").withLocalizedName("Water Mixed " + tDye.mName + " Dye") - .withColorRGBA(tDye.getRGBA()).withStateAndTemperature(LIQUID, 295).buildAndRegister() - .asFluid()); + GT_FluidFactory.builder( + "dye.watermixed." + tDye.name() + .toLowerCase(Locale.ENGLISH)) + .withTextureName("dyes") + .withLocalizedName("Water Mixed " + tDye.mName + " Dye") + .withColorRGBA(tDye.getRGBA()) + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .asFluid()); tDye.addFluidDye( - GT_FluidFactory.builder("dye.chemical." + tDye.name().toLowerCase(Locale.ENGLISH)) - .withTextureName("dyes").withLocalizedName("Chemical " + tDye.mName + " Dye") - .withColorRGBA(tDye.getRGBA()).withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerContainers(ItemList.SPRAY_CAN_DYES[i].get(1L), ItemList.Spray_Empty.get(1L), 2304) - .asFluid()); + GT_FluidFactory.builder( + "dye.chemical." + tDye.name() + .toLowerCase(Locale.ENGLISH)) + .withTextureName("dyes") + .withLocalizedName("Chemical " + tDye.mName + " Dye") + .withColorRGBA(tDye.getRGBA()) + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerContainers( + ItemList.SPRAY_CAN_DYES[i].get(1L), + ItemList.Spray_Empty.get(1L), + 2304) + .asFluid()); } - GT_FluidFactory.builder("ice").withLocalizedName("Crushed Ice").withStateAndTemperature(SLURRY, 270) - .buildAndRegister().configureMaterials(Materials.Ice).registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ice, 1L), - ItemList.Cell_Empty.get(1L)); + GT_FluidFactory.builder("ice") + .withLocalizedName("Crushed Ice") + .withStateAndTemperature(SLURRY, 270) + .buildAndRegister() + .configureMaterials(Materials.Ice) + .registerBContainers( + GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ice, 1L), + ItemList.Cell_Empty.get(1L)); Materials.Water.mSolid = Materials.Ice.mSolid; - GT_FluidFactory.builder("molten.glass").withLocalizedName("Molten Glass").withStateAndTemperature(MOLTEN, 1500) - .buildAndRegister().configureMaterials(Materials.Glass).registerContainers( - GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Glass, 1L), - ItemList.Cell_Empty.get(1L), - 144); - GT_FluidFactory.builder("molten.redstone").withLocalizedName("Molten Redstone") - .withStateAndTemperature(MOLTEN, 500).buildAndRegister().configureMaterials(Materials.Redstone) - .registerContainers( - GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Redstone, 1L), - ItemList.Cell_Empty.get(1L), - 144); - GT_FluidFactory.builder("molten.blaze").withLocalizedName("Molten Blaze").withStateAndTemperature(MOLTEN, 6400) - .buildAndRegister().configureMaterials(Materials.Blaze).registerContainers( - GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Blaze, 1L), - ItemList.Cell_Empty.get(1L), - 144); - GT_FluidFactory.builder("wet.concrete").withLocalizedName("Wet Concrete").withStateAndTemperature(MOLTEN, 300) - .buildAndRegister().configureMaterials(Materials.Concrete).registerContainers( - GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Concrete, 1L), - ItemList.Cell_Empty.get(1L), - 144); + GT_FluidFactory.builder("molten.glass") + .withLocalizedName("Molten Glass") + .withStateAndTemperature(MOLTEN, 1500) + .buildAndRegister() + .configureMaterials(Materials.Glass) + .registerContainers( + GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Glass, 1L), + ItemList.Cell_Empty.get(1L), + 144); + GT_FluidFactory.builder("molten.redstone") + .withLocalizedName("Molten Redstone") + .withStateAndTemperature(MOLTEN, 500) + .buildAndRegister() + .configureMaterials(Materials.Redstone) + .registerContainers( + GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Redstone, 1L), + ItemList.Cell_Empty.get(1L), + 144); + GT_FluidFactory.builder("molten.blaze") + .withLocalizedName("Molten Blaze") + .withStateAndTemperature(MOLTEN, 6400) + .buildAndRegister() + .configureMaterials(Materials.Blaze) + .registerContainers( + GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Blaze, 1L), + ItemList.Cell_Empty.get(1L), + 144); + GT_FluidFactory.builder("wet.concrete") + .withLocalizedName("Wet Concrete") + .withStateAndTemperature(MOLTEN, 300) + .buildAndRegister() + .configureMaterials(Materials.Concrete) + .registerContainers( + GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Concrete, 1L), + ItemList.Cell_Empty.get(1L), + 144); for (Materials tMaterial : Materials.values()) { if ((tMaterial.mStandardMoltenFluid == null) && (tMaterial.contains(SubTag.SMELTING_TO_FLUID)) @@ -1063,321 +1365,548 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { } } - GT_FluidFactory.builder("potion.awkward").withLocalizedName("Awkward Brew").withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.thick").withLocalizedName("Thick Brew").withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 32), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.mundane").withLocalizedName("Mundane Brew").withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 64), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.damage").withLocalizedName("Harming Brew").withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8204), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.damage.strong").withLocalizedName("Strong Harming Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8236), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.damage.splash").withLocalizedName("Splash Harming Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16396), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.damage.strong.splash").withLocalizedName("Strong Splash Harming Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16428), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.health").withLocalizedName("Healing Brew").withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8197), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.health.strong").withLocalizedName("Strong Healing Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8229), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.health.splash").withLocalizedName("Splash Healing Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16389), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.health.strong.splash").withLocalizedName("Strong Splash Healing Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16421), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed").withLocalizedName("Swiftness Brew").withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8194), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.strong").withLocalizedName("Strong Swiftness Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8226), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.long").withLocalizedName("Stretched Swiftness Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8258), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.splash").withLocalizedName("Splash Swiftness Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16386), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.strong.splash").withLocalizedName("Strong Splash Swiftness Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16418), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.long.splash").withLocalizedName("Stretched Splash Swiftness Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16450), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength").withLocalizedName("Strength Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8201), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.strong").withLocalizedName("Strong Strength Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8233), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.long").withLocalizedName("Stretched Strength Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8265), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.splash").withLocalizedName("Splash Strength Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16393), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.strong.splash").withLocalizedName("Strong Splash Strength Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16425), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.long.splash").withLocalizedName("Stretched Splash Strength Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16457), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen").withLocalizedName("Regenerating Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8193), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.strong").withLocalizedName("Strong Regenerating Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8225), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.long").withLocalizedName("Stretched Regenerating Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8257), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.splash").withLocalizedName("Splash Regenerating Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16385), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.strong.splash").withLocalizedName("Strong Splash Regenerating Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16417), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.long.splash").withLocalizedName("Stretched Splash Regenerating Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16449), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison").withLocalizedName("Poisonous Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8196), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.strong").withLocalizedName("Strong Poisonous Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8228), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.long").withLocalizedName("Stretched Poisonous Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8260), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.splash").withLocalizedName("Splash Poisonous Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16388), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.strong.splash").withLocalizedName("Strong Splash Poisonous Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16420), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.long.splash").withLocalizedName("Stretched Splash Poisonous Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16452), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.fireresistance").withLocalizedName("Fire Resistant Brew") - .withStateAndTemperature(LIQUID, 375).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8195), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.fireresistance.long").withLocalizedName("Stretched Fire Resistant Brew") - .withStateAndTemperature(LIQUID, 375).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8259), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.fireresistance.splash").withLocalizedName("Splash Fire Resistant Brew") - .withStateAndTemperature(LIQUID, 375).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16387), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.awkward") + .withLocalizedName("Awkward Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.thick") + .withLocalizedName("Thick Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 32), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.mundane") + .withLocalizedName("Mundane Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 64), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.damage") + .withLocalizedName("Harming Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8204), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.damage.strong") + .withLocalizedName("Strong Harming Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8236), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.damage.splash") + .withLocalizedName("Splash Harming Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16396), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.damage.strong.splash") + .withLocalizedName("Strong Splash Harming Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16428), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.health") + .withLocalizedName("Healing Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8197), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.health.strong") + .withLocalizedName("Strong Healing Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8229), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.health.splash") + .withLocalizedName("Splash Healing Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16389), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.health.strong.splash") + .withLocalizedName("Strong Splash Healing Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16421), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.speed") + .withLocalizedName("Swiftness Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8194), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.speed.strong") + .withLocalizedName("Strong Swiftness Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8226), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.speed.long") + .withLocalizedName("Stretched Swiftness Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8258), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.speed.splash") + .withLocalizedName("Splash Swiftness Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16386), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.speed.strong.splash") + .withLocalizedName("Strong Splash Swiftness Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16418), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.speed.long.splash") + .withLocalizedName("Stretched Splash Swiftness Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16450), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.strength") + .withLocalizedName("Strength Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8201), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.strength.strong") + .withLocalizedName("Strong Strength Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8233), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.strength.long") + .withLocalizedName("Stretched Strength Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8265), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.strength.splash") + .withLocalizedName("Splash Strength Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16393), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.strength.strong.splash") + .withLocalizedName("Strong Splash Strength Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16425), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.strength.long.splash") + .withLocalizedName("Stretched Splash Strength Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16457), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.regen") + .withLocalizedName("Regenerating Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8193), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.regen.strong") + .withLocalizedName("Strong Regenerating Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8225), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.regen.long") + .withLocalizedName("Stretched Regenerating Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8257), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.regen.splash") + .withLocalizedName("Splash Regenerating Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16385), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.regen.strong.splash") + .withLocalizedName("Strong Splash Regenerating Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16417), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.regen.long.splash") + .withLocalizedName("Stretched Splash Regenerating Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16449), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.poison") + .withLocalizedName("Poisonous Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8196), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.poison.strong") + .withLocalizedName("Strong Poisonous Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8228), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.poison.long") + .withLocalizedName("Stretched Poisonous Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8260), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.poison.splash") + .withLocalizedName("Splash Poisonous Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16388), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.poison.strong.splash") + .withLocalizedName("Strong Splash Poisonous Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16420), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.poison.long.splash") + .withLocalizedName("Stretched Splash Poisonous Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16452), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.fireresistance") + .withLocalizedName("Fire Resistant Brew") + .withStateAndTemperature(LIQUID, 375) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8195), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.fireresistance.long") + .withLocalizedName("Stretched Fire Resistant Brew") + .withStateAndTemperature(LIQUID, 375) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8259), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.fireresistance.splash") + .withLocalizedName("Splash Fire Resistant Brew") + .withStateAndTemperature(LIQUID, 375) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16387), ItemList.Bottle_Empty.get(1L)); GT_FluidFactory.builder("potion.fireresistance.long.splash") - .withLocalizedName("Stretched Splash Fire Resistant Brew").withStateAndTemperature(LIQUID, 375) - .buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16451), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.nightvision").withLocalizedName("Night Vision Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8198), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.nightvision.long").withLocalizedName("Stretched Night Vision Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8262), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.nightvision.splash").withLocalizedName("Splash Night Vision Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16390), ItemList.Bottle_Empty.get(1L)); + .withLocalizedName("Stretched Splash Fire Resistant Brew") + .withStateAndTemperature(LIQUID, 375) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16451), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.nightvision") + .withLocalizedName("Night Vision Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8198), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.nightvision.long") + .withLocalizedName("Stretched Night Vision Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8262), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.nightvision.splash") + .withLocalizedName("Splash Night Vision Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16390), ItemList.Bottle_Empty.get(1L)); GT_FluidFactory.builder("potion.nightvision.long.splash") - .withLocalizedName("Stretched Splash Night Vision Brew").withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16454), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.weakness").withLocalizedName("Weakening Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8200), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.weakness.long").withLocalizedName("Stretched Weakening Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8264), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.weakness.splash").withLocalizedName("Splash Weakening Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16392), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.weakness.long.splash").withLocalizedName("Stretched Splash Weakening Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16456), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.slowness").withLocalizedName("Lame Brew").withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8202), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.slowness.long").withLocalizedName("Stretched Lame Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8266), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.slowness.splash").withLocalizedName("Splash Lame Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16394), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.slowness.long.splash").withLocalizedName("Stretched Splash Lame Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16458), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.waterbreathing").withLocalizedName("Fishy Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8205), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.waterbreathing.long").withLocalizedName("Stretched Fishy Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8269), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.waterbreathing.splash").withLocalizedName("Splash Fishy Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16397), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.waterbreathing.long.splash").withLocalizedName("Stretched Splash Fishy Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16461), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.invisibility").withLocalizedName("Invisible Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8206), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.invisibility.long").withLocalizedName("Stretched Invisible Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 8270), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.invisibility.splash").withLocalizedName("Splash Invisible Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16398), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.invisibility.long.splash").withLocalizedName("Stretched Splash Invisible Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(new ItemStack(Items.potionitem, 1, 16462), ItemList.Bottle_Empty.get(1L)); - - GT_FluidFactory.builder("potion.purpledrink").withLocalizedName("Purple Drink") - .withStateAndTemperature(LIQUID, 275).buildAndRegister() - .registerPContainers(ItemList.Bottle_Purple_Drink.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.grapejuice").withLocalizedName("Grape Juice") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.Bottle_Grape_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.wine").withLocalizedName("Wine").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().registerPContainers(ItemList.Bottle_Wine.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.vinegar").withLocalizedName("Vinegar").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().configureMaterials(Materials.Vinegar) - .registerPContainers(ItemList.Bottle_Vinegar.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.potatojuice").withLocalizedName("Potato Juice") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.Bottle_Potato_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.vodka").withLocalizedName("Vodka").withStateAndTemperature(LIQUID, 275) - .buildAndRegister().registerPContainers(ItemList.Bottle_Vodka.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.leninade").withLocalizedName("Leninade").withStateAndTemperature(LIQUID, 275) - .buildAndRegister() - .registerPContainers(ItemList.Bottle_Leninade.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.mineralwater").withLocalizedName("Mineral Water") - .withStateAndTemperature(LIQUID, 275).buildAndRegister() - .registerPContainers(ItemList.Bottle_Mineral_Water.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.saltywater").withLocalizedName("Salty Water") - .withStateAndTemperature(LIQUID, 275).buildAndRegister() - .registerPContainers(ItemList.Bottle_Salty_Water.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.reedwater").withLocalizedName("Reed Water").withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(ItemList.Bottle_Reed_Water.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.rum").withLocalizedName("Rum").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().registerPContainers(ItemList.Bottle_Rum.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.piratebrew").withLocalizedName("Pirate Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.Bottle_Pirate_Brew.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.hopsjuice").withLocalizedName("Hops Juice").withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(ItemList.Bottle_Hops_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.darkbeer").withLocalizedName("Dark Beer").withStateAndTemperature(LIQUID, 275) - .buildAndRegister() - .registerPContainers(ItemList.Bottle_Dark_Beer.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.dragonblood").withLocalizedName("Dragon Blood") - .withStateAndTemperature(LIQUID, 375).buildAndRegister() - .registerPContainers(ItemList.Bottle_Dragon_Blood.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.wheatyjuice").withLocalizedName("Wheaty Juice") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.Bottle_Wheaty_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.scotch").withLocalizedName("Scotch").withStateAndTemperature(LIQUID, 275) - .buildAndRegister().registerPContainers(ItemList.Bottle_Scotch.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.glenmckenner").withLocalizedName("Glen McKenner") - .withStateAndTemperature(LIQUID, 275).buildAndRegister() - .registerPContainers(ItemList.Bottle_Glen_McKenner.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.wheatyhopsjuice").withLocalizedName("Wheaty Hops Juice") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.Bottle_Wheaty_Hops_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.beer").withLocalizedName("Beer").withStateAndTemperature(LIQUID, 275) - .buildAndRegister().registerPContainers(ItemList.Bottle_Beer.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.chillysauce").withLocalizedName("Chilly Sauce") - .withStateAndTemperature(LIQUID, 375).buildAndRegister() - .registerPContainers(ItemList.Bottle_Chilly_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.hotsauce").withLocalizedName("Hot Sauce").withStateAndTemperature(LIQUID, 380) - .buildAndRegister() - .registerPContainers(ItemList.Bottle_Hot_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.diabolosauce").withLocalizedName("Diabolo Sauce") - .withStateAndTemperature(LIQUID, 385).buildAndRegister() - .registerPContainers(ItemList.Bottle_Diabolo_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.diablosauce").withLocalizedName("Diablo Sauce") - .withStateAndTemperature(LIQUID, 390).buildAndRegister() - .registerPContainers(ItemList.Bottle_Diablo_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.diablosauce.strong").withLocalizedName("Old Man Snitches glitched Diablo Sauce") - .withStateAndTemperature(LIQUID, 999).buildAndRegister() - .registerPContainers(ItemList.Bottle_Snitches_Glitch_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.applejuice").withLocalizedName("Apple Juice") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.Bottle_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.cider").withLocalizedName("Cider").withStateAndTemperature(LIQUID, 295) - .buildAndRegister().registerPContainers(ItemList.Bottle_Cider.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.goldenapplejuice").withLocalizedName("Golden Apple Juice") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.Bottle_Golden_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.goldencider").withLocalizedName("Golden Cider") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.Bottle_Golden_Cider.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.idunsapplejuice").withLocalizedName("Idun's Apple Juice") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.Bottle_Iduns_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.notchesbrew").withLocalizedName("Notches Brew") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.Bottle_Notches_Brew.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.lemonjuice").withLocalizedName("Lemon Juice") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.Bottle_Lemon_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.limoncello").withLocalizedName("Limoncello") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.Bottle_Limoncello.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.lemonade").withLocalizedName("Lemonade").withStateAndTemperature(LIQUID, 275) - .buildAndRegister() - .registerPContainers(ItemList.Bottle_Lemonade.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.alcopops").withLocalizedName("Alcopops").withStateAndTemperature(LIQUID, 275) - .buildAndRegister() - .registerPContainers(ItemList.Bottle_Alcopops.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.cavejohnsonsgrenadejuice").withLocalizedName("Cave Johnsons Grenade Juice") - .withStateAndTemperature(LIQUID, 295).buildAndRegister().registerPContainers( - ItemList.Bottle_Cave_Johnsons_Grenade_Juice.get(1L), - ItemList.Bottle_Empty.get(1L)); - - GT_FluidFactory.builder("potion.darkcoffee").withLocalizedName("Dark Coffee") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.ThermosCan_Dark_Coffee.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.darkcafeaulait").withLocalizedName("Dark Cafe au lait") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.ThermosCan_Dark_Cafe_au_lait.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.coffee").withLocalizedName("Coffee").withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(ItemList.ThermosCan_Coffee.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.cafeaulait").withLocalizedName("Cafe au lait") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.ThermosCan_Cafe_au_lait.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.laitaucafe").withLocalizedName("Lait au cafe") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.ThermosCan_Lait_au_cafe.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.darkchocolatemilk").withLocalizedName("Bitter Chocolate Milk") - .withStateAndTemperature(LIQUID, 295).buildAndRegister().registerPContainers( - ItemList.ThermosCan_Dark_Chocolate_Milk.get(1L), - ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.chocolatemilk").withLocalizedName("Chocolate Milk") - .withStateAndTemperature(LIQUID, 295).buildAndRegister() - .registerPContainers(ItemList.ThermosCan_Chocolate_Milk.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.tea").withLocalizedName("Tea").withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(ItemList.ThermosCan_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.sweettea").withLocalizedName("Sweet Tea").withStateAndTemperature(LIQUID, 295) - .buildAndRegister() - .registerPContainers(ItemList.ThermosCan_Sweet_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.icetea").withLocalizedName("Ice Tea").withStateAndTemperature(LIQUID, 255) - .buildAndRegister() - .registerPContainers(ItemList.ThermosCan_Ice_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L)); + .withLocalizedName("Stretched Splash Night Vision Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16454), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.weakness") + .withLocalizedName("Weakening Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8200), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.weakness.long") + .withLocalizedName("Stretched Weakening Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8264), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.weakness.splash") + .withLocalizedName("Splash Weakening Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16392), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.weakness.long.splash") + .withLocalizedName("Stretched Splash Weakening Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16456), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.slowness") + .withLocalizedName("Lame Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8202), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.slowness.long") + .withLocalizedName("Stretched Lame Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8266), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.slowness.splash") + .withLocalizedName("Splash Lame Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16394), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.slowness.long.splash") + .withLocalizedName("Stretched Splash Lame Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16458), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.waterbreathing") + .withLocalizedName("Fishy Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8205), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.waterbreathing.long") + .withLocalizedName("Stretched Fishy Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8269), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.waterbreathing.splash") + .withLocalizedName("Splash Fishy Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16397), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.waterbreathing.long.splash") + .withLocalizedName("Stretched Splash Fishy Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16461), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.invisibility") + .withLocalizedName("Invisible Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8206), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.invisibility.long") + .withLocalizedName("Stretched Invisible Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 8270), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.invisibility.splash") + .withLocalizedName("Splash Invisible Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16398), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.invisibility.long.splash") + .withLocalizedName("Stretched Splash Invisible Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(new ItemStack(Items.potionitem, 1, 16462), ItemList.Bottle_Empty.get(1L)); + + GT_FluidFactory.builder("potion.purpledrink") + .withLocalizedName("Purple Drink") + .withStateAndTemperature(LIQUID, 275) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Purple_Drink.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.grapejuice") + .withLocalizedName("Grape Juice") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Grape_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.wine") + .withLocalizedName("Wine") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Wine.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.vinegar") + .withLocalizedName("Vinegar") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .configureMaterials(Materials.Vinegar) + .registerPContainers(ItemList.Bottle_Vinegar.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.potatojuice") + .withLocalizedName("Potato Juice") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Potato_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.vodka") + .withLocalizedName("Vodka") + .withStateAndTemperature(LIQUID, 275) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Vodka.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.leninade") + .withLocalizedName("Leninade") + .withStateAndTemperature(LIQUID, 275) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Leninade.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.mineralwater") + .withLocalizedName("Mineral Water") + .withStateAndTemperature(LIQUID, 275) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Mineral_Water.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.saltywater") + .withLocalizedName("Salty Water") + .withStateAndTemperature(LIQUID, 275) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Salty_Water.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.reedwater") + .withLocalizedName("Reed Water") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Reed_Water.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.rum") + .withLocalizedName("Rum") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Rum.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.piratebrew") + .withLocalizedName("Pirate Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Pirate_Brew.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.hopsjuice") + .withLocalizedName("Hops Juice") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Hops_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.darkbeer") + .withLocalizedName("Dark Beer") + .withStateAndTemperature(LIQUID, 275) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Dark_Beer.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.dragonblood") + .withLocalizedName("Dragon Blood") + .withStateAndTemperature(LIQUID, 375) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Dragon_Blood.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.wheatyjuice") + .withLocalizedName("Wheaty Juice") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Wheaty_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.scotch") + .withLocalizedName("Scotch") + .withStateAndTemperature(LIQUID, 275) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Scotch.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.glenmckenner") + .withLocalizedName("Glen McKenner") + .withStateAndTemperature(LIQUID, 275) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Glen_McKenner.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.wheatyhopsjuice") + .withLocalizedName("Wheaty Hops Juice") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Wheaty_Hops_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.beer") + .withLocalizedName("Beer") + .withStateAndTemperature(LIQUID, 275) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Beer.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.chillysauce") + .withLocalizedName("Chilly Sauce") + .withStateAndTemperature(LIQUID, 375) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Chilly_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.hotsauce") + .withLocalizedName("Hot Sauce") + .withStateAndTemperature(LIQUID, 380) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Hot_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.diabolosauce") + .withLocalizedName("Diabolo Sauce") + .withStateAndTemperature(LIQUID, 385) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Diabolo_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.diablosauce") + .withLocalizedName("Diablo Sauce") + .withStateAndTemperature(LIQUID, 390) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Diablo_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.diablosauce.strong") + .withLocalizedName("Old Man Snitches glitched Diablo Sauce") + .withStateAndTemperature(LIQUID, 999) + .buildAndRegister() + .registerPContainers( + ItemList.Bottle_Snitches_Glitch_Sauce.get(1L), + ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.applejuice") + .withLocalizedName("Apple Juice") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.cider") + .withLocalizedName("Cider") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Cider.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.goldenapplejuice") + .withLocalizedName("Golden Apple Juice") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Golden_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.goldencider") + .withLocalizedName("Golden Cider") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Golden_Cider.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.idunsapplejuice") + .withLocalizedName("Idun's Apple Juice") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Iduns_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.notchesbrew") + .withLocalizedName("Notches Brew") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Notches_Brew.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.lemonjuice") + .withLocalizedName("Lemon Juice") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Lemon_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.limoncello") + .withLocalizedName("Limoncello") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Limoncello.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.lemonade") + .withLocalizedName("Lemonade") + .withStateAndTemperature(LIQUID, 275) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Lemonade.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.alcopops") + .withLocalizedName("Alcopops") + .withStateAndTemperature(LIQUID, 275) + .buildAndRegister() + .registerPContainers(ItemList.Bottle_Alcopops.get(1L), ItemList.Bottle_Empty.get(1L)); + GT_FluidFactory.builder("potion.cavejohnsonsgrenadejuice") + .withLocalizedName("Cave Johnsons Grenade Juice") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers( + ItemList.Bottle_Cave_Johnsons_Grenade_Juice.get(1L), + ItemList.Bottle_Empty.get(1L)); + + GT_FluidFactory.builder("potion.darkcoffee") + .withLocalizedName("Dark Coffee") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.ThermosCan_Dark_Coffee.get(1L), ItemList.ThermosCan_Empty.get(1L)); + GT_FluidFactory.builder("potion.darkcafeaulait") + .withLocalizedName("Dark Cafe au lait") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers( + ItemList.ThermosCan_Dark_Cafe_au_lait.get(1L), + ItemList.ThermosCan_Empty.get(1L)); + GT_FluidFactory.builder("potion.coffee") + .withLocalizedName("Coffee") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.ThermosCan_Coffee.get(1L), ItemList.ThermosCan_Empty.get(1L)); + GT_FluidFactory.builder("potion.cafeaulait") + .withLocalizedName("Cafe au lait") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers( + ItemList.ThermosCan_Cafe_au_lait.get(1L), + ItemList.ThermosCan_Empty.get(1L)); + GT_FluidFactory.builder("potion.laitaucafe") + .withLocalizedName("Lait au cafe") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers( + ItemList.ThermosCan_Lait_au_cafe.get(1L), + ItemList.ThermosCan_Empty.get(1L)); + GT_FluidFactory.builder("potion.darkchocolatemilk") + .withLocalizedName("Bitter Chocolate Milk") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers( + ItemList.ThermosCan_Dark_Chocolate_Milk.get(1L), + ItemList.ThermosCan_Empty.get(1L)); + GT_FluidFactory.builder("potion.chocolatemilk") + .withLocalizedName("Chocolate Milk") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers( + ItemList.ThermosCan_Chocolate_Milk.get(1L), + ItemList.ThermosCan_Empty.get(1L)); + GT_FluidFactory.builder("potion.tea") + .withLocalizedName("Tea") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.ThermosCan_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L)); + GT_FluidFactory.builder("potion.sweettea") + .withLocalizedName("Sweet Tea") + .withStateAndTemperature(LIQUID, 295) + .buildAndRegister() + .registerPContainers(ItemList.ThermosCan_Sweet_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L)); + GT_FluidFactory.builder("potion.icetea") + .withLocalizedName("Ice Tea") + .withStateAndTemperature(LIQUID, 255) + .buildAndRegister() + .registerPContainers(ItemList.ThermosCan_Ice_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L)); FluidContainerRegistry.registerFluidContainer( new FluidContainerRegistry.FluidContainerData( @@ -1559,8 +2088,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { OrePrefixes.ingot, Materials.IronWood, GT_ModHandler.getModItem("TwilightForest", "item.ironwoodIngot", 1L, 0)); - GT_OreDictUnificator - .set(OrePrefixes.gem, Materials.InfusedAir, GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 0)); + GT_OreDictUnificator.set( + OrePrefixes.gem, + Materials.InfusedAir, + GT_ModHandler.getModItem("Thaumcraft", "ItemShard", 1L, 0)); GT_OreDictUnificator.set( OrePrefixes.gem, Materials.InfusedFire, @@ -1593,26 +2124,40 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { OrePrefixes.ingot, Materials.Thaumium, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 2)); - GT_OreDictUnificator - .set(OrePrefixes.gem, Materials.Mercury, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 3)); - GT_OreDictUnificator - .set(OrePrefixes.gem, Materials.Amber, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 6)); - GT_OreDictUnificator - .set(OrePrefixes.gem, Materials.Firestone, GT_ModHandler.getModItem("Railcraft", "firestone.raw", 1L)); - - GT_OreDictUnificator - .set(OrePrefixes.nugget, Materials.Void, GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 7)); - GT_OreDictUnificator - .set(OrePrefixes.ingot, Materials.Void, GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 16)); + GT_OreDictUnificator.set( + OrePrefixes.gem, + Materials.Mercury, + GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 3)); + GT_OreDictUnificator.set( + OrePrefixes.gem, + Materials.Amber, + GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 6)); + GT_OreDictUnificator.set( + OrePrefixes.gem, + Materials.Firestone, + GT_ModHandler.getModItem("Railcraft", "firestone.raw", 1L)); + + GT_OreDictUnificator.set( + OrePrefixes.nugget, + Materials.Void, + GT_ModHandler.getModItem("Thaumcraft", "ItemNugget", 1L, 7)); + GT_OreDictUnificator.set( + OrePrefixes.ingot, + Materials.Void, + GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 16)); GT_OreDictUnificator.set( OrePrefixes.ingot, Materials.BloodInfusedIron, GT_ModHandler.getModItem("BloodArsenal", "blood_infused_iron", 1L, 0)); - if (GregTech_API.sUnification - .get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateIron", true)) { - GT_OreDictUnificator - .set(OrePrefixes.plate, Materials.Iron, GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 0)); + if (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + "railcraft", + "plateIron", + true)) { + GT_OreDictUnificator.set( + OrePrefixes.plate, + Materials.Iron, + GT_ModHandler.getModItem("Railcraft", "part.plate", 1L, 0)); } else { GT_OreDictUnificator.set( OrePrefixes.plate, @@ -1622,8 +2167,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { false); } - if (GregTech_API.sUnification - .get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateSteel", true)) { + if (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + "railcraft", + "plateSteel", + true)) { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.Steel, @@ -1637,8 +2184,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { false); } - if (GregTech_API.sUnification - .get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateTinAlloy", true)) { + if (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + "railcraft", + "plateTinAlloy", + true)) { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.TinAlloy, @@ -1652,8 +2201,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { false); } - if (GregTech_API.sUnification - .get(ConfigCategories.specialunificationtargets + "." + "railcraft", "plateCopper", true)) { + if (GregTech_API.sUnification.get( + ConfigCategories.specialunificationtargets + "." + "railcraft", + "plateCopper", + true)) { GT_OreDictUnificator.set( OrePrefixes.plate, Materials.Copper, @@ -1673,8 +2224,9 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { GT_ModHandler.getModItem("harvestcraft", "cocoapowderItem", 1L, 0)); GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Coffee, ItemList.IC2_CoffeePowder.get(1L)); - GregTech_API - .registerMachineBlock(GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("reinforcedGlass", 0)), 0); + GregTech_API.registerMachineBlock( + GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("reinforcedGlass", 0)), + 0); GregTech_API.sSolenoidCoilCasings = new GT_Cyclotron_Coils(); } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index a1256c5ea7..d63647b2aa 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -585,8 +585,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, "For your first Steam Machines").getStackForm(1L)); ItemList.Hull_HP.set( - new GT_MetaTileEntity_BasicHull_Steel(3, "hull.steel", "Steel Hull", 0, "For improved Steam Machines") - .getStackForm(1L)); + new GT_MetaTileEntity_BasicHull_Steel( + 3, + "hull.steel", + "Steel Hull", + 0, + "For improved Steam Machines").getStackForm(1L)); ItemList.Hull_HP_Bricks.set( new GT_MetaTileEntity_BasicHull_SteelBricks( 4, @@ -615,35 +619,35 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new ItemStack(Blocks.brick_block, 1) }); ItemList.Hull_ULV.set( - new GT_MetaTileEntity_BasicHull(10, "hull.tier.00", "ULV Machine Hull", 0, imagination) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicHull(10, "hull.tier.00", "ULV Machine Hull", 0, imagination).getStackForm( + 1L)); ItemList.Hull_LV.set( - new GT_MetaTileEntity_BasicHull(11, "hull.tier.01", "LV Machine Hull", 1, imagination) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicHull(11, "hull.tier.01", "LV Machine Hull", 1, imagination).getStackForm( + 1L)); ItemList.Hull_MV.set( - new GT_MetaTileEntity_BasicHull(12, "hull.tier.02", "MV Machine Hull", 2, imagination) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicHull(12, "hull.tier.02", "MV Machine Hull", 2, imagination).getStackForm( + 1L)); ItemList.Hull_HV.set( - new GT_MetaTileEntity_BasicHull(13, "hull.tier.03", "HV Machine Hull", 3, imagination) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicHull(13, "hull.tier.03", "HV Machine Hull", 3, imagination).getStackForm( + 1L)); ItemList.Hull_EV.set( - new GT_MetaTileEntity_BasicHull(14, "hull.tier.04", "EV Machine Hull", 4, imagination) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicHull(14, "hull.tier.04", "EV Machine Hull", 4, imagination).getStackForm( + 1L)); ItemList.Hull_IV.set( - new GT_MetaTileEntity_BasicHull(15, "hull.tier.05", "IV Machine Hull", 5, imagination) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicHull(15, "hull.tier.05", "IV Machine Hull", 5, imagination).getStackForm( + 1L)); ItemList.Hull_LuV.set( - new GT_MetaTileEntity_BasicHull(16, "hull.tier.06", "LuV Machine Hull", 6, imagination) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicHull(16, "hull.tier.06", "LuV Machine Hull", 6, imagination).getStackForm( + 1L)); ItemList.Hull_ZPM.set( - new GT_MetaTileEntity_BasicHull(17, "hull.tier.07", "ZPM Machine Hull", 7, imagination) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicHull(17, "hull.tier.07", "ZPM Machine Hull", 7, imagination).getStackForm( + 1L)); ItemList.Hull_UV.set( - new GT_MetaTileEntity_BasicHull(18, "hull.tier.08", "UV Machine Hull", 8, imagination) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicHull(18, "hull.tier.08", "UV Machine Hull", 8, imagination).getStackForm( + 1L)); ItemList.Hull_MAX.set( - new GT_MetaTileEntity_BasicHull(19, "hull.tier.09", "UHV Machine Hull", 9, imagination) - .getStackForm(1L)); + new GT_MetaTileEntity_BasicHull(19, "hull.tier.09", "UHV Machine Hull", 9, imagination).getStackForm( + 1L)); GT_ModHandler.addCraftingRecipe( ItemList.Hull_ULV.get(1L), @@ -1121,35 +1125,35 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 11).getStackForm(1L)); ItemList.Hatch_Output_ULV.set( - new GT_MetaTileEntity_Hatch_Output(60, "hatch.output.tier.00", "Output Hatch (ULV)", 0) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Output(60, "hatch.output.tier.00", "Output Hatch (ULV)", 0).getStackForm( + 1L)); ItemList.Hatch_Output_LV.set( - new GT_MetaTileEntity_Hatch_Output(61, "hatch.output.tier.01", "Output Hatch (LV)", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Output(61, "hatch.output.tier.01", "Output Hatch (LV)", 1).getStackForm( + 1L)); ItemList.Hatch_Output_MV.set( - new GT_MetaTileEntity_Hatch_Output(62, "hatch.output.tier.02", "Output Hatch (MV)", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Output(62, "hatch.output.tier.02", "Output Hatch (MV)", 2).getStackForm( + 1L)); ItemList.Hatch_Output_HV.set( - new GT_MetaTileEntity_Hatch_Output(63, "hatch.output.tier.03", "Output Hatch (HV)", 3) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Output(63, "hatch.output.tier.03", "Output Hatch (HV)", 3).getStackForm( + 1L)); ItemList.Hatch_Output_EV.set( - new GT_MetaTileEntity_Hatch_Output(64, "hatch.output.tier.04", "Output Hatch (EV)", 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Output(64, "hatch.output.tier.04", "Output Hatch (EV)", 4).getStackForm( + 1L)); ItemList.Hatch_Output_IV.set( - new GT_MetaTileEntity_Hatch_Output(65, "hatch.output.tier.05", "Output Hatch (IV)", 5) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Output(65, "hatch.output.tier.05", "Output Hatch (IV)", 5).getStackForm( + 1L)); ItemList.Hatch_Output_LuV.set( - new GT_MetaTileEntity_Hatch_Output(66, "hatch.output.tier.06", "Output Hatch (LuV)", 6) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Output(66, "hatch.output.tier.06", "Output Hatch (LuV)", 6).getStackForm( + 1L)); ItemList.Hatch_Output_ZPM.set( - new GT_MetaTileEntity_Hatch_Output(67, "hatch.output.tier.07", "Output Hatch (ZPM)", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Output(67, "hatch.output.tier.07", "Output Hatch (ZPM)", 7).getStackForm( + 1L)); ItemList.Hatch_Output_UV.set( - new GT_MetaTileEntity_Hatch_Output(68, "hatch.output.tier.08", "Output Hatch (UV)", 8) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Output(68, "hatch.output.tier.08", "Output Hatch (UV)", 8).getStackForm( + 1L)); ItemList.Hatch_Output_MAX.set( - new GT_MetaTileEntity_Hatch_Output(69, "hatch.output.tier.09", "Output Hatch (UHV)", 9) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Output(69, "hatch.output.tier.09", "Output Hatch (UHV)", 9).getStackForm( + 1L)); ItemList.Quantum_Tank_LV.set( new GT_MetaTileEntity_QuantumTank(120, "quantum.tank.tier.06", "Quantum Tank I", 6).getStackForm(1L)); @@ -1163,42 +1167,42 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new GT_MetaTileEntity_QuantumTank(124, "quantum.tank.tier.10", "Quantum Tank V", 10).getStackForm(1L)); ItemList.Quantum_Chest_LV.set( - new GT_MetaTileEntity_QuantumChest(125, "quantum.chest.tier.06", "Quantum Chest I", 6) - .getStackForm(1L)); + new GT_MetaTileEntity_QuantumChest(125, "quantum.chest.tier.06", "Quantum Chest I", 6).getStackForm( + 1L)); ItemList.Quantum_Chest_MV.set( - new GT_MetaTileEntity_QuantumChest(126, "quantum.chest.tier.07", "Quantum Chest II", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_QuantumChest(126, "quantum.chest.tier.07", "Quantum Chest II", 7).getStackForm( + 1L)); ItemList.Quantum_Chest_HV.set( - new GT_MetaTileEntity_QuantumChest(127, "quantum.chest.tier.08", "Quantum Chest III", 8) - .getStackForm(1L)); + new GT_MetaTileEntity_QuantumChest(127, "quantum.chest.tier.08", "Quantum Chest III", 8).getStackForm( + 1L)); ItemList.Quantum_Chest_EV.set( - new GT_MetaTileEntity_QuantumChest(128, "quantum.chest.tier.09", "Quantum Chest IV", 9) - .getStackForm(1L)); + new GT_MetaTileEntity_QuantumChest(128, "quantum.chest.tier.09", "Quantum Chest IV", 9).getStackForm( + 1L)); ItemList.Quantum_Chest_IV.set( - new GT_MetaTileEntity_QuantumChest(129, "quantum.chest.tier.10", "Quantum Chest V", 10) - .getStackForm(1L)); - - ItemList.Super_Tank_LV - .set(new GT_MetaTileEntity_SuperTank(130, "super.tank.tier.01", "Super Tank I", 1).getStackForm(1L)); - ItemList.Super_Tank_MV - .set(new GT_MetaTileEntity_SuperTank(131, "super.tank.tier.02", "Super Tank II", 2).getStackForm(1L)); - ItemList.Super_Tank_HV - .set(new GT_MetaTileEntity_SuperTank(132, "super.tank.tier.03", "Super Tank III", 3).getStackForm(1L)); - ItemList.Super_Tank_EV - .set(new GT_MetaTileEntity_SuperTank(133, "super.tank.tier.04", "Super Tank IV", 4).getStackForm(1L)); - ItemList.Super_Tank_IV - .set(new GT_MetaTileEntity_SuperTank(134, "super.tank.tier.05", "Super Tank V", 5).getStackForm(1L)); - - ItemList.Super_Chest_LV - .set(new GT_MetaTileEntity_SuperChest(135, "super.chest.tier.01", "Super Chest I", 1).getStackForm(1L)); + new GT_MetaTileEntity_QuantumChest(129, "quantum.chest.tier.10", "Quantum Chest V", 10).getStackForm( + 1L)); + + ItemList.Super_Tank_LV.set( + new GT_MetaTileEntity_SuperTank(130, "super.tank.tier.01", "Super Tank I", 1).getStackForm(1L)); + ItemList.Super_Tank_MV.set( + new GT_MetaTileEntity_SuperTank(131, "super.tank.tier.02", "Super Tank II", 2).getStackForm(1L)); + ItemList.Super_Tank_HV.set( + new GT_MetaTileEntity_SuperTank(132, "super.tank.tier.03", "Super Tank III", 3).getStackForm(1L)); + ItemList.Super_Tank_EV.set( + new GT_MetaTileEntity_SuperTank(133, "super.tank.tier.04", "Super Tank IV", 4).getStackForm(1L)); + ItemList.Super_Tank_IV.set( + new GT_MetaTileEntity_SuperTank(134, "super.tank.tier.05", "Super Tank V", 5).getStackForm(1L)); + + ItemList.Super_Chest_LV.set( + new GT_MetaTileEntity_SuperChest(135, "super.chest.tier.01", "Super Chest I", 1).getStackForm(1L)); ItemList.Super_Chest_MV.set( new GT_MetaTileEntity_SuperChest(136, "super.chest.tier.02", "Super Chest II", 2).getStackForm(1L)); ItemList.Super_Chest_HV.set( new GT_MetaTileEntity_SuperChest(137, "super.chest.tier.03", "Super Chest III", 3).getStackForm(1L)); ItemList.Super_Chest_EV.set( new GT_MetaTileEntity_SuperChest(138, "super.chest.tier.04", "Super Chest IV", 4).getStackForm(1L)); - ItemList.Super_Chest_IV - .set(new GT_MetaTileEntity_SuperChest(139, "super.chest.tier.05", "Super Chest V", 5).getStackForm(1L)); + ItemList.Super_Chest_IV.set( + new GT_MetaTileEntity_SuperChest(139, "super.chest.tier.05", "Super Chest V", 5).getStackForm(1L)); ItemList.Long_Distance_Pipeline_Fluid.set( new GT_MetaTileEntity_LongDistancePipelineFluid( @@ -1222,83 +1226,117 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC if (GregTech_API.mAE2) { ItemList.Hatch_Output_Bus_ME.set( - new GT_MetaTileEntity_Hatch_OutputBus_ME(2710, "hatch.output_bus.me", "Output Bus (ME)") - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_OutputBus_ME( + 2710, + "hatch.output_bus.me", + "Output Bus (ME)").getStackForm(1L)); ItemList.Hatch_Input_Bus_ME.set( - new GT_MetaTileEntity_Hatch_InputBus_ME(2711, "hatch.input_bus.me", "Stocking Input Bus (ME)") - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_InputBus_ME( + 2711, + "hatch.input_bus.me", + "Stocking Input Bus (ME)").getStackForm(1L)); // ItemList.Hatch_CraftingInput_Bus_ME.set(new GT_MetaTileEntity_Hatch_CraftingInputBus_ME(2712, // "hatch.crafting_input_bus.me", "Crafting Input Bus (ME)").getStackForm(1L)); ItemList.Hatch_Output_ME.set( - new GT_MetaTileEntity_Hatch_Output_ME(2713, "hatch.output.me", "Output Hatch (ME)") - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Output_ME(2713, "hatch.output.me", "Output Hatch (ME)").getStackForm( + 1L)); } ItemList.Hatch_Input_Bus_ULV.set( - new GT_MetaTileEntity_Hatch_InputBus(70, "hatch.input_bus.tier.00", "Input Bus (ULV)", 0) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_InputBus(70, "hatch.input_bus.tier.00", "Input Bus (ULV)", 0).getStackForm( + 1L)); ItemList.Hatch_Input_Bus_LV.set( - new GT_MetaTileEntity_Hatch_InputBus(71, "hatch.input_bus.tier.01", "Input Bus (LV)", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_InputBus(71, "hatch.input_bus.tier.01", "Input Bus (LV)", 1).getStackForm( + 1L)); ItemList.Hatch_Input_Bus_MV.set( - new GT_MetaTileEntity_Hatch_InputBus(72, "hatch.input_bus.tier.02", "Input Bus (MV)", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_InputBus(72, "hatch.input_bus.tier.02", "Input Bus (MV)", 2).getStackForm( + 1L)); ItemList.Hatch_Input_Bus_HV.set( - new GT_MetaTileEntity_Hatch_InputBus(73, "hatch.input_bus.tier.03", "Input Bus (HV)", 3) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_InputBus(73, "hatch.input_bus.tier.03", "Input Bus (HV)", 3).getStackForm( + 1L)); ItemList.Hatch_Input_Bus_EV.set( - new GT_MetaTileEntity_Hatch_InputBus(74, "hatch.input_bus.tier.04", "Input Bus (EV)", 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_InputBus(74, "hatch.input_bus.tier.04", "Input Bus (EV)", 4).getStackForm( + 1L)); ItemList.Hatch_Input_Bus_IV.set( - new GT_MetaTileEntity_Hatch_InputBus(75, "hatch.input_bus.tier.05", "Input Bus (IV)", 5) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_InputBus(75, "hatch.input_bus.tier.05", "Input Bus (IV)", 5).getStackForm( + 1L)); ItemList.Hatch_Input_Bus_LuV.set( - new GT_MetaTileEntity_Hatch_InputBus(76, "hatch.input_bus.tier.06", "Input Bus (LuV)", 6) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_InputBus(76, "hatch.input_bus.tier.06", "Input Bus (LuV)", 6).getStackForm( + 1L)); ItemList.Hatch_Input_Bus_ZPM.set( - new GT_MetaTileEntity_Hatch_InputBus(77, "hatch.input_bus.tier.07", "Input Bus (ZPM)", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_InputBus(77, "hatch.input_bus.tier.07", "Input Bus (ZPM)", 7).getStackForm( + 1L)); ItemList.Hatch_Input_Bus_UV.set( - new GT_MetaTileEntity_Hatch_InputBus(78, "hatch.input_bus.tier.08", "Input Bus (UV)", 8) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_InputBus(78, "hatch.input_bus.tier.08", "Input Bus (UV)", 8).getStackForm( + 1L)); ItemList.Hatch_Input_Bus_MAX.set( - new GT_MetaTileEntity_Hatch_InputBus(79, "hatch.input_bus.tier.09", "Input Bus (UHV)", 9) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_InputBus(79, "hatch.input_bus.tier.09", "Input Bus (UHV)", 9).getStackForm( + 1L)); ItemList.Hatch_Output_Bus_ULV.set( - new GT_MetaTileEntity_Hatch_OutputBus(80, "hatch.output_bus.tier.00", "Output Bus (ULV)", 0) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_OutputBus( + 80, + "hatch.output_bus.tier.00", + "Output Bus (ULV)", + 0).getStackForm(1L)); ItemList.Hatch_Output_Bus_LV.set( - new GT_MetaTileEntity_Hatch_OutputBus(81, "hatch.output_bus.tier.01", "Output Bus (LV)", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_OutputBus( + 81, + "hatch.output_bus.tier.01", + "Output Bus (LV)", + 1).getStackForm(1L)); ItemList.Hatch_Output_Bus_MV.set( - new GT_MetaTileEntity_Hatch_OutputBus(82, "hatch.output_bus.tier.02", "Output Bus (MV)", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_OutputBus( + 82, + "hatch.output_bus.tier.02", + "Output Bus (MV)", + 2).getStackForm(1L)); ItemList.Hatch_Output_Bus_HV.set( - new GT_MetaTileEntity_Hatch_OutputBus(83, "hatch.output_bus.tier.03", "Output Bus (HV)", 3) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_OutputBus( + 83, + "hatch.output_bus.tier.03", + "Output Bus (HV)", + 3).getStackForm(1L)); ItemList.Hatch_Output_Bus_EV.set( - new GT_MetaTileEntity_Hatch_OutputBus(84, "hatch.output_bus.tier.04", "Output Bus (EV)", 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_OutputBus( + 84, + "hatch.output_bus.tier.04", + "Output Bus (EV)", + 4).getStackForm(1L)); ItemList.Hatch_Output_Bus_IV.set( - new GT_MetaTileEntity_Hatch_OutputBus(85, "hatch.output_bus.tier.05", "Output Bus (IV)", 5) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_OutputBus( + 85, + "hatch.output_bus.tier.05", + "Output Bus (IV)", + 5).getStackForm(1L)); ItemList.Hatch_Output_Bus_LuV.set( - new GT_MetaTileEntity_Hatch_OutputBus(86, "hatch.output_bus.tier.06", "Output Bus (LuV)", 6) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_OutputBus( + 86, + "hatch.output_bus.tier.06", + "Output Bus (LuV)", + 6).getStackForm(1L)); ItemList.Hatch_Output_Bus_ZPM.set( - new GT_MetaTileEntity_Hatch_OutputBus(87, "hatch.output_bus.tier.07", "Output Bus (ZPM)", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_OutputBus( + 87, + "hatch.output_bus.tier.07", + "Output Bus (ZPM)", + 7).getStackForm(1L)); ItemList.Hatch_Output_Bus_UV.set( - new GT_MetaTileEntity_Hatch_OutputBus(88, "hatch.output_bus.tier.08", "Output Bus (UV)", 8) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_OutputBus( + 88, + "hatch.output_bus.tier.08", + "Output Bus (UV)", + 8).getStackForm(1L)); ItemList.Hatch_Output_Bus_MAX.set( - new GT_MetaTileEntity_Hatch_OutputBus(89, "hatch.output_bus.tier.09", "Output Bus (UHV)", 9) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_OutputBus( + 89, + "hatch.output_bus.tier.09", + "Output Bus (UHV)", + 9).getStackForm(1L)); ItemList.Hatch_Maintenance.set( - new GT_MetaTileEntity_Hatch_Maintenance(90, "hatch.maintenance", "Maintenance Hatch", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Maintenance(90, "hatch.maintenance", "Maintenance Hatch", 1).getStackForm( + 1L)); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Maintenance.get(1L), @@ -1333,14 +1371,20 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true).getStackForm(1L)); ItemList.Hatch_DataAccess_EV.set( - new GT_MetaTileEntity_Hatch_DataAccess(145, "hatch.dataaccess", "Data Access Hatch", 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DataAccess(145, "hatch.dataaccess", "Data Access Hatch", 4).getStackForm( + 1L)); ItemList.Hatch_DataAccess_LuV.set( - new GT_MetaTileEntity_Hatch_DataAccess(146, "hatch.dataaccess.adv", "Advanced Data Access Hatch", 6) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DataAccess( + 146, + "hatch.dataaccess.adv", + "Advanced Data Access Hatch", + 6).getStackForm(1L)); ItemList.Hatch_DataAccess_UV.set( - new GT_MetaTileEntity_Hatch_DataAccess(147, "hatch.dataaccess.auto", "Automatable Data Access Hatch", 8) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_DataAccess( + 147, + "hatch.dataaccess.auto", + "Automatable Data Access Hatch", + 8).getStackForm(1L)); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_DataAccess_EV.get(1L), @@ -1365,32 +1409,32 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Robot_Arm_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate) }); ItemList.Hatch_Muffler_LV.set( - new GT_MetaTileEntity_Hatch_Muffler(91, "hatch.muffler.tier.01", "Muffler Hatch (LV)", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Muffler(91, "hatch.muffler.tier.01", "Muffler Hatch (LV)", 1).getStackForm( + 1L)); ItemList.Hatch_Muffler_MV.set( - new GT_MetaTileEntity_Hatch_Muffler(92, "hatch.muffler.tier.02", "Muffler Hatch (MV)", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Muffler(92, "hatch.muffler.tier.02", "Muffler Hatch (MV)", 2).getStackForm( + 1L)); ItemList.Hatch_Muffler_HV.set( - new GT_MetaTileEntity_Hatch_Muffler(93, "hatch.muffler.tier.03", "Muffler Hatch (HV)", 3) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Muffler(93, "hatch.muffler.tier.03", "Muffler Hatch (HV)", 3).getStackForm( + 1L)); ItemList.Hatch_Muffler_EV.set( - new GT_MetaTileEntity_Hatch_Muffler(94, "hatch.muffler.tier.04", "Muffler Hatch (EV)", 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Muffler(94, "hatch.muffler.tier.04", "Muffler Hatch (EV)", 4).getStackForm( + 1L)); ItemList.Hatch_Muffler_IV.set( - new GT_MetaTileEntity_Hatch_Muffler(95, "hatch.muffler.tier.05", "Muffler Hatch (IV)", 5) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Muffler(95, "hatch.muffler.tier.05", "Muffler Hatch (IV)", 5).getStackForm( + 1L)); ItemList.Hatch_Muffler_LuV.set( - new GT_MetaTileEntity_Hatch_Muffler(96, "hatch.muffler.tier.06", "Muffler Hatch (LuV)", 6) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Muffler(96, "hatch.muffler.tier.06", "Muffler Hatch (LuV)", 6).getStackForm( + 1L)); ItemList.Hatch_Muffler_ZPM.set( - new GT_MetaTileEntity_Hatch_Muffler(97, "hatch.muffler.tier.07", "Muffler Hatch (ZPM)", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Muffler(97, "hatch.muffler.tier.07", "Muffler Hatch (ZPM)", 7).getStackForm( + 1L)); ItemList.Hatch_Muffler_UV.set( - new GT_MetaTileEntity_Hatch_Muffler(98, "hatch.muffler.tier.08", "Muffler Hatch (UV)", 8) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Muffler(98, "hatch.muffler.tier.08", "Muffler Hatch (UV)", 8).getStackForm( + 1L)); ItemList.Hatch_Muffler_MAX.set( - new GT_MetaTileEntity_Hatch_Muffler(99, "hatch.muffler.tier.09", "Muffler Hatch (UHV)", 9) - .getStackForm(1L)); + new GT_MetaTileEntity_Hatch_Muffler(99, "hatch.muffler.tier.09", "Muffler Hatch (UHV)", 9).getStackForm( + 1L)); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Muffler_LV.get(1L), @@ -1403,17 +1447,19 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new Object[] { "MX ", "PR ", 'M', ItemList.Hull_MV, 'P', OrePrefixes.pipeMedium.get(Materials.Steel), 'R', OrePrefixes.rotor.get(Materials.Steel), 'X', ItemList.Electric_Motor_MV }); - ItemList.Machine_Bronze_Boiler - .set(new GT_MetaTileEntity_Boiler_Bronze(100, "boiler.bronze", "Small Coal Boiler").getStackForm(1L)); + ItemList.Machine_Bronze_Boiler.set( + new GT_MetaTileEntity_Boiler_Bronze(100, "boiler.bronze", "Small Coal Boiler").getStackForm(1L)); ItemList.Machine_Steel_Boiler.set( new GT_MetaTileEntity_Boiler_Steel(101, "boiler.steel", "High Pressure Coal Boiler").getStackForm(1L)); ItemList.Machine_Steel_Boiler_Lava.set( new GT_MetaTileEntity_Boiler_Lava(102, "boiler.lava", "High Pressure Lava Boiler").getStackForm(1L)); - ItemList.Machine_Bronze_Boiler_Solar - .set(new GT_MetaTileEntity_Boiler_Solar(105, "boiler.solar", "Simple Solar Boiler").getStackForm(1L)); + ItemList.Machine_Bronze_Boiler_Solar.set( + new GT_MetaTileEntity_Boiler_Solar(105, "boiler.solar", "Simple Solar Boiler").getStackForm(1L)); ItemList.Machine_HP_Solar.set( - new GT_MetaTileEntity_Boiler_Solar_Steel(114, "boiler.steel.solar", "High Pressure Solar Boiler") - .getStackForm(1L)); + new GT_MetaTileEntity_Boiler_Solar_Steel( + 114, + "boiler.steel.solar", + "High Pressure Solar Boiler").getStackForm(1L)); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Bronze_Boiler.get(1L), bitsd, @@ -1451,38 +1497,54 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Machine_Bronze_Furnace.set( new GT_MetaTileEntity_Furnace_Bronze(103, "bronzemachine.furnace", "Steam Furnace").getStackForm(1L)); ItemList.Machine_HP_Furnace.set( - new GT_MetaTileEntity_Furnace_Steel(104, "hpmachine.furnace", "High Pressure Furnace") - .getStackForm(1L)); + new GT_MetaTileEntity_Furnace_Steel(104, "hpmachine.furnace", "High Pressure Furnace").getStackForm( + 1L)); ItemList.Machine_Bronze_Macerator.set( - new GT_MetaTileEntity_Macerator_Bronze(106, "bronzemachine.macerator", "Steam Macerator") - .getStackForm(1L)); + new GT_MetaTileEntity_Macerator_Bronze(106, "bronzemachine.macerator", "Steam Macerator").getStackForm( + 1L)); ItemList.Machine_HP_Macerator.set( - new GT_MetaTileEntity_Macerator_Steel(107, "hpmachine.macerator", "High Pressure Macerator") - .getStackForm(1L)); + new GT_MetaTileEntity_Macerator_Steel( + 107, + "hpmachine.macerator", + "High Pressure Macerator").getStackForm(1L)); ItemList.Machine_Bronze_Extractor.set( - new GT_MetaTileEntity_Extractor_Bronze(109, "bronzemachine.extractor", "Steam Extractor") - .getStackForm(1L)); + new GT_MetaTileEntity_Extractor_Bronze(109, "bronzemachine.extractor", "Steam Extractor").getStackForm( + 1L)); ItemList.Machine_HP_Extractor.set( - new GT_MetaTileEntity_Extractor_Steel(110, "hpmachine.extractor", "High Pressure Extractor") - .getStackForm(1L)); + new GT_MetaTileEntity_Extractor_Steel( + 110, + "hpmachine.extractor", + "High Pressure Extractor").getStackForm(1L)); ItemList.Machine_Bronze_Hammer.set( - new GT_MetaTileEntity_ForgeHammer_Bronze(112, "bronzemachine.hammer", "Steam Forge Hammer") - .getStackForm(1L)); + new GT_MetaTileEntity_ForgeHammer_Bronze( + 112, + "bronzemachine.hammer", + "Steam Forge Hammer").getStackForm(1L)); ItemList.Machine_HP_Hammer.set( - new GT_MetaTileEntity_ForgeHammer_Steel(113, "hpmachine.hammer", "High Pressure Forge Hammer") - .getStackForm(1L)); + new GT_MetaTileEntity_ForgeHammer_Steel( + 113, + "hpmachine.hammer", + "High Pressure Forge Hammer").getStackForm(1L)); ItemList.Machine_Bronze_Compressor.set( - new GT_MetaTileEntity_Compressor_Bronze(115, "bronzemachine.compressor", "Steam Compressor") - .getStackForm(1L)); + new GT_MetaTileEntity_Compressor_Bronze( + 115, + "bronzemachine.compressor", + "Steam Compressor").getStackForm(1L)); ItemList.Machine_HP_Compressor.set( - new GT_MetaTileEntity_Compressor_Steel(116, "hpmachine.compressor", "High Pressure Compressor") - .getStackForm(1L)); + new GT_MetaTileEntity_Compressor_Steel( + 116, + "hpmachine.compressor", + "High Pressure Compressor").getStackForm(1L)); ItemList.Machine_Bronze_AlloySmelter.set( - new GT_MetaTileEntity_AlloySmelter_Bronze(118, "bronzemachine.alloysmelter", "Steam Alloy Smelter") - .getStackForm(1L)); + new GT_MetaTileEntity_AlloySmelter_Bronze( + 118, + "bronzemachine.alloysmelter", + "Steam Alloy Smelter").getStackForm(1L)); ItemList.Machine_HP_AlloySmelter.set( - new GT_MetaTileEntity_AlloySmelter_Steel(119, "hpmachine.alloysmelter", "High Pressure Alloy Smelter") - .getStackForm(1L)); + new GT_MetaTileEntity_AlloySmelter_Steel( + 119, + "hpmachine.alloysmelter", + "High Pressure Alloy Smelter").getStackForm(1L)); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Bronze_Furnace.get(1L), @@ -1556,25 +1618,25 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Locker_ULV.set( new GT_MetaTileEntity_Locker(150, "locker.tier.00", "Ultra Low Voltage Locker", 0).getStackForm(1L)); - ItemList.Locker_LV - .set(new GT_MetaTileEntity_Locker(151, "locker.tier.01", "Low Voltage Locker", 1).getStackForm(1L)); - ItemList.Locker_MV - .set(new GT_MetaTileEntity_Locker(152, "locker.tier.02", "Medium Voltage Locker", 2).getStackForm(1L)); - ItemList.Locker_HV - .set(new GT_MetaTileEntity_Locker(153, "locker.tier.03", "High Voltage Locker", 3).getStackForm(1L)); - ItemList.Locker_EV - .set(new GT_MetaTileEntity_Locker(154, "locker.tier.04", "Extreme Voltage Locker", 4).getStackForm(1L)); - ItemList.Locker_IV - .set(new GT_MetaTileEntity_Locker(155, "locker.tier.05", "Insane Voltage Locker", 5).getStackForm(1L)); + ItemList.Locker_LV.set( + new GT_MetaTileEntity_Locker(151, "locker.tier.01", "Low Voltage Locker", 1).getStackForm(1L)); + ItemList.Locker_MV.set( + new GT_MetaTileEntity_Locker(152, "locker.tier.02", "Medium Voltage Locker", 2).getStackForm(1L)); + ItemList.Locker_HV.set( + new GT_MetaTileEntity_Locker(153, "locker.tier.03", "High Voltage Locker", 3).getStackForm(1L)); + ItemList.Locker_EV.set( + new GT_MetaTileEntity_Locker(154, "locker.tier.04", "Extreme Voltage Locker", 4).getStackForm(1L)); + ItemList.Locker_IV.set( + new GT_MetaTileEntity_Locker(155, "locker.tier.05", "Insane Voltage Locker", 5).getStackForm(1L)); ItemList.Locker_LuV.set( new GT_MetaTileEntity_Locker(156, "locker.tier.06", "Ludicrous Voltage Locker", 6).getStackForm(1L)); - ItemList.Locker_ZPM - .set(new GT_MetaTileEntity_Locker(157, "locker.tier.07", "ZPM Voltage Locker", 7).getStackForm(1L)); + ItemList.Locker_ZPM.set( + new GT_MetaTileEntity_Locker(157, "locker.tier.07", "ZPM Voltage Locker", 7).getStackForm(1L)); ItemList.Locker_UV.set( new GT_MetaTileEntity_Locker(158, "locker.tier.08", "Ultimate Voltage Locker", 8).getStackForm(1L)); ItemList.Locker_MAX.set( - new GT_MetaTileEntity_Locker(159, "locker.tier.09", "Highly Ultimate Voltage Locker", 9) - .getStackForm(1L)); + new GT_MetaTileEntity_Locker(159, "locker.tier.09", "Highly Ultimate Voltage Locker", 9).getStackForm( + 1L)); ItemList.Battery_Buffer_1by1_ULV.set( new GT_MetaTileEntity_BasicBatteryBuffer( @@ -3252,8 +3314,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) - .setProgressBarTextureName("E_Furnace").getStackForm(1L)); + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }).setProgressBarTextureName( + "E_Furnace") + .getStackForm(1L)); ItemList.Machine_MV_E_Furnace.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 262, @@ -3277,8 +3340,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) - .setProgressBarTextureName("E_Furnace").getStackForm(1L)); + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }).setProgressBarTextureName( + "E_Furnace") + .getStackForm(1L)); ItemList.Machine_HV_E_Furnace.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 263, @@ -3302,8 +3366,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) - .setProgressBarTextureName("E_Furnace").getStackForm(1L)); + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }).setProgressBarTextureName( + "E_Furnace") + .getStackForm(1L)); ItemList.Machine_EV_E_Furnace.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 264, @@ -3327,8 +3392,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) - .setProgressBarTextureName("E_Furnace").getStackForm(1L)); + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }).setProgressBarTextureName( + "E_Furnace") + .getStackForm(1L)); ItemList.Machine_IV_E_Furnace.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 265, @@ -3352,8 +3418,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) - .setProgressBarTextureName("E_Furnace").getStackForm(1L)); + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }).setProgressBarTextureName( + "E_Furnace") + .getStackForm(1L)); ItemList.Machine_LV_Extractor.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( @@ -3812,7 +3879,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OreDictNames.craftingGrinder }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_EV_Macerator.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 304, @@ -3837,7 +3905,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OreDictNames.craftingGrinder }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_IV_Macerator.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 305, @@ -3862,7 +3931,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', OreDictNames.craftingGrinder }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_LV_Microwave.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( @@ -4310,20 +4380,29 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC OrePrefixes.dust.get(Materials.Glowstone) }).getStackForm(1L)); ItemList.Machine_LV_Scanner.set( - new GT_MetaTileEntity_Scanner(341, "basicmachine.scanner.tier.01", "Basic Scanner", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_Scanner(341, "basicmachine.scanner.tier.01", "Basic Scanner", 1).getStackForm( + 1L)); ItemList.Machine_MV_Scanner.set( - new GT_MetaTileEntity_Scanner(342, "basicmachine.scanner.tier.02", "Advanced Scanner", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_Scanner(342, "basicmachine.scanner.tier.02", "Advanced Scanner", 2).getStackForm( + 1L)); ItemList.Machine_HV_Scanner.set( - new GT_MetaTileEntity_Scanner(343, "basicmachine.scanner.tier.03", "Advanced Scanner II", 3) - .getStackForm(1L)); + new GT_MetaTileEntity_Scanner( + 343, + "basicmachine.scanner.tier.03", + "Advanced Scanner II", + 3).getStackForm(1L)); ItemList.Machine_EV_Scanner.set( - new GT_MetaTileEntity_Scanner(344, "basicmachine.scanner.tier.04", "Advanced Scanner III", 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Scanner( + 344, + "basicmachine.scanner.tier.04", + "Advanced Scanner III", + 4).getStackForm(1L)); ItemList.Machine_IV_Scanner.set( - new GT_MetaTileEntity_Scanner(345, "basicmachine.scanner.tier.05", "Advanced Scanner IV", 5) - .getStackForm(1L)); + new GT_MetaTileEntity_Scanner( + 345, + "basicmachine.scanner.tier.05", + "Advanced Scanner IV", + 5).getStackForm(1L)); GT_ModHandler.addCraftingRecipe( ItemList.Machine_LV_Scanner.get(1L), @@ -4977,29 +5056,41 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP }).getStackForm(1L)); ItemList.Machine_LV_Boxinator.set( - new GT_MetaTileEntity_Boxinator(401, "basicmachine.boxinator.tier.01", "Basic Packager", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_Boxinator( + 401, + "basicmachine.boxinator.tier.01", + "Basic Packager", + 1).getStackForm(1L)); ItemList.Machine_MV_Boxinator.set( - new GT_MetaTileEntity_Boxinator(402, "basicmachine.boxinator.tier.02", "Advanced Packager", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_Boxinator( + 402, + "basicmachine.boxinator.tier.02", + "Advanced Packager", + 2).getStackForm(1L)); ItemList.Machine_HV_Boxinator.set( - new GT_MetaTileEntity_Boxinator(403, "basicmachine.boxinator.tier.03", "Advanced Packager II", 3) - .getStackForm(1L)); + new GT_MetaTileEntity_Boxinator( + 403, + "basicmachine.boxinator.tier.03", + "Advanced Packager II", + 3).getStackForm(1L)); ItemList.Machine_EV_Boxinator.set( - new GT_MetaTileEntity_Boxinator(404, "basicmachine.boxinator.tier.04", "Advanced Packager III", 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Boxinator( + 404, + "basicmachine.boxinator.tier.04", + "Advanced Packager III", + 4).getStackForm(1L)); ItemList.Machine_IV_Boxinator.set( - new GT_MetaTileEntity_Boxinator(405, "basicmachine.boxinator.tier.05", "Boxinator", 5) - .getStackForm(1L)); + new GT_MetaTileEntity_Boxinator(405, "basicmachine.boxinator.tier.05", "Boxinator", 5).getStackForm( + 1L)); ItemList.Machine_LuV_Boxinator.set( - new GT_MetaTileEntity_Boxinator(406, "basicmachine.boxinator.tier.06", "Boxinator", 6) - .getStackForm(1L)); + new GT_MetaTileEntity_Boxinator(406, "basicmachine.boxinator.tier.06", "Boxinator", 6).getStackForm( + 1L)); ItemList.Machine_ZPM_Boxinator.set( - new GT_MetaTileEntity_Boxinator(407, "basicmachine.boxinator.tier.07", "Boxinator", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_Boxinator(407, "basicmachine.boxinator.tier.07", "Boxinator", 7).getStackForm( + 1L)); ItemList.Machine_UV_Boxinator.set( - new GT_MetaTileEntity_Boxinator(408, "basicmachine.boxinator.tier.08", "Boxinator", 8) - .getStackForm(1L)); + new GT_MetaTileEntity_Boxinator(408, "basicmachine.boxinator.tier.08", "Boxinator", 8).getStackForm( + 1L)); GT_ModHandler.addCraftingRecipe( ItemList.Machine_LV_Boxinator.get(1L), @@ -5075,7 +5166,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_MV_Unboxinator.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 412, @@ -5101,7 +5193,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_HV_Unboxinator.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 413, @@ -5127,7 +5220,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_EV_Unboxinator.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 414, @@ -5153,7 +5247,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_IV_Unboxinator.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 415, @@ -5179,7 +5274,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_LuV_Unboxinator.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 416, @@ -5205,7 +5301,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_ZPM_Unboxinator.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 417, @@ -5231,7 +5328,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_UV_Unboxinator.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 418, @@ -5257,7 +5355,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_LV_ChemicalReactor.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( @@ -5512,11 +5611,17 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS }).getStackForm(1L)); ItemList.Machine_LV_RockBreaker.set( - new GT_MetaTileEntity_RockBreaker(441, "basicmachine.rockbreaker.tier.01", "Basic Rock Breaker", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_RockBreaker( + 441, + "basicmachine.rockbreaker.tier.01", + "Basic Rock Breaker", + 1).getStackForm(1L)); ItemList.Machine_MV_RockBreaker.set( - new GT_MetaTileEntity_RockBreaker(442, "basicmachine.rockbreaker.tier.02", "Advanced Rock Breaker", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_RockBreaker( + 442, + "basicmachine.rockbreaker.tier.02", + "Advanced Rock Breaker", + 2).getStackForm(1L)); ItemList.Machine_HV_RockBreaker.set( new GT_MetaTileEntity_RockBreaker( 443, @@ -5573,11 +5678,17 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 'G', new ItemStack(Blocks.glass, 1) }); ItemList.Machine_LV_Disassembler.set( - new GT_MetaTileEntity_Disassembler(451, "basicmachine.disassembler.tier.01", "Basic Disassembler", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_Disassembler( + 451, + "basicmachine.disassembler.tier.01", + "Basic Disassembler", + 1).getStackForm(1L)); ItemList.Machine_MV_Disassembler.set( - new GT_MetaTileEntity_Disassembler(452, "basicmachine.disassembler.tier.02", "Advanced Disassembler", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_Disassembler( + 452, + "basicmachine.disassembler.tier.02", + "Advanced Disassembler", + 2).getStackForm(1L)); ItemList.Machine_HV_Disassembler.set( new GT_MetaTileEntity_Disassembler( 453, @@ -5707,11 +5818,17 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC } ItemList.Machine_LV_Massfab.set( - new GT_MetaTileEntity_Massfabricator(461, "basicmachine.massfab.tier.01", "Basic Mass Fabricator", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_Massfabricator( + 461, + "basicmachine.massfab.tier.01", + "Basic Mass Fabricator", + 1).getStackForm(1L)); ItemList.Machine_MV_Massfab.set( - new GT_MetaTileEntity_Massfabricator(462, "basicmachine.massfab.tier.02", "Advanced Mass Fabricator", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_Massfabricator( + 462, + "basicmachine.massfab.tier.02", + "Advanced Mass Fabricator", + 2).getStackForm(1L)); ItemList.Machine_HV_Massfab.set( new GT_MetaTileEntity_Massfabricator( 463, @@ -5882,20 +5999,35 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); ItemList.Machine_LV_Replicator.set( - new GT_MetaTileEntity_Replicator(481, "basicmachine.replicator.tier.01", "Basic Replicator", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_Replicator( + 481, + "basicmachine.replicator.tier.01", + "Basic Replicator", + 1).getStackForm(1L)); ItemList.Machine_MV_Replicator.set( - new GT_MetaTileEntity_Replicator(482, "basicmachine.replicator.tier.02", "Advanced Replicator", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_Replicator( + 482, + "basicmachine.replicator.tier.02", + "Advanced Replicator", + 2).getStackForm(1L)); ItemList.Machine_HV_Replicator.set( - new GT_MetaTileEntity_Replicator(483, "basicmachine.replicator.tier.03", "Advanced Replicator II", 3) - .getStackForm(1L)); + new GT_MetaTileEntity_Replicator( + 483, + "basicmachine.replicator.tier.03", + "Advanced Replicator II", + 3).getStackForm(1L)); ItemList.Machine_EV_Replicator.set( - new GT_MetaTileEntity_Replicator(484, "basicmachine.replicator.tier.04", "Advanced Replicator III", 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Replicator( + 484, + "basicmachine.replicator.tier.04", + "Advanced Replicator III", + 4).getStackForm(1L)); ItemList.Machine_IV_Replicator.set( - new GT_MetaTileEntity_Replicator(485, "basicmachine.replicator.tier.05", "Advanced Replicator IV", 5) - .getStackForm(1L)); + new GT_MetaTileEntity_Replicator( + 485, + "basicmachine.replicator.tier.05", + "Advanced Replicator IV", + 5).getStackForm(1L)); GT_ModHandler.addCraftingRecipe( ItemList.Machine_LV_Replicator.get(1L), @@ -5932,20 +6064,35 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC OrePrefixes.cableGt04.get(Materials.Tungsten) }); ItemList.Machine_LV_Brewery.set( - new GT_MetaTileEntity_PotionBrewer(491, "basicmachine.brewery.tier.01", "Basic Brewery", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_PotionBrewer( + 491, + "basicmachine.brewery.tier.01", + "Basic Brewery", + 1).getStackForm(1L)); ItemList.Machine_MV_Brewery.set( - new GT_MetaTileEntity_PotionBrewer(492, "basicmachine.brewery.tier.02", "Advanced Brewery", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_PotionBrewer( + 492, + "basicmachine.brewery.tier.02", + "Advanced Brewery", + 2).getStackForm(1L)); ItemList.Machine_HV_Brewery.set( - new GT_MetaTileEntity_PotionBrewer(493, "basicmachine.brewery.tier.03", "Advanced Brewery II", 3) - .getStackForm(1L)); + new GT_MetaTileEntity_PotionBrewer( + 493, + "basicmachine.brewery.tier.03", + "Advanced Brewery II", + 3).getStackForm(1L)); ItemList.Machine_EV_Brewery.set( - new GT_MetaTileEntity_PotionBrewer(494, "basicmachine.brewery.tier.04", "Advanced Brewery III", 4) - .getStackForm(1L)); + new GT_MetaTileEntity_PotionBrewer( + 494, + "basicmachine.brewery.tier.04", + "Advanced Brewery III", + 4).getStackForm(1L)); ItemList.Machine_IV_Brewery.set( - new GT_MetaTileEntity_PotionBrewer(495, "basicmachine.brewery.tier.05", "Advanced Brewery IV", 5) - .getStackForm(1L)); + new GT_MetaTileEntity_PotionBrewer( + 495, + "basicmachine.brewery.tier.05", + "Advanced Brewery IV", + 5).getStackForm(1L)); GT_ModHandler.addCraftingRecipe( ItemList.Machine_LV_Brewery.get(1L), @@ -6255,7 +6402,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingChest }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_MV_FluidSolidifier.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 522, @@ -6281,7 +6429,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingChest }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_HV_FluidSolidifier.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 523, @@ -6307,7 +6456,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingChest }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_EV_FluidSolidifier.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 524, @@ -6333,7 +6483,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingChest }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_IV_FluidSolidifier.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 525, @@ -6359,7 +6510,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingChest }) - .getStackForm(1L)); + .getStackForm( + 1L)); ItemList.Machine_LV_Distillery.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( @@ -8158,8 +8310,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) - .setProgressBarTextureName("E_Oven").getStackForm(1L)); + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }).setProgressBarTextureName( + "E_Oven") + .getStackForm(1L)); ItemList.Machine_MV_Oven.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 672, @@ -8183,8 +8336,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) - .setProgressBarTextureName("E_Oven").getStackForm(1L)); + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }).setProgressBarTextureName( + "E_Oven") + .getStackForm(1L)); ItemList.Machine_HV_Oven.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 673, @@ -8208,8 +8362,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) - .setProgressBarTextureName("E_Oven").getStackForm(1L)); + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }).setProgressBarTextureName( + "E_Oven") + .getStackForm(1L)); ItemList.Machine_EV_Oven.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 674, @@ -8233,8 +8388,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) - .setProgressBarTextureName("E_Oven").getStackForm(1L)); + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }).setProgressBarTextureName( + "E_Oven") + .getStackForm(1L)); ItemList.Machine_IV_Oven.set( new GT_MetaTileEntity_BasicMachine_GT_Recipe( 675, @@ -8258,13 +8414,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }) - .setProgressBarTextureName("E_Oven").getStackForm(1L)); - - ItemList.Machine_LV_Miner - .set(new GT_MetaTileEntity_Miner(679, "basicmachine.miner.tier.01", "Basic Miner", 1).getStackForm(1L)); - ItemList.Machine_MV_Miner - .set(new GT_MetaTileEntity_Miner(680, "basicmachine.miner.tier.02", "Good Miner", 2).getStackForm(1L)); + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING }).setProgressBarTextureName( + "E_Oven") + .getStackForm(1L)); + + ItemList.Machine_LV_Miner.set( + new GT_MetaTileEntity_Miner(679, "basicmachine.miner.tier.01", "Basic Miner", 1).getStackForm(1L)); + ItemList.Machine_MV_Miner.set( + new GT_MetaTileEntity_Miner(680, "basicmachine.miner.tier.02", "Good Miner", 2).getStackForm(1L)); ItemList.Machine_HV_Miner.set( new GT_MetaTileEntity_Miner(681, "basicmachine.miner.tier.03", "Advanced Miner", 3).getStackForm(1L)); @@ -8291,19 +8448,21 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void run3() { ItemList.Machine_Multi_BlastFurnace.set( - new GT_MetaTileEntity_ElectricBlastFurnace(1000, "multimachine.blastfurnace", "Electric Blast Furnace") - .getStackForm(1L)); + new GT_MetaTileEntity_ElectricBlastFurnace( + 1000, + "multimachine.blastfurnace", + "Electric Blast Furnace").getStackForm(1L)); ItemList.Machine_Multi_ImplosionCompressor.set( new GT_MetaTileEntity_ImplosionCompressor( 1001, "multimachine.implosioncompressor", "Implosion Compressor").getStackForm(1L)); ItemList.Machine_Multi_VacuumFreezer.set( - new GT_MetaTileEntity_VacuumFreezer(1002, "multimachine.vacuumfreezer", "Vacuum Freezer") - .getStackForm(1L)); + new GT_MetaTileEntity_VacuumFreezer(1002, "multimachine.vacuumfreezer", "Vacuum Freezer").getStackForm( + 1L)); ItemList.Machine_Multi_Furnace.set( - new GT_MetaTileEntity_MultiFurnace(1003, "multimachine.multifurnace", "Multi Smelter") - .getStackForm(1L)); + new GT_MetaTileEntity_MultiFurnace(1003, "multimachine.multifurnace", "Multi Smelter").getStackForm( + 1L)); ItemList.Machine_Multi_PlasmaForge.set( new GT_MetaTileEntity_PlasmaForge( 1004, @@ -8336,11 +8495,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC OrePrefixes.cableGt01.get(Materials.AnnealedCopper) }); ItemList.Machine_Multi_LargeBoiler_Bronze.set( - new GT_MetaTileEntity_LargeBoiler_Bronze(1020, "multimachine.boiler.bronze", "Large Bronze Boiler") - .getStackForm(1L)); + new GT_MetaTileEntity_LargeBoiler_Bronze( + 1020, + "multimachine.boiler.bronze", + "Large Bronze Boiler").getStackForm(1L)); ItemList.Machine_Multi_LargeBoiler_Steel.set( - new GT_MetaTileEntity_LargeBoiler_Steel(1021, "multimachine.boiler.steel", "Large Steel Boiler") - .getStackForm(1L)); + new GT_MetaTileEntity_LargeBoiler_Steel( + 1021, + "multimachine.boiler.steel", + "Large Steel Boiler").getStackForm(1L)); ItemList.Machine_Multi_LargeBoiler_Titanium.set( new GT_MetaTileEntity_LargeBoiler_Titanium( 1022, @@ -8416,8 +8579,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC OrePrefixes.gearGt.get(Materials.StainlessSteel) }); ItemList.Generator_Gas_Turbine_LV.set( - new GT_MetaTileEntity_GasTurbine(1115, "basicgenerator.gasturbine.tier.01", "Basic Gas Turbine", 1, 95) - .getStackForm(1L)); + new GT_MetaTileEntity_GasTurbine( + 1115, + "basicgenerator.gasturbine.tier.01", + "Basic Gas Turbine", + 1, + 95).getStackForm(1L)); ItemList.Generator_Gas_Turbine_MV.set( new GT_MetaTileEntity_GasTurbine( 1116, @@ -8426,8 +8593,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, 90).getStackForm(1L)); ItemList.Generator_Gas_Turbine_HV.set( - new GT_MetaTileEntity_GasTurbine(1117, "basicgenerator.gasturbine.tier.03", "Turbo Gas Turbine", 3, 85) - .getStackForm(1L)); + new GT_MetaTileEntity_GasTurbine( + 1117, + "basicgenerator.gasturbine.tier.03", + "Turbo Gas Turbine", + 3, + 85).getStackForm(1L)); ItemList.Generator_Gas_Turbine_EV.set( new GT_MetaTileEntity_GasTurbine( 1118, @@ -8639,11 +8810,15 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 'T', ItemList.Field_Generator_EV, 'F', OrePrefixes.plate.get(Materials.Neutronium) }); } ItemList.FusionComputer_LuV.set( - new GT_MetaTileEntity_FusionComputer1(1193, "fusioncomputer.tier.06", "Fusion Control Computer Mark I") - .getStackForm(1L)); + new GT_MetaTileEntity_FusionComputer1( + 1193, + "fusioncomputer.tier.06", + "Fusion Control Computer Mark I").getStackForm(1L)); ItemList.FusionComputer_ZPMV.set( - new GT_MetaTileEntity_FusionComputer2(1194, "fusioncomputer.tier.07", "Fusion Control Computer Mark II") - .getStackForm(1L)); + new GT_MetaTileEntity_FusionComputer2( + 1194, + "fusioncomputer.tier.07", + "Fusion Control Computer Mark II").getStackForm(1L)); ItemList.FusionComputer_UV.set( new GT_MetaTileEntity_FusionComputer3( 1195, @@ -8699,8 +8874,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC OrePrefixes.stick.get(Materials.Americium) }); ItemList.Processing_Array.set( - new GT_MetaTileEntity_ProcessingArray(1199, "multimachine.processingarray", "Processing Array") - .getStackForm(1L)); + new GT_MetaTileEntity_ProcessingArray( + 1199, + "multimachine.processingarray", + "Processing Array").getStackForm(1L)); GT_ModHandler.addCraftingRecipe( ItemList.Processing_Array.get(1L), bitsd, @@ -8711,8 +8888,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_ProcessingArrayRecipeLoader.registerDefaultGregtechMaps(); ItemList.Distillation_Tower.set( - new GT_MetaTileEntity_DistillationTower(1126, "multimachine.distillationtower", "Distillation Tower") - .getStackForm(1L)); + new GT_MetaTileEntity_DistillationTower( + 1126, + "multimachine.distillationtower", + "Distillation Tower").getStackForm(1L)); GT_ModHandler.addCraftingRecipe( ItemList.Distillation_Tower.get(1L), bitsd, @@ -8721,15 +8900,21 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC OrePrefixes.circuit.get(Materials.Data), 'F', ItemList.Electric_Pump_HV }); ItemList.Ore_Processor.set( - new GT_MetaTileEntity_IntegratedOreFactory(1132, "multimachine.oreprocessor", "Integrated Ore Factory") - .getStackForm(1L)); + new GT_MetaTileEntity_IntegratedOreFactory( + 1132, + "multimachine.oreprocessor", + "Integrated Ore Factory").getStackForm(1L)); ItemList.LargeSteamTurbine.set( - new GT_MetaTileEntity_LargeTurbine_Steam(1131, "multimachine.largeturbine", "Large Steam Turbine") - .getStackForm(1L)); + new GT_MetaTileEntity_LargeTurbine_Steam( + 1131, + "multimachine.largeturbine", + "Large Steam Turbine").getStackForm(1L)); ItemList.LargeGasTurbine.set( - new GT_MetaTileEntity_LargeTurbine_Gas(1151, "multimachine.largegasturbine", "Large Gas Turbine") - .getStackForm(1L)); + new GT_MetaTileEntity_LargeTurbine_Gas( + 1151, + "multimachine.largegasturbine", + "Large Gas Turbine").getStackForm(1L)); ItemList.LargeHPSteamTurbine.set( new GT_MetaTileEntity_LargeTurbine_HPSteam( 1152, @@ -8772,8 +8957,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Master), 'P', OrePrefixes.gearGt.get(Materials.HSSG) }); - ItemList.Pump_LV - .set(new GT_MetaTileEntity_Pump(1140, "basicmachine.pump.tier.01", "Basic Pump", 1).getStackForm(1L)); + ItemList.Pump_LV.set( + new GT_MetaTileEntity_Pump(1140, "basicmachine.pump.tier.01", "Basic Pump", 1).getStackForm(1L)); ItemList.Pump_MV.set( new GT_MetaTileEntity_Pump(1141, "basicmachine.pump.tier.02", "Advanced Pump", 2).getStackForm(1L)); ItemList.Pump_HV.set( @@ -8908,8 +9093,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC OrePrefixes.circuit.get(Materials.SuperconductorUHV) }); ItemList.Machine_Multi_HeatExchanger.set( - new GT_MetaTileEntity_HeatExchanger(1154, "multimachine.heatexchanger", "Large Heat Exchanger") - .getStackForm(1L)); + new GT_MetaTileEntity_HeatExchanger( + 1154, + "multimachine.heatexchanger", + "Large Heat Exchanger").getStackForm(1L)); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_HeatExchanger.get(1L), bitsd, @@ -8917,8 +9104,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC OrePrefixes.pipeMedium.get(Materials.Titanium), 'W', ItemList.Electric_Pump_EV }); ItemList.Charcoal_Pile.set( - new GT_MetaTileEntity_Charcoal_Pit(1155, "multimachine.charcoalpile", "Charcoal Pile Igniter") - .getStackForm(1)); + new GT_MetaTileEntity_Charcoal_Pit( + 1155, + "multimachine.charcoalpile", + "Charcoal Pile Igniter").getStackForm(1)); GT_ModHandler.addCraftingRecipe( ItemList.Charcoal_Pile.get(1L), bitsd, @@ -9020,17 +9209,25 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC OrePrefixes.cableGt04.get(Materials.Aluminium) }); ItemList.OilDrill1.set( - new GT_MetaTileEntity_OilDrill1(1157, "multimachine.oildrill1", "Oil/Gas/Fluid Drilling Rig") - .getStackForm(1)); + new GT_MetaTileEntity_OilDrill1( + 1157, + "multimachine.oildrill1", + "Oil/Gas/Fluid Drilling Rig").getStackForm(1)); ItemList.OilDrill2.set( - new GT_MetaTileEntity_OilDrill2(141, "multimachine.oildrill2", "Oil/Gas/Fluid Drilling Rig II") - .getStackForm(1)); + new GT_MetaTileEntity_OilDrill2( + 141, + "multimachine.oildrill2", + "Oil/Gas/Fluid Drilling Rig II").getStackForm(1)); ItemList.OilDrill3.set( - new GT_MetaTileEntity_OilDrill3(142, "multimachine.oildrill3", "Oil/Gas/Fluid Drilling Rig III") - .getStackForm(1)); + new GT_MetaTileEntity_OilDrill3( + 142, + "multimachine.oildrill3", + "Oil/Gas/Fluid Drilling Rig III").getStackForm(1)); ItemList.OilDrill4.set( - new GT_MetaTileEntity_OilDrill4(149, "multimachine.oildrill4", "Oil/Gas/Fluid Drilling Rig IV") - .getStackForm(1)); + new GT_MetaTileEntity_OilDrill4( + 149, + "multimachine.oildrill4", + "Oil/Gas/Fluid Drilling Rig IV").getStackForm(1)); ItemList.OilDrillInfinite.set( new GT_MetaTileEntity_OilDrillInfinite( 148, @@ -9063,20 +9260,28 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Electric_Pump_EV }); ItemList.OreDrill1.set( - new GT_MetaTileEntity_OreDrillingPlant1(1158, "multimachine.oredrill1", "Ore Drilling Plant") - .getStackForm(1)); + new GT_MetaTileEntity_OreDrillingPlant1( + 1158, + "multimachine.oredrill1", + "Ore Drilling Plant").getStackForm(1)); ItemList.OreDrill2.set( - new GT_MetaTileEntity_OreDrillingPlant2(1177, "multimachine.oredrill2", "Ore Drilling Plant II") - .getStackForm(1)); + new GT_MetaTileEntity_OreDrillingPlant2( + 1177, + "multimachine.oredrill2", + "Ore Drilling Plant II").getStackForm(1)); ItemList.OreDrill3.set( - new GT_MetaTileEntity_OreDrillingPlant3(1178, "multimachine.oredrill3", "Ore Drilling Plant III") - .getStackForm(1)); + new GT_MetaTileEntity_OreDrillingPlant3( + 1178, + "multimachine.oredrill3", + "Ore Drilling Plant III").getStackForm(1)); ItemList.OreDrill4.set( - new GT_MetaTileEntity_OreDrillingPlant4(1179, "multimachine.oredrill4", "Ore Drilling Plant IV") - .getStackForm(1)); + new GT_MetaTileEntity_OreDrillingPlant4( + 1179, + "multimachine.oredrill4", + "Ore Drilling Plant IV").getStackForm(1)); - ItemList.PyrolyseOven - .set(new GT_MetaTileEntity_PyrolyseOven(1159, "multimachine.pyro", "Pyrolyse Oven").getStackForm(1)); + ItemList.PyrolyseOven.set( + new GT_MetaTileEntity_PyrolyseOven(1159, "multimachine.pyro", "Pyrolyse Oven").getStackForm(1)); GT_ModHandler.addCraftingRecipe( ItemList.PyrolyseOven.get(1L), bitsd, @@ -9157,26 +9362,26 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.MicroTransmitter_ZPM.get(1L), bitsd, new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_ZPM, 'B', - GregTech_API.sOPStuff - .get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false) - ? ItemList.Energy_Module - : ItemList.ZPM2, + GregTech_API.sOPStuff.get( + ConfigCategories.Recipes.gregtechrecipes, + "EnableZPMandUVBatteries", + false) ? ItemList.Energy_Module : ItemList.ZPM2, 'C', ItemList.Emitter_ZPM, 'G', OrePrefixes.circuit.get(Materials.Ultimate), 'P', ItemList.Field_Generator_ZPM }); GT_ModHandler.addCraftingRecipe( ItemList.MicroTransmitter_UV.get(1L), bitsd, new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_UV, 'B', - GregTech_API.sOPStuff - .get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false) - ? ItemList.Energy_Module - : ItemList.ZPM3, + GregTech_API.sOPStuff.get( + ConfigCategories.Recipes.gregtechrecipes, + "EnableZPMandUVBatteries", + false) ? ItemList.Energy_Module : ItemList.ZPM3, 'C', ItemList.Emitter_UV, 'G', OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'P', ItemList.Field_Generator_UV }); ItemList.Machine_Multi_Assemblyline.set( - new GT_MetaTileEntity_AssemblyLine(1170, "multimachine.assemblyline", "Assembling Line") - .getStackForm(1L)); + new GT_MetaTileEntity_AssemblyLine(1170, "multimachine.assemblyline", "Assembling Line").getStackForm( + 1L)); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_Assemblyline.get(1L), bitsd, @@ -9185,8 +9390,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC ItemList.Robot_Arm_IV }); ItemList.Machine_Multi_DieselEngine.set( - new GT_MetaTileEntity_DieselEngine(1171, "multimachine.dieselengine", "Combustion Engine") - .getStackForm(1L)); + new GT_MetaTileEntity_DieselEngine(1171, "multimachine.dieselengine", "Combustion Engine").getStackForm( + 1L)); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_DieselEngine.get(1L), bitsd, @@ -9220,8 +9425,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC OrePrefixes.rotor.get(Materials.TungstenSteel) }); ItemList.Machine_Multi_Cleanroom.set( - new GT_MetaTileEntity_Cleanroom(1172, "multimachine.cleanroom", "Cleanroom Controller") - .getStackForm(1)); + new GT_MetaTileEntity_Cleanroom(1172, "multimachine.cleanroom", "Cleanroom Controller").getStackForm( + 1)); // If Cleanroom is enabled, add a recipe, else hide from NEI. if (GT_Mod.gregtechproxy.mEnableCleanroom) { GT_ModHandler.addCraftingRecipe( @@ -9456,24 +9661,33 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER }).getStackForm(1L)); ItemList.Machine_HV_LightningRod.set( - new GT_MetaTileEntity_LightningRod(1174, "basicgenerator.lightningrod.03", "Lightning Rod", 3) - .getStackForm(1)); + new GT_MetaTileEntity_LightningRod( + 1174, + "basicgenerator.lightningrod.03", + "Lightning Rod", + 3).getStackForm(1)); GT_ModHandler.addCraftingRecipe( ItemList.Machine_HV_LightningRod.get(1L), bitsd, new Object[] { "LTL", "TMT", "LTL", 'M', ItemList.Hull_LuV, 'L', ItemList.Energy_LapotronicOrb, 'T', ItemList.Transformer_ZPM_LuV }); ItemList.Machine_EV_LightningRod.set( - new GT_MetaTileEntity_LightningRod(1175, "basicgenerator.lightningrod.04", "Lightning Rod II", 4) - .getStackForm(1)); + new GT_MetaTileEntity_LightningRod( + 1175, + "basicgenerator.lightningrod.04", + "Lightning Rod II", + 4).getStackForm(1)); GT_ModHandler.addCraftingRecipe( ItemList.Machine_EV_LightningRod.get(1L), bitsd, new Object[] { "LTL", "TMT", "LTL", 'M', ItemList.Hull_ZPM, 'L', ItemList.Energy_LapotronicOrb2, 'T', ItemList.Transformer_UV_ZPM }); ItemList.Machine_IV_LightningRod.set( - new GT_MetaTileEntity_LightningRod(1176, "basicgenerator.lightningrod.05", "Lightning Rod III", 5) - .getStackForm(1)); + new GT_MetaTileEntity_LightningRod( + 1176, + "basicgenerator.lightningrod.05", + "Lightning Rod III", + 5).getStackForm(1)); GT_ModHandler.addCraftingRecipe( ItemList.Machine_IV_LightningRod.get(1L), bitsd, @@ -9493,11 +9707,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC OrePrefixes.pipeLarge.get(Materials.Polytetrafluoroethylene), 'M', ItemList.Electric_Motor_HV, 'B', ItemList.Hull_HV }); - ItemList.PCBFactory - .set(new GT_MetaTileEntity_PCBFactory(356, "multimachine.pcbfactory", "PCB Factory").getStackForm(1)); + ItemList.PCBFactory.set( + new GT_MetaTileEntity_PCBFactory(356, "multimachine.pcbfactory", "PCB Factory").getStackForm(1)); GT_PCBFactoryMaterialLoader.load(); - ItemList.NanoForge - .set(new GT_MetaTileEntity_NanoForge(357, "multimachine.nanoforge", "Nano Forge").getStackForm(1)); + ItemList.NanoForge.set( + new GT_MetaTileEntity_NanoForge(357, "multimachine.nanoforge", "Nano Forge").getStackForm(1)); } private static void run4() { @@ -10069,8 +10283,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Ultra Low Voltage Chest Buffer", 0).getStackForm(1L)); ItemList.Automation_ChestBuffer_LV.set( - new GT_MetaTileEntity_ChestBuffer(9231, "automation.chestbuffer.tier.01", "Low Voltage Chest Buffer", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_ChestBuffer( + 9231, + "automation.chestbuffer.tier.01", + "Low Voltage Chest Buffer", + 1).getStackForm(1L)); ItemList.Automation_ChestBuffer_MV.set( new GT_MetaTileEntity_ChestBuffer( 9232, @@ -10102,8 +10319,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Ludicrous Voltage Chest Buffer", 6).getStackForm(1L)); ItemList.Automation_ChestBuffer_ZPM.set( - new GT_MetaTileEntity_ChestBuffer(9237, "automation.chestbuffer.tier.07", "ZPM Voltage Chest Buffer", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_ChestBuffer( + 9237, + "automation.chestbuffer.tier.07", + "ZPM Voltage Chest Buffer", + 7).getStackForm(1L)); ItemList.Automation_ChestBuffer_UV.set( new GT_MetaTileEntity_ChestBuffer( 9238, @@ -10169,32 +10389,59 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Infinite) }); ItemList.Automation_Filter_ULV.set( - new GT_MetaTileEntity_Filter(9240, "automation.filter.tier.00", "Ultra Low Voltage Item Filter", 0) - .getStackForm(1L)); + new GT_MetaTileEntity_Filter( + 9240, + "automation.filter.tier.00", + "Ultra Low Voltage Item Filter", + 0).getStackForm(1L)); ItemList.Automation_Filter_LV.set( - new GT_MetaTileEntity_Filter(9241, "automation.filter.tier.01", "Low Voltage Item Filter", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_Filter( + 9241, + "automation.filter.tier.01", + "Low Voltage Item Filter", + 1).getStackForm(1L)); ItemList.Automation_Filter_MV.set( - new GT_MetaTileEntity_Filter(9242, "automation.filter.tier.02", "Medium Voltage Item Filter", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_Filter( + 9242, + "automation.filter.tier.02", + "Medium Voltage Item Filter", + 2).getStackForm(1L)); ItemList.Automation_Filter_HV.set( - new GT_MetaTileEntity_Filter(9243, "automation.filter.tier.03", "High Voltage Item Filter", 3) - .getStackForm(1L)); + new GT_MetaTileEntity_Filter( + 9243, + "automation.filter.tier.03", + "High Voltage Item Filter", + 3).getStackForm(1L)); ItemList.Automation_Filter_EV.set( - new GT_MetaTileEntity_Filter(9244, "automation.filter.tier.04", "Extreme Voltage Item Filter", 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Filter( + 9244, + "automation.filter.tier.04", + "Extreme Voltage Item Filter", + 4).getStackForm(1L)); ItemList.Automation_Filter_IV.set( - new GT_MetaTileEntity_Filter(9245, "automation.filter.tier.05", "Insane Voltage Item Filter", 5) - .getStackForm(1L)); + new GT_MetaTileEntity_Filter( + 9245, + "automation.filter.tier.05", + "Insane Voltage Item Filter", + 5).getStackForm(1L)); ItemList.Automation_Filter_LuV.set( - new GT_MetaTileEntity_Filter(9246, "automation.filter.tier.06", "Ludicrous Voltage Item Filter", 6) - .getStackForm(1L)); + new GT_MetaTileEntity_Filter( + 9246, + "automation.filter.tier.06", + "Ludicrous Voltage Item Filter", + 6).getStackForm(1L)); ItemList.Automation_Filter_ZPM.set( - new GT_MetaTileEntity_Filter(9247, "automation.filter.tier.07", "ZPM Voltage Item Filter", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_Filter( + 9247, + "automation.filter.tier.07", + "ZPM Voltage Item Filter", + 7).getStackForm(1L)); ItemList.Automation_Filter_UV.set( - new GT_MetaTileEntity_Filter(9248, "automation.filter.tier.08", "Ultimate Voltage Item Filter", 8) - .getStackForm(1L)); + new GT_MetaTileEntity_Filter( + 9248, + "automation.filter.tier.08", + "Ultimate Voltage Item Filter", + 8).getStackForm(1L)); ItemList.Automation_Filter_MAX.set( new GT_MetaTileEntity_Filter( 9249, @@ -10270,14 +10517,23 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Ultra Low Voltage Type Filter", 0).getStackForm(1L)); ItemList.Automation_TypeFilter_LV.set( - new GT_MetaTileEntity_TypeFilter(9251, "automation.typefilter.tier.01", "Low Voltage Type Filter", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_TypeFilter( + 9251, + "automation.typefilter.tier.01", + "Low Voltage Type Filter", + 1).getStackForm(1L)); ItemList.Automation_TypeFilter_MV.set( - new GT_MetaTileEntity_TypeFilter(9252, "automation.typefilter.tier.02", "Medium Voltage Type Filter", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_TypeFilter( + 9252, + "automation.typefilter.tier.02", + "Medium Voltage Type Filter", + 2).getStackForm(1L)); ItemList.Automation_TypeFilter_HV.set( - new GT_MetaTileEntity_TypeFilter(9253, "automation.typefilter.tier.03", "High Voltage Type Filter", 3) - .getStackForm(1L)); + new GT_MetaTileEntity_TypeFilter( + 9253, + "automation.typefilter.tier.03", + "High Voltage Type Filter", + 3).getStackForm(1L)); ItemList.Automation_TypeFilter_EV.set( new GT_MetaTileEntity_TypeFilter( 9254, @@ -10285,8 +10541,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Extreme Voltage Type Filter", 4).getStackForm(1L)); ItemList.Automation_TypeFilter_IV.set( - new GT_MetaTileEntity_TypeFilter(9255, "automation.typefilter.tier.05", "Insane Voltage Type Filter", 5) - .getStackForm(1L)); + new GT_MetaTileEntity_TypeFilter( + 9255, + "automation.typefilter.tier.05", + "Insane Voltage Type Filter", + 5).getStackForm(1L)); ItemList.Automation_TypeFilter_LuV.set( new GT_MetaTileEntity_TypeFilter( 9256, @@ -10294,8 +10553,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Ludicrous Voltage Type Filter", 6).getStackForm(1L)); ItemList.Automation_TypeFilter_ZPM.set( - new GT_MetaTileEntity_TypeFilter(9257, "automation.typefilter.tier.07", "ZPM Voltage Type Filter", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_TypeFilter( + 9257, + "automation.typefilter.tier.07", + "ZPM Voltage Type Filter", + 7).getStackForm(1L)); ItemList.Automation_TypeFilter_UV.set( new GT_MetaTileEntity_TypeFilter( 9258, @@ -10371,32 +10633,59 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC OrePrefixes.circuit.get(Materials.Basic) }); ItemList.Automation_Regulator_ULV.set( - new GT_MetaTileEntity_Regulator(9270, "automation.regulator.tier.00", "Ultra Low Voltage Regulator", 0) - .getStackForm(1L)); + new GT_MetaTileEntity_Regulator( + 9270, + "automation.regulator.tier.00", + "Ultra Low Voltage Regulator", + 0).getStackForm(1L)); ItemList.Automation_Regulator_LV.set( - new GT_MetaTileEntity_Regulator(9271, "automation.regulator.tier.01", "Low Voltage Regulator", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_Regulator( + 9271, + "automation.regulator.tier.01", + "Low Voltage Regulator", + 1).getStackForm(1L)); ItemList.Automation_Regulator_MV.set( - new GT_MetaTileEntity_Regulator(9272, "automation.regulator.tier.02", "Medium Voltage Regulator", 2) - .getStackForm(1L)); + new GT_MetaTileEntity_Regulator( + 9272, + "automation.regulator.tier.02", + "Medium Voltage Regulator", + 2).getStackForm(1L)); ItemList.Automation_Regulator_HV.set( - new GT_MetaTileEntity_Regulator(9273, "automation.regulator.tier.03", "High Voltage Regulator", 3) - .getStackForm(1L)); + new GT_MetaTileEntity_Regulator( + 9273, + "automation.regulator.tier.03", + "High Voltage Regulator", + 3).getStackForm(1L)); ItemList.Automation_Regulator_EV.set( - new GT_MetaTileEntity_Regulator(9274, "automation.regulator.tier.04", "Extreme Voltage Regulator", 4) - .getStackForm(1L)); + new GT_MetaTileEntity_Regulator( + 9274, + "automation.regulator.tier.04", + "Extreme Voltage Regulator", + 4).getStackForm(1L)); ItemList.Automation_Regulator_IV.set( - new GT_MetaTileEntity_Regulator(9275, "automation.regulator.tier.05", "Insane Voltage Regulator", 5) - .getStackForm(1L)); + new GT_MetaTileEntity_Regulator( + 9275, + "automation.regulator.tier.05", + "Insane Voltage Regulator", + 5).getStackForm(1L)); ItemList.Automation_Regulator_LuV.set( - new GT_MetaTileEntity_Regulator(9276, "automation.regulator.tier.06", "Ludicrous Voltage Regulator", 6) - .getStackForm(1L)); + new GT_MetaTileEntity_Regulator( + 9276, + "automation.regulator.tier.06", + "Ludicrous Voltage Regulator", + 6).getStackForm(1L)); ItemList.Automation_Regulator_ZPM.set( - new GT_MetaTileEntity_Regulator(9277, "automation.regulator.tier.07", "ZPM Voltage Regulator", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_Regulator( + 9277, + "automation.regulator.tier.07", + "ZPM Voltage Regulator", + 7).getStackForm(1L)); ItemList.Automation_Regulator_UV.set( - new GT_MetaTileEntity_Regulator(9278, "automation.regulator.tier.08", "Ultimate Voltage Regulator", 8) - .getStackForm(1L)); + new GT_MetaTileEntity_Regulator( + 9278, + "automation.regulator.tier.08", + "Ultimate Voltage Regulator", + 8).getStackForm(1L)); ItemList.Automation_Regulator_MAX.set( new GT_MetaTileEntity_Regulator( 9279, @@ -10472,8 +10761,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Ultra Low Voltage Super Buffer", 0).getStackForm(1L)); ItemList.Automation_SuperBuffer_LV.set( - new GT_MetaTileEntity_SuperBuffer(9301, "automation.superbuffer.tier.01", "Low Voltage Super Buffer", 1) - .getStackForm(1L)); + new GT_MetaTileEntity_SuperBuffer( + 9301, + "automation.superbuffer.tier.01", + "Low Voltage Super Buffer", + 1).getStackForm(1L)); ItemList.Automation_SuperBuffer_MV.set( new GT_MetaTileEntity_SuperBuffer( 9302, @@ -10505,8 +10797,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Ludicrous Voltage Super Buffer", 6).getStackForm(1L)); ItemList.Automation_SuperBuffer_ZPM.set( - new GT_MetaTileEntity_SuperBuffer(9307, "automation.superbuffer.tier.07", "ZPM Voltage Super Buffer", 7) - .getStackForm(1L)); + new GT_MetaTileEntity_SuperBuffer( + 9307, + "automation.superbuffer.tier.07", + "ZPM Voltage Super Buffer", + 7).getStackForm(1L)); ItemList.Automation_SuperBuffer_UV.set( new GT_MetaTileEntity_SuperBuffer( 9308, diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java index 22c8c9ece8..9aedde81c4 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java @@ -42,29 +42,77 @@ public class GT_Loader_MultiTileEntities implements Runnable { true); final MultiTileEntityRegistry machineRegistry = new MultiTileEntityRegistry("gt.multitileentity.controllers"); // Disable for now - machineRegistry.create(1000, MultiBlock_Macerator.class).name("Large Macerator") - .category("Multiblock Controller").setBlock(machine).material(Materials.Iron).texture("metalwall") - .tankCapacity(128000L).inputInventorySize(16).outputInventorySize(16).register(); - machineRegistry.create(0, MultiBlock_CokeOven.class).name("Coke Oven").category("MultiblockController") - .setBlock(machine).texture("cokeOven").inputInventorySize(1).outputInventorySize(1).register(); + machineRegistry.create(1000, MultiBlock_Macerator.class) + .name("Large Macerator") + .category("Multiblock Controller") + .setBlock(machine) + .material(Materials.Iron) + .texture("metalwall") + .tankCapacity(128000L) + .inputInventorySize(16) + .outputInventorySize(16) + .register(); + machineRegistry.create(0, MultiBlock_CokeOven.class) + .name("Coke Oven") + .category("MultiblockController") + .setBlock(machine) + .texture("cokeOven") + .inputInventorySize(1) + .outputInventorySize(1) + .register(); } private static void registerCasings() { final MultiTileEntityRegistry casingRegistry = new MultiTileEntityRegistry("gt.multitileentity.casings"); - final MultiTileEntityBlock casing = MultiTileEntityBlock - .getOrCreate("GregTech", "casing", Material.iron, Block.soundTypeMetal, "wrench", 0, 0, 15, true, true); - casingRegistry.create(CokeOven.getId(), WallShareablePart.class).name("Coke Oven Bricks") - .category("MultiBlock Casing").setBlock(casing).texture("cokeOven").register(); - casingRegistry.create(18000, BasicCasing.class).name("Test Casing").category("Multiblock Casing") - .setBlock(casing).material(Materials.Cobalt).texture("metalwall").register(); - casingRegistry.create(20001, InventoryUpgrade.class).name("Inventory Upgrade LV") - .category("MultiBlock Special Casing").setBlock(casing).material(Materials.SpaceTime) - .texture("metalwall").upgradeInventorySize(16).tier(1).register(); - casingRegistry.create(20002, InventoryUpgrade.class).name("Inventory Upgrade MV") - .category("MultiBlock Upgrade Casing").setBlock(casing).material(Materials.Neutronium) - .texture("metalwall").upgradeInventorySize(24).tier(2).register(); - casingRegistry.create(10000, MotorCasing.class).name("Motor Casing LV").tier(1) - .category("MultiBlock Functional Casing").setBlock(casing).material(Materials.Arsenic) - .texture("metalwall").register(); + final MultiTileEntityBlock casing = MultiTileEntityBlock.getOrCreate( + "GregTech", + "casing", + Material.iron, + Block.soundTypeMetal, + "wrench", + 0, + 0, + 15, + true, + true); + casingRegistry.create(CokeOven.getId(), WallShareablePart.class) + .name("Coke Oven Bricks") + .category("MultiBlock Casing") + .setBlock(casing) + .texture("cokeOven") + .register(); + casingRegistry.create(18000, BasicCasing.class) + .name("Test Casing") + .category("Multiblock Casing") + .setBlock(casing) + .material(Materials.Cobalt) + .texture("metalwall") + .register(); + casingRegistry.create(20001, InventoryUpgrade.class) + .name("Inventory Upgrade LV") + .category("MultiBlock Special Casing") + .setBlock(casing) + .material(Materials.SpaceTime) + .texture("metalwall") + .upgradeInventorySize(16) + .tier(1) + .register(); + casingRegistry.create(20002, InventoryUpgrade.class) + .name("Inventory Upgrade MV") + .category("MultiBlock Upgrade Casing") + .setBlock(casing) + .material(Materials.Neutronium) + .texture("metalwall") + .upgradeInventorySize(24) + .tier(2) + .register(); + casingRegistry.create(10000, MotorCasing.class) + .name("Motor Casing LV") + .tier(1) + .category("MultiBlock Functional Casing") + .setBlock(casing) + .material(Materials.Arsenic) + .texture("metalwall") + .register(); } } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java index 56ea3ffcee..6ea831b11f 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java @@ -44,10 +44,14 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.set(OrePrefixes.bottle, Materials.Empty, new ItemStack(Items.glass_bottle, 1, 0)); GT_OreDictUnificator.set(OrePrefixes.bottle, Materials.Water, new ItemStack(Items.potionitem, 1, 0)); - GT_OreDictUnificator - .set(OrePrefixes.plateAlloy, Materials.Iridium, GT_ModHandler.getIC2Item("iridiumPlate", 1L)); - GT_OreDictUnificator - .set(OrePrefixes.plateAlloy, Materials.Advanced, GT_ModHandler.getIC2Item("advancedAlloy", 1L)); + GT_OreDictUnificator.set( + OrePrefixes.plateAlloy, + Materials.Iridium, + GT_ModHandler.getIC2Item("iridiumPlate", 1L)); + GT_OreDictUnificator.set( + OrePrefixes.plateAlloy, + Materials.Advanced, + GT_ModHandler.getIC2Item("advancedAlloy", 1L)); GT_OreDictUnificator.set(OrePrefixes.plateAlloy, Materials.Carbon, GT_ModHandler.getIC2Item("carbonPlate", 1L)); GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Coal, new ItemStack(Blocks.coal_ore, 1)); @@ -99,25 +103,33 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.enderChest, new ItemStack(Blocks.ender_chest, 1)); } GT_OreDictUnificator.registerOre(OreDictNames.craftingAnvil, new ItemStack(Blocks.anvil, 1)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingAnvil, GT_ModHandler.getModItem("Railcraft", "anvil", 1L, 0)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingIndustrialDiamond, ItemList.IC2_Industrial_Diamond.get(1L)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingAnvil, + GT_ModHandler.getModItem("Railcraft", "anvil", 1L, 0)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingIndustrialDiamond, + ItemList.IC2_Industrial_Diamond.get(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.dust, Materials.Wood, GT_ModHandler.getModItem("ThermalExpansion", "sawdust", 1L)); - GT_OreDictUnificator - .registerOre(OrePrefixes.glass, Materials.Reinforced, GT_ModHandler.getIC2Item("reinforcedGlass", 1L)); + GT_OreDictUnificator.registerOre( + OrePrefixes.glass, + Materials.Reinforced, + GT_ModHandler.getIC2Item("reinforcedGlass", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.glass, Materials.Reinforced, GT_ModHandler.getModItem("ThermalExpansion", "glassHardened", 1L)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Basalt, GT_ModHandler.getModItem("Railcraft", "cube", 1L, 6)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Marble, GT_ModHandler.getModItem("Railcraft", "cube", 1L, 7)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Basalt, + GT_ModHandler.getModItem("Railcraft", "cube", 1L, 6)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Marble, + GT_ModHandler.getModItem("Railcraft", "cube", 1L, 7)); GT_OreDictUnificator.registerOre( OrePrefixes.stone, Materials.Basalt, @@ -126,8 +138,10 @@ public class GT_Loader_OreDictionary implements Runnable { OrePrefixes.stone, Materials.Marble, GT_ModHandler.getModItem("Railcraft", "brick.quarried", 1L, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(Blocks.obsidian, 1, 32767)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Obsidian, + new ItemStack(Blocks.obsidian, 1, 32767)); GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Stone, new ItemStack(Blocks.stone, 1, 32767)); GT_OreDictUnificator.registerOre(OrePrefixes.stoneMossy, new ItemStack(Blocks.mossy_cobblestone, 1, 32767)); GT_OreDictUnificator.registerOre(OrePrefixes.stoneCobble, new ItemStack(Blocks.mossy_cobblestone, 1, 32767)); @@ -138,17 +152,26 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre(OrePrefixes.stoneCracked, new ItemStack(Blocks.stonebrick, 1, 2)); GT_OreDictUnificator.registerOre(OrePrefixes.stoneChiseled, new ItemStack(Blocks.stonebrick, 1, 3)); GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Sand, new ItemStack(Blocks.sandstone, 1, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Netherrack, new ItemStack(Blocks.netherrack, 1, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.NetherBrick, new ItemStack(Blocks.nether_brick, 1, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Endstone, new ItemStack(Blocks.end_stone, 1, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Glowstone, new ItemStack(Blocks.glowstone, 1, 32767)); - - GT_OreDictUnificator - .registerOre("paperResearchFragment", GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 9)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Netherrack, + new ItemStack(Blocks.netherrack, 1, 32767)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.NetherBrick, + new ItemStack(Blocks.nether_brick, 1, 32767)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Endstone, + new ItemStack(Blocks.end_stone, 1, 32767)); + GT_OreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Glowstone, + new ItemStack(Blocks.glowstone, 1, 32767)); + + GT_OreDictUnificator.registerOre( + "paperResearchFragment", + GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 9)); GT_OreDictUnificator.registerOre( "itemCertusQuartz", GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 1)); @@ -172,8 +195,10 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre("cropPotato", ItemList.Food_Raw_Potato.get(1L)); GT_OreDictUnificator.registerOre("calclavia:BATTERY", GT_ModHandler.getIC2Item("reBattery", 1L)); GT_OreDictUnificator.registerOre("calclavia:BATTERY", GT_ModHandler.getIC2Item("chargedReBattery", 1L, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.battery, Materials.Basic, GT_ModHandler.getIC2Item("reBattery", 1L)); + GT_OreDictUnificator.registerOre( + OrePrefixes.battery, + Materials.Basic, + GT_ModHandler.getIC2Item("reBattery", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.battery, Materials.Basic, @@ -191,12 +216,15 @@ public class GT_Loader_OreDictionary implements Runnable { Materials.Master, GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 32767)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingWireCopper, GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingWireGold, GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingWireIron, GT_ModHandler.getIC2Item("insulatedIronCableItem", 1L)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingWireCopper, + GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingWireGold, + GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingWireIron, + GT_ModHandler.getIC2Item("insulatedIronCableItem", 1L)); GT_OreDictUnificator.registerOre( OreDictNames.craftingWireTin, GT_ModHandler.getIC2Item( @@ -204,14 +232,17 @@ public class GT_Loader_OreDictionary implements Runnable { 1L, GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L))); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingRedstoneTorch, new ItemStack(Blocks.redstone_torch, 1, 32767)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingRedstoneTorch, new ItemStack(Blocks.unlit_redstone_torch, 1, 32767)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingRedstoneTorch, + new ItemStack(Blocks.redstone_torch, 1, 32767)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingRedstoneTorch, + new ItemStack(Blocks.unlit_redstone_torch, 1, 32767)); GT_OreDictUnificator.registerOre(OreDictNames.craftingWorkBench, new ItemStack(Blocks.crafting_table, 1)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingWorkBench, new ItemStack(GregTech_API.sBlockMachines, 1, 16)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingWorkBench, + new ItemStack(GregTech_API.sBlockMachines, 1, 16)); GT_OreDictUnificator.registerOre(OreDictNames.craftingPiston, new ItemStack(Blocks.piston, 1, 32767)); GT_OreDictUnificator.registerOre(OreDictNames.craftingPiston, new ItemStack(Blocks.sticky_piston, 1, 32767)); @@ -226,38 +257,47 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.craftingFurnace, new ItemStack(Blocks.lit_furnace, 1, 32767)); GT_OreDictUnificator.registerOre(OreDictNames.craftingPump, GT_ModHandler.getIC2Item("pump", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingElectromagnet, GT_ModHandler.getIC2Item("magnetizer", 1L)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingElectromagnet, + GT_ModHandler.getIC2Item("magnetizer", 1L)); GT_OreDictUnificator.registerOre(OreDictNames.craftingTeleporter, GT_ModHandler.getIC2Item("teleporter", 1L)); GT_OreDictUnificator.registerOre(OreDictNames.craftingMacerator, GT_ModHandler.getIC2Item("macerator", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingMacerator, new ItemStack(GregTech_API.sBlockMachines, 1, 50)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingMacerator, + new ItemStack(GregTech_API.sBlockMachines, 1, 50)); GT_OreDictUnificator.registerOre(OreDictNames.craftingExtractor, GT_ModHandler.getIC2Item("extractor", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingExtractor, new ItemStack(GregTech_API.sBlockMachines, 1, 51)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingExtractor, + new ItemStack(GregTech_API.sBlockMachines, 1, 51)); GT_OreDictUnificator.registerOre(OreDictNames.craftingCompressor, GT_ModHandler.getIC2Item("compressor", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingCompressor, new ItemStack(GregTech_API.sBlockMachines, 1, 52)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingCompressor, + new ItemStack(GregTech_API.sBlockMachines, 1, 52)); GT_OreDictUnificator.registerOre(OreDictNames.craftingRecycler, GT_ModHandler.getIC2Item("recycler", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingRecycler, new ItemStack(GregTech_API.sBlockMachines, 1, 53)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingRecycler, + new ItemStack(GregTech_API.sBlockMachines, 1, 53)); GT_OreDictUnificator.registerOre(OreDictNames.craftingIronFurnace, GT_ModHandler.getIC2Item("ironFurnace", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingCentrifuge, new ItemStack(GregTech_API.sBlockMachines, 1, 62)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingCentrifuge, + new ItemStack(GregTech_API.sBlockMachines, 1, 62)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingInductionFurnace, GT_ModHandler.getIC2Item("inductionFurnace", 1L)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingInductionFurnace, + GT_ModHandler.getIC2Item("inductionFurnace", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingElectricFurnace, GT_ModHandler.getIC2Item("electroFurnace", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingElectricFurnace, new ItemStack(GregTech_API.sBlockMachines, 1, 54)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingElectricFurnace, + GT_ModHandler.getIC2Item("electroFurnace", 1L)); + GT_OreDictUnificator.registerOre( + OreDictNames.craftingElectricFurnace, + new ItemStack(GregTech_API.sBlockMachines, 1, 54)); GT_OreDictUnificator.registerOre(OreDictNames.craftingGenerator, GT_ModHandler.getIC2Item("generator", 1L)); @@ -283,10 +323,14 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.written_book, 1, 32767)); GT_OreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.enchanted_book, 1, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.circuit, Materials.Basic, GT_ModHandler.getIC2Item("electronicCircuit", 1L)); - GT_OreDictUnificator - .registerOre(OrePrefixes.circuit, Materials.Advanced, GT_ModHandler.getIC2Item("advancedCircuit", 1L)); + GT_OreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.Basic, + GT_ModHandler.getIC2Item("electronicCircuit", 1L)); + GT_OreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.Advanced, + GT_ModHandler.getIC2Item("advancedCircuit", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java index 0d1c8f33a3..de1f6dec36 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java @@ -45,8 +45,11 @@ public class GT_PreLoad { if (GT_Mod.gregtechproxy.mSortToTheEnd) { try { GT_FML_LOGGER.info("GT_Mod: Sorting GregTech to the end of the Mod List for further processing."); - LoadController tLoadController = (LoadController) GT_Utility - .getFieldContent(Loader.instance(), "modController", true, true); + LoadController tLoadController = (LoadController) GT_Utility.getFieldContent( + Loader.instance(), + "modController", + true, + true); assert tLoadController != null; List<ModContainer> tModList = tLoadController.getActiveModList(); List<ModContainer> tNewModsList = new ArrayList<>(); @@ -54,7 +57,8 @@ public class GT_PreLoad { short tModList_sS = (short) tModList.size(); for (short i = 0; i < tModList_sS; i = (short) (i + 1)) { ModContainer tMod = tModList.get(i); - if (tMod.getModId().equalsIgnoreCase("gregtech")) { + if (tMod.getModId() + .equalsIgnoreCase("gregtech")) { tGregTech = tMod; } else { tNewModsList.add(tMod); @@ -64,7 +68,7 @@ public class GT_PreLoad { tNewModsList.add(tGregTech); } Objects.requireNonNull(GT_Utility.getField(tLoadController, "activeModList", true, true)) - .set(tLoadController, tNewModsList); + .set(tLoadController, tNewModsList); } catch (Throwable e) { GT_Mod.logStackTrace(e); } @@ -76,15 +80,19 @@ public class GT_PreLoad { GT_LanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang")); GT_LanguageManager.sEnglishFile.load(); if (GT_LanguageManager.sEnglishFile.get("EnableLangFile", "UseThisFileAsLanguageFile", false) - .getBoolean(false)) { + .getBoolean(false)) { GT_LanguageManager.sLanguage = GT_LanguageManager.sEnglishFile.get("EnableLangFile", "Language", "en_US") - .getString(); + .getString(); } - Materials.getMaterialsMap().values().parallelStream().filter(Objects::nonNull).forEach( - aMaterial -> aMaterial.mLocalizedName = GT_LanguageManager.addStringLocalization( - "Material." + aMaterial.mName.toLowerCase(), - aMaterial.mDefaultLocalName)); + Materials.getMaterialsMap() + .values() + .parallelStream() + .filter(Objects::nonNull) + .forEach( + aMaterial -> aMaterial.mLocalizedName = GT_LanguageManager.addStringLocalization( + "Material." + aMaterial.mName.toLowerCase(), + aMaterial.mDefaultLocalName)); } public static Configuration getConfiguration(File configDir) { @@ -139,7 +147,8 @@ public class GT_PreLoad { GT_Log.out = GT_Log.err = new PrintStream(GT_Log.mLogFile); } catch (FileNotFoundException ignored) {} - if (tMainConfig.get(GT_Mod.aTextGeneral, "LoggingOreDict", false).getBoolean(false)) { + if (tMainConfig.get(GT_Mod.aTextGeneral, "LoggingOreDict", false) + .getBoolean(false)) { GT_Log.mOreDictLogFile = new File(parentFile, "logs/OreDict.log"); if (!GT_Log.mOreDictLogFile.exists()) { try { @@ -160,7 +169,8 @@ public class GT_PreLoad { tList.forEach(GT_Log.ore::println); } catch (Throwable ignored) {} } - if (tMainConfig.get(GT_Mod.aTextGeneral, "LoggingExplosions", true).getBoolean(true)) { + if (tMainConfig.get(GT_Mod.aTextGeneral, "LoggingExplosions", true) + .getBoolean(true)) { GT_Log.mExplosionLog = new File(parentFile, "logs/Explosion.log"); if (!GT_Log.mExplosionLog.exists()) { try { @@ -172,7 +182,8 @@ public class GT_PreLoad { } catch (Throwable ignored) {} } - if (tMainConfig.get(GT_Mod.aTextGeneral, "LoggingPlayerActivity", true).getBoolean(true)) { + if (tMainConfig.get(GT_Mod.aTextGeneral, "LoggingPlayerActivity", true) + .getBoolean(true)) { GT_Log.mPlayerActivityLogFile = new File(parentFile, "logs/PlayerActivity.log"); if (!GT_Log.mPlayerActivityLogFile.exists()) { try { @@ -194,7 +205,8 @@ public class GT_PreLoad { if (globalDir.exists()) { final List<String> scripts = new ArrayList<>(); for (File file : Objects.requireNonNull(globalDir.listFiles())) { - if (file.getName().endsWith(".zs")) { + if (file.getName() + .endsWith(".zs")) { try (BufferedReader br = new BufferedReader(new FileReader(file))) { String line; while ((line = br.readLine()) != null) { @@ -274,10 +286,12 @@ public class GT_PreLoad { "gearGt", "crateGtDust", "crateGtIngot", "crateGtGem", "crateGtPlate", "nanite", "cellMolten" }; List<String> mMTTags = new ArrayList<>(); - oreTags.stream().filter(test -> StringUtils.startsWithAny(test, preS)).forEach(test -> { - mMTTags.add(test); - if (GT_Values.D1) GT_FML_LOGGER.info("oretag: " + test); - }); + oreTags.stream() + .filter(test -> StringUtils.startsWithAny(test, preS)) + .forEach(test -> { + mMTTags.add(test); + if (GT_Values.D1) GT_FML_LOGGER.info("oretag: " + test); + }); GT_FML_LOGGER.info("reenableMetaItems"); @@ -329,7 +343,7 @@ public class GT_PreLoad { GT_FML_LOGGER.info("GT_Mod: Removing all original Scrapbox Drops."); try { Objects.requireNonNull(GT_Utility.getField("ic2.core.item.ItemScrapbox$Drop", "topChance", true, true)) - .set(null, 0); + .set(null, 0); ((List<?>) Objects.requireNonNull( GT_Utility.getFieldContent( GT_Utility.getFieldContent("ic2.api.recipe.Recipes", "scrapboxDrops", true, true), @@ -346,263 +360,361 @@ public class GT_PreLoad { } public static void loadConfig(Configuration tMainConfig) { - GT_Values.D1 = tMainConfig.get(GT_Mod.aTextGeneral, "Debug", false).getBoolean(false); - GT_Values.D2 = tMainConfig.get(GT_Mod.aTextGeneral, "Debug2", false).getBoolean(false); + GT_Values.D1 = tMainConfig.get(GT_Mod.aTextGeneral, "Debug", false) + .getBoolean(false); + GT_Values.D2 = tMainConfig.get(GT_Mod.aTextGeneral, "Debug2", false) + .getBoolean(false); GT_Values.updateFluidDisplayItems = tMainConfig.get(GT_Mod.aTextGeneral, "update fluid display items", true) - .getBoolean(true); + .getBoolean(true); GT_Values.allow_broken_recipemap = tMainConfig.get(GT_Mod.aTextGeneral, "debug allow broken recipemap", false) - .getBoolean(false); - GT_Values.debugCleanroom = tMainConfig.get(GT_Mod.aTextGeneral, "debugCleanroom", false).getBoolean(false); - GT_Values.debugDriller = tMainConfig.get(GT_Mod.aTextGeneral, "debugDriller", false).getBoolean(false); - GT_Values.debugWorldGen = tMainConfig.get(GT_Mod.aTextGeneral, "debugWorldGen", false).getBoolean(false); - GT_Values.debugOrevein = tMainConfig.get(GT_Mod.aTextGeneral, "debugOrevein", false).getBoolean(false); - GT_Values.debugSmallOres = tMainConfig.get(GT_Mod.aTextGeneral, "debugSmallOres", false).getBoolean(false); - GT_Values.debugStones = tMainConfig.get(GT_Mod.aTextGeneral, "debugStones", false).getBoolean(false); - GT_Values.debugBlockMiner = tMainConfig.get(GT_Mod.aTextGeneral, "debugBlockMiner", false).getBoolean(false); - GT_Values.debugBlockPump = tMainConfig.get(GT_Mod.aTextGeneral, "debugBlockPump", false).getBoolean(false); + .getBoolean(false); + GT_Values.debugCleanroom = tMainConfig.get(GT_Mod.aTextGeneral, "debugCleanroom", false) + .getBoolean(false); + GT_Values.debugDriller = tMainConfig.get(GT_Mod.aTextGeneral, "debugDriller", false) + .getBoolean(false); + GT_Values.debugWorldGen = tMainConfig.get(GT_Mod.aTextGeneral, "debugWorldGen", false) + .getBoolean(false); + GT_Values.debugOrevein = tMainConfig.get(GT_Mod.aTextGeneral, "debugOrevein", false) + .getBoolean(false); + GT_Values.debugSmallOres = tMainConfig.get(GT_Mod.aTextGeneral, "debugSmallOres", false) + .getBoolean(false); + GT_Values.debugStones = tMainConfig.get(GT_Mod.aTextGeneral, "debugStones", false) + .getBoolean(false); + GT_Values.debugBlockMiner = tMainConfig.get(GT_Mod.aTextGeneral, "debugBlockMiner", false) + .getBoolean(false); + GT_Values.debugBlockPump = tMainConfig.get(GT_Mod.aTextGeneral, "debugBlockPump", false) + .getBoolean(false); GT_Values.debugEntityCramming = tMainConfig.get(GT_Mod.aTextGeneral, "debugEntityCramming", false) - .getBoolean(false); - GT_Values.debugWorldData = tMainConfig.get(GT_Mod.aTextGeneral, "debugWorldData", false).getBoolean(false); - GT_Values.oreveinPercentage = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinPercentage_100", 100).getInt(100); - GT_Values.oreveinAttempts = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinAttempts_64", 64).getInt(64); + .getBoolean(false); + GT_Values.debugWorldData = tMainConfig.get(GT_Mod.aTextGeneral, "debugWorldData", false) + .getBoolean(false); + GT_Values.oreveinPercentage = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinPercentage_100", 100) + .getInt(100); + GT_Values.oreveinAttempts = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinAttempts_64", 64) + .getInt(64); GT_Values.oreveinMaxPlacementAttempts = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinMaxPlacementAttempts_8", 8) - .getInt(8); - GT_Values.oreveinPlacerOres = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinPlacerOres", true).getBoolean(true); + .getInt(8); + GT_Values.oreveinPlacerOres = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinPlacerOres", true) + .getBoolean(true); GT_Values.oreveinPlacerOresMultiplier = tMainConfig.get(GT_Mod.aTextGeneral, "oreveinPlacerOresMultiplier", 2) - .getInt(2); + .getInt(2); // GT_Values.oreveinMaxSize = tMainConfig.get(aTextGeneral, "oreveinMaxSize_64",64).getInt(64); - GT_Values.ticksBetweenSounds = tMainConfig.get("machines", "TicksBetweenSounds", 30).getInt(30); + GT_Values.ticksBetweenSounds = tMainConfig.get("machines", "TicksBetweenSounds", 30) + .getInt(30); GT_Values.cleanroomGlass = (float) tMainConfig.get("machines", "ReinforcedGlassPercentageForCleanroom", 5D) - .getDouble(5D); - GT_Values.enableChunkloaders = tMainConfig.get("machines", "enableChunkloaders", true).getBoolean(true); + .getDouble(5D); + GT_Values.enableChunkloaders = tMainConfig.get("machines", "enableChunkloaders", true) + .getBoolean(true); GT_Values.alwaysReloadChunkloaders = tMainConfig.get("machines", "alwaysReloadChunkloaders", false) - .getBoolean(false); - GT_Values.debugChunkloaders = tMainConfig.get("machines", "debugChunkloaders", false).getBoolean(false); - GT_Values.disableDigitalChestsExternalAccess = tMainConfig - .get("machines", "disableDigitalChestsExternalAccess", false).getBoolean(false); - GregTech_API.TICKS_FOR_LAG_AVERAGING = tMainConfig - .get(GT_Mod.aTextGeneral, "TicksForLagAveragingWithScanner", 25).getInt(25); - GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = tMainConfig - .get(GT_Mod.aTextGeneral, "MillisecondsPassedInGTTileEntityUntilLagWarning", 100).getInt(100); - if (tMainConfig.get(GT_Mod.aTextGeneral, "disable_STDOUT", false).getBoolean(false)) { + .getBoolean(false); + GT_Values.debugChunkloaders = tMainConfig.get("machines", "debugChunkloaders", false) + .getBoolean(false); + GT_Values.disableDigitalChestsExternalAccess = tMainConfig.get( + "machines", + "disableDigitalChestsExternalAccess", + false) + .getBoolean(false); + GregTech_API.TICKS_FOR_LAG_AVERAGING = tMainConfig.get( + GT_Mod.aTextGeneral, + "TicksForLagAveragingWithScanner", + 25) + .getInt(25); + GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = tMainConfig.get( + GT_Mod.aTextGeneral, + "MillisecondsPassedInGTTileEntityUntilLagWarning", + 100) + .getInt(100); + if (tMainConfig.get(GT_Mod.aTextGeneral, "disable_STDOUT", false) + .getBoolean(false)) { GT_FML_LOGGER.info("Disableing Console Messages."); GT_FML_LOGGER.exit(); System.out.close(); System.err.close(); } GregTech_API.sMachineExplosions = tMainConfig.get("machines", "machines_explosion_damage", true) - .getBoolean(false); - GregTech_API.sMachineFlammable = tMainConfig.get("machines", "machines_flammable", true).getBoolean(false); + .getBoolean(false); + GregTech_API.sMachineFlammable = tMainConfig.get("machines", "machines_flammable", true) + .getBoolean(false); GregTech_API.sMachineNonWrenchExplosions = tMainConfig.get("machines", "explosions_on_nonwrenching", true) - .getBoolean(false); - GregTech_API.sMachineWireFire = tMainConfig.get("machines", "wirefire_on_explosion", true).getBoolean(false); + .getBoolean(false); + GregTech_API.sMachineWireFire = tMainConfig.get("machines", "wirefire_on_explosion", true) + .getBoolean(false); GregTech_API.sMachineFireExplosions = tMainConfig.get("machines", "fire_causes_explosions", true) - .getBoolean(false); + .getBoolean(false); GregTech_API.sMachineRainExplosions = tMainConfig.get("machines", "rain_causes_explosions", true) - .getBoolean(false); + .getBoolean(false); GregTech_API.sMachineThunderExplosions = tMainConfig.get("machines", "lightning_causes_explosions", true) - .getBoolean(false); - GregTech_API.sConstantEnergy = tMainConfig.get("machines", "constant_need_of_energy", true).getBoolean(false); - GregTech_API.sColoredGUI = tMainConfig.get("machines", "colored_guis_when_painted", true).getBoolean(false); + .getBoolean(false); + GregTech_API.sConstantEnergy = tMainConfig.get("machines", "constant_need_of_energy", true) + .getBoolean(false); + GregTech_API.sColoredGUI = tMainConfig.get("machines", "colored_guis_when_painted", true) + .getBoolean(false); GregTech_API.sMachineMetalGUI = tMainConfig.get("machines", "guis_in_consistent_machine_metal_color", false) - .getBoolean(false); + .getBoolean(false); // Implementation for this is actually handled in NewHorizonsCoreMod in MainRegistry.java! - GregTech_API.sUseMachineMetal = tMainConfig.get("machines", "use_machine_metal_tint", true).getBoolean(true); + GregTech_API.sUseMachineMetal = tMainConfig.get("machines", "use_machine_metal_tint", true) + .getBoolean(true); - GregTech_API.sTimber = tMainConfig.get(GT_Mod.aTextGeneral, "timber_axe", true).getBoolean(true); + GregTech_API.sTimber = tMainConfig.get(GT_Mod.aTextGeneral, "timber_axe", true) + .getBoolean(true); GregTech_API.sDrinksAlwaysDrinkable = tMainConfig.get(GT_Mod.aTextGeneral, "drinks_always_drinkable", false) - .getBoolean(false); - GregTech_API.sDoShowAllItemsInCreative = tMainConfig - .get(GT_Mod.aTextGeneral, "show_all_metaitems_in_creative_and_NEI", false).getBoolean(false); + .getBoolean(false); + GregTech_API.sDoShowAllItemsInCreative = tMainConfig.get( + GT_Mod.aTextGeneral, + "show_all_metaitems_in_creative_and_NEI", + false) + .getBoolean(false); GregTech_API.sMultiThreadedSounds = tMainConfig.get(GT_Mod.aTextGeneral, "sound_multi_threading", false) - .getBoolean(false); + .getBoolean(false); loadClientConfig(); - GT_Mod.gregtechproxy.mMaxEqualEntitiesAtOneSpot = tMainConfig - .get(GT_Mod.aTextGeneral, "MaxEqualEntitiesAtOneSpot", 3).getInt(3); - GT_Mod.gregtechproxy.mSkeletonsShootGTArrows = tMainConfig - .get(GT_Mod.aTextGeneral, "SkeletonsShootGTArrows", 16).getInt(16); - GT_Mod.gregtechproxy.mFlintChance = tMainConfig.get(GT_Mod.aTextGeneral, "FlintAndSteelChance", 30).getInt(30); + GT_Mod.gregtechproxy.mMaxEqualEntitiesAtOneSpot = tMainConfig.get( + GT_Mod.aTextGeneral, + "MaxEqualEntitiesAtOneSpot", + 3) + .getInt(3); + GT_Mod.gregtechproxy.mSkeletonsShootGTArrows = tMainConfig.get( + GT_Mod.aTextGeneral, + "SkeletonsShootGTArrows", + 16) + .getInt(16); + GT_Mod.gregtechproxy.mFlintChance = tMainConfig.get(GT_Mod.aTextGeneral, "FlintAndSteelChance", 30) + .getInt(30); GT_Mod.gregtechproxy.mItemDespawnTime = tMainConfig.get(GT_Mod.aTextGeneral, "ItemDespawnTime", 6000) - .getInt(6000); - GT_Mod.gregtechproxy.mAllowSmallBoilerAutomation = tMainConfig - .get(GT_Mod.aTextGeneral, "AllowSmallBoilerAutomation", false).getBoolean(false); + .getInt(6000); + GT_Mod.gregtechproxy.mAllowSmallBoilerAutomation = tMainConfig.get( + GT_Mod.aTextGeneral, + "AllowSmallBoilerAutomation", + false) + .getBoolean(false); GT_Mod.gregtechproxy.mHardMachineCasings = tMainConfig.get(GT_Mod.aTextGeneral, "HardMachineCasings", true) - .getBoolean(true); + .getBoolean(true); GT_Mod.gregtechproxy.mDisableVanillaOres = tMainConfig.get(GT_Mod.aTextGeneral, "DisableVanillaOres", true) - .getBoolean(true); + .getBoolean(true); GT_Mod.gregtechproxy.mNerfDustCrafting = tMainConfig.get(GT_Mod.aTextGeneral, "NerfDustCrafting", true) - .getBoolean(true); + .getBoolean(true); GT_Mod.gregtechproxy.mIncreaseDungeonLoot = tMainConfig.get(GT_Mod.aTextGeneral, "IncreaseDungeonLoot", true) - .getBoolean(true); + .getBoolean(true); GT_Mod.gregtechproxy.mAxeWhenAdventure = tMainConfig.get(GT_Mod.aTextGeneral, "AdventureModeStartingAxe", true) - .getBoolean(true); + .getBoolean(true); GT_Mod.gregtechproxy.mHardcoreCables = tMainConfig.get(GT_Mod.aTextGeneral, "HardCoreCableLoss", false) - .getBoolean(false); + .getBoolean(false); GT_Mod.gregtechproxy.mSurvivalIntoAdventure = tMainConfig.get(GT_Mod.aTextGeneral, "forceAdventureMode", false) - .getBoolean(false); + .getBoolean(false); GT_Mod.gregtechproxy.mHungerEffect = tMainConfig.get(GT_Mod.aTextGeneral, "AFK_Hunger", false) - .getBoolean(false); - GT_Mod.gregtechproxy.mHardRock = tMainConfig.get(GT_Mod.aTextGeneral, "harderstone", false).getBoolean(false); + .getBoolean(false); + GT_Mod.gregtechproxy.mHardRock = tMainConfig.get(GT_Mod.aTextGeneral, "harderstone", false) + .getBoolean(false); GT_Mod.gregtechproxy.mInventoryUnification = tMainConfig.get(GT_Mod.aTextGeneral, "InventoryUnification", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mGTBees = tMainConfig.get(GT_Mod.aTextGeneral, "GTBees", true).getBoolean(true); + .getBoolean(true); + GT_Mod.gregtechproxy.mGTBees = tMainConfig.get(GT_Mod.aTextGeneral, "GTBees", true) + .getBoolean(true); GT_Mod.gregtechproxy.mCraftingUnification = tMainConfig.get(GT_Mod.aTextGeneral, "CraftingUnification", true) - .getBoolean(true); + .getBoolean(true); GT_Mod.gregtechproxy.mNerfedWoodPlank = tMainConfig.get(GT_Mod.aTextGeneral, "WoodNeedsSawForCrafting", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mNerfedVanillaTools = tMainConfig - .get(GT_Mod.aTextGeneral, "smallerVanillaToolDurability", true).getBoolean(true); + .getBoolean(true); + GT_Mod.gregtechproxy.mNerfedVanillaTools = tMainConfig.get( + GT_Mod.aTextGeneral, + "smallerVanillaToolDurability", + true) + .getBoolean(true); GT_Mod.gregtechproxy.mSortToTheEnd = tMainConfig.get(GT_Mod.aTextGeneral, "EnsureToBeLoadedLast", true) - .getBoolean(true); + .getBoolean(true); GT_Mod.gregtechproxy.mDisableIC2Cables = tMainConfig.get(GT_Mod.aTextGeneral, "DisableIC2Cables", true) - .getBoolean(true); + .getBoolean(true); GT_Mod.gregtechproxy.mAchievements = tMainConfig.get(GT_Mod.aTextGeneral, "EnableAchievements", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mAE2Integration = GregTech_API.sSpecialFile - .get(ConfigCategories.general, "EnableAE2Integration", GregTech_API.mAE2); - GT_Mod.gregtechproxy.mNerfedCombs = tMainConfig.get(GT_Mod.aTextGeneral, "NerfCombs", true).getBoolean(true); - GT_Mod.gregtechproxy.mNerfedCrops = tMainConfig.get(GT_Mod.aTextGeneral, "NerfCrops", true).getBoolean(true); + .getBoolean(true); + GT_Mod.gregtechproxy.mAE2Integration = GregTech_API.sSpecialFile.get( + ConfigCategories.general, + "EnableAE2Integration", + GregTech_API.mAE2); + GT_Mod.gregtechproxy.mNerfedCombs = tMainConfig.get(GT_Mod.aTextGeneral, "NerfCombs", true) + .getBoolean(true); + GT_Mod.gregtechproxy.mNerfedCrops = tMainConfig.get(GT_Mod.aTextGeneral, "NerfCrops", true) + .getBoolean(true); GT_Mod.gregtechproxy.mHideUnusedOres = tMainConfig.get(GT_Mod.aTextGeneral, "HideUnusedOres", true) - .getBoolean(true); + .getBoolean(true); GT_Mod.gregtechproxy.mHideRecyclingRecipes = tMainConfig.get(GT_Mod.aTextGeneral, "HideRecyclingRecipes", true) - .getBoolean(true); - GT_Mod.gregtechproxy.mArcSmeltIntoAnnealed = tMainConfig - .get(GT_Mod.aTextGeneral, "ArcSmeltIntoAnnealedWrought", true).getBoolean(true); + .getBoolean(true); + GT_Mod.gregtechproxy.mArcSmeltIntoAnnealed = tMainConfig.get( + GT_Mod.aTextGeneral, + "ArcSmeltIntoAnnealedWrought", + true) + .getBoolean(true); GT_Mod.gregtechproxy.mEnableAllMaterials = tMainConfig.get("general", "EnableAllMaterials", false) - .getBoolean(false); + .getBoolean(false); GT_Mod.gregtechproxy.mEnableAllComponents = tMainConfig.get("general", "EnableAllComponents", false) - .getBoolean(false); + .getBoolean(false); // Pollution: edit GT_Proxy.java to change default values - GT_Mod.gregtechproxy.mPollution = tMainConfig - .get("Pollution", "EnablePollution", GT_Mod.gregtechproxy.mPollution) - .getBoolean(GT_Mod.gregtechproxy.mPollution); - GT_Mod.gregtechproxy.mPollutionSmogLimit = tMainConfig - .get("Pollution", "SmogLimit", GT_Mod.gregtechproxy.mPollutionSmogLimit) - .getInt(GT_Mod.gregtechproxy.mPollutionSmogLimit); - GT_Mod.gregtechproxy.mPollutionPoisonLimit = tMainConfig - .get("Pollution", "PoisonLimit", GT_Mod.gregtechproxy.mPollutionPoisonLimit) - .getInt(GT_Mod.gregtechproxy.mPollutionPoisonLimit); - GT_Mod.gregtechproxy.mPollutionVegetationLimit = tMainConfig - .get("Pollution", "VegetationLimit", GT_Mod.gregtechproxy.mPollutionVegetationLimit) - .getInt(GT_Mod.gregtechproxy.mPollutionVegetationLimit); - GT_Mod.gregtechproxy.mPollutionSourRainLimit = tMainConfig - .get("Pollution", "SourRainLimit", GT_Mod.gregtechproxy.mPollutionSourRainLimit) - .getInt(GT_Mod.gregtechproxy.mPollutionSourRainLimit); - GT_Mod.gregtechproxy.mPollutionOnExplosion = tMainConfig - .get("Pollution", "SourRainLimit", GT_Mod.gregtechproxy.mPollutionOnExplosion) - .getInt(GT_Mod.gregtechproxy.mPollutionOnExplosion); - GT_Mod.gregtechproxy.mExplosionItemDrop = tMainConfig - .get("general", "ExplosionItemDrops", GT_Mod.gregtechproxy.mExplosionItemDrop) - .getBoolean(GT_Mod.gregtechproxy.mExplosionItemDrop); - GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond = tMainConfig - .get( - "Pollution", - "PollutionPrimitiveBlastFurnace", - GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond); - GT_Mod.gregtechproxy.mPollutionCharcoalPitPerSecond = tMainConfig - .get("Pollution", "PollutionCharcoalPit", GT_Mod.gregtechproxy.mPollutionCharcoalPitPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionCharcoalPitPerSecond); - GT_Mod.gregtechproxy.mPollutionEBFPerSecond = tMainConfig - .get("Pollution", "PollutionEBF", GT_Mod.gregtechproxy.mPollutionEBFPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionEBFPerSecond); - GT_Mod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond = tMainConfig - .get( - "Pollution", - "PollutionLargeCombustionEngine", - GT_Mod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond); - GT_Mod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond = tMainConfig - .get( - "Pollution", - "PollutionExtremeCombustionEngine", - GT_Mod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond); - GT_Mod.gregtechproxy.mPollutionImplosionCompressorPerSecond = tMainConfig - .get( - "Pollution", - "PollutionImplosionCompressor", - GT_Mod.gregtechproxy.mPollutionImplosionCompressorPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionImplosionCompressorPerSecond); - GT_Mod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond = tMainConfig - .get( - "Pollution", - "PollutionLargeBronzeBoiler", - GT_Mod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond); - GT_Mod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond = tMainConfig - .get("Pollution", "PollutionLargeSteelBoiler", GT_Mod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond); - GT_Mod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond = tMainConfig - .get( - "Pollution", - "PollutionLargeTitaniumBoiler", - GT_Mod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond); - GT_Mod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond = tMainConfig - .get( - "Pollution", - "PollutionLargeTungstenSteelBoiler", - GT_Mod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond); - GT_Mod.gregtechproxy.mPollutionReleasedByThrottle = tMainConfig - .get("Pollution", "PollutionReleasedByThrottle", GT_Mod.gregtechproxy.mPollutionReleasedByThrottle) - .getDouble(GT_Mod.gregtechproxy.mPollutionReleasedByThrottle); - GT_Mod.gregtechproxy.mPollutionLargeGasTurbinePerSecond = tMainConfig - .get("Pollution", "PollutionLargeGasTurbine", GT_Mod.gregtechproxy.mPollutionLargeGasTurbinePerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionLargeGasTurbinePerSecond); - GT_Mod.gregtechproxy.mPollutionMultiSmelterPerSecond = tMainConfig - .get("Pollution", "PollutionMultiSmelter", GT_Mod.gregtechproxy.mPollutionMultiSmelterPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionMultiSmelterPerSecond); - GT_Mod.gregtechproxy.mPollutionPyrolyseOvenPerSecond = tMainConfig - .get("Pollution", "PollutionPyrolyseOven", GT_Mod.gregtechproxy.mPollutionPyrolyseOvenPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionPyrolyseOvenPerSecond); - GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond = tMainConfig - .get("Pollution", "PollutionSmallCoalBoiler", GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond); - GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond = tMainConfig - .get( - "Pollution", - "PollutionHighPressureLavaBoiler", - GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond); - GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond = tMainConfig - .get( - "Pollution", - "PollutionHighPressureCoalBoiler", - GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond); - GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond = tMainConfig - .get( - "Pollution", - "PollutionBaseDieselGenerator", - GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond); + GT_Mod.gregtechproxy.mPollution = tMainConfig.get( + "Pollution", + "EnablePollution", + GT_Mod.gregtechproxy.mPollution) + .getBoolean(GT_Mod.gregtechproxy.mPollution); + GT_Mod.gregtechproxy.mPollutionSmogLimit = tMainConfig.get( + "Pollution", + "SmogLimit", + GT_Mod.gregtechproxy.mPollutionSmogLimit) + .getInt(GT_Mod.gregtechproxy.mPollutionSmogLimit); + GT_Mod.gregtechproxy.mPollutionPoisonLimit = tMainConfig.get( + "Pollution", + "PoisonLimit", + GT_Mod.gregtechproxy.mPollutionPoisonLimit) + .getInt(GT_Mod.gregtechproxy.mPollutionPoisonLimit); + GT_Mod.gregtechproxy.mPollutionVegetationLimit = tMainConfig.get( + "Pollution", + "VegetationLimit", + GT_Mod.gregtechproxy.mPollutionVegetationLimit) + .getInt( + GT_Mod.gregtechproxy.mPollutionVegetationLimit); + GT_Mod.gregtechproxy.mPollutionSourRainLimit = tMainConfig.get( + "Pollution", + "SourRainLimit", + GT_Mod.gregtechproxy.mPollutionSourRainLimit) + .getInt(GT_Mod.gregtechproxy.mPollutionSourRainLimit); + GT_Mod.gregtechproxy.mPollutionOnExplosion = tMainConfig.get( + "Pollution", + "SourRainLimit", + GT_Mod.gregtechproxy.mPollutionOnExplosion) + .getInt(GT_Mod.gregtechproxy.mPollutionOnExplosion); + GT_Mod.gregtechproxy.mExplosionItemDrop = tMainConfig.get( + "general", + "ExplosionItemDrops", + GT_Mod.gregtechproxy.mExplosionItemDrop) + .getBoolean(GT_Mod.gregtechproxy.mExplosionItemDrop); + GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond = tMainConfig.get( + "Pollution", + "PollutionPrimitiveBlastFurnace", + GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond); + GT_Mod.gregtechproxy.mPollutionCharcoalPitPerSecond = tMainConfig.get( + "Pollution", + "PollutionCharcoalPit", + GT_Mod.gregtechproxy.mPollutionCharcoalPitPerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionCharcoalPitPerSecond); + GT_Mod.gregtechproxy.mPollutionEBFPerSecond = tMainConfig.get( + "Pollution", + "PollutionEBF", + GT_Mod.gregtechproxy.mPollutionEBFPerSecond) + .getInt(GT_Mod.gregtechproxy.mPollutionEBFPerSecond); + GT_Mod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond = tMainConfig.get( + "Pollution", + "PollutionLargeCombustionEngine", + GT_Mod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond); + GT_Mod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond = tMainConfig.get( + "Pollution", + "PollutionExtremeCombustionEngine", + GT_Mod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond); + GT_Mod.gregtechproxy.mPollutionImplosionCompressorPerSecond = tMainConfig.get( + "Pollution", + "PollutionImplosionCompressor", + GT_Mod.gregtechproxy.mPollutionImplosionCompressorPerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionImplosionCompressorPerSecond); + GT_Mod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond = tMainConfig.get( + "Pollution", + "PollutionLargeBronzeBoiler", + GT_Mod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond); + GT_Mod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond = tMainConfig.get( + "Pollution", + "PollutionLargeSteelBoiler", + GT_Mod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond); + GT_Mod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond = tMainConfig.get( + "Pollution", + "PollutionLargeTitaniumBoiler", + GT_Mod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond); + GT_Mod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond = tMainConfig.get( + "Pollution", + "PollutionLargeTungstenSteelBoiler", + GT_Mod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond); + GT_Mod.gregtechproxy.mPollutionReleasedByThrottle = tMainConfig.get( + "Pollution", + "PollutionReleasedByThrottle", + GT_Mod.gregtechproxy.mPollutionReleasedByThrottle) + .getDouble( + GT_Mod.gregtechproxy.mPollutionReleasedByThrottle); + GT_Mod.gregtechproxy.mPollutionLargeGasTurbinePerSecond = tMainConfig.get( + "Pollution", + "PollutionLargeGasTurbine", + GT_Mod.gregtechproxy.mPollutionLargeGasTurbinePerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionLargeGasTurbinePerSecond); + GT_Mod.gregtechproxy.mPollutionMultiSmelterPerSecond = tMainConfig.get( + "Pollution", + "PollutionMultiSmelter", + GT_Mod.gregtechproxy.mPollutionMultiSmelterPerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionMultiSmelterPerSecond); + GT_Mod.gregtechproxy.mPollutionPyrolyseOvenPerSecond = tMainConfig.get( + "Pollution", + "PollutionPyrolyseOven", + GT_Mod.gregtechproxy.mPollutionPyrolyseOvenPerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionPyrolyseOvenPerSecond); + GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond = tMainConfig.get( + "Pollution", + "PollutionSmallCoalBoiler", + GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond); + GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond = tMainConfig.get( + "Pollution", + "PollutionHighPressureLavaBoiler", + GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond); + GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond = tMainConfig.get( + "Pollution", + "PollutionHighPressureCoalBoiler", + GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond); + GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond = tMainConfig.get( + "Pollution", + "PollutionBaseDieselGenerator", + GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond); double[] mPollutionDieselGeneratorReleasedByTier = tMainConfig.get( "Pollution", "PollutionReleasedByTierDieselGenerator", - GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier).getDoubleList(); + GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier) + .getDoubleList(); if (mPollutionDieselGeneratorReleasedByTier.length == GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier.length) { GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier = mPollutionDieselGeneratorReleasedByTier; } else { - GT_FML_LOGGER - .error("The Length of the Diesel Turbine Pollution Array Config must be the same as the Default"); + GT_FML_LOGGER.error( + "The Length of the Diesel Turbine Pollution Array Config must be the same as the Default"); } - GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond = tMainConfig - .get( - "Pollution", - "PollutionBaseGasTurbineGenerator", - GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond) - .getInt(GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond); + GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond = tMainConfig.get( + "Pollution", + "PollutionBaseGasTurbineGenerator", + GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond) + .getInt( + GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond); double[] mPollutionGasTurbineReleasedByTier = tMainConfig.get( "Pollution", "PollutionReleasedByTierGasTurbineGenerator", - GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier).getDoubleList(); + GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier) + .getDoubleList(); if (mPollutionGasTurbineReleasedByTier.length == GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier.length) { GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier = mPollutionGasTurbineReleasedByTier; @@ -611,99 +723,161 @@ public class GT_PreLoad { } GT_Mod.gregtechproxy.mUndergroundOil.getConfig(tMainConfig, "undergroundfluid"); - GT_Mod.gregtechproxy.mEnableCleanroom = tMainConfig.get("general", "EnableCleanroom", true).getBoolean(true); + GT_Mod.gregtechproxy.mEnableCleanroom = tMainConfig.get("general", "EnableCleanroom", true) + .getBoolean(true); if (GT_Mod.gregtechproxy.mEnableCleanroom) GT_MetaTileEntity_Cleanroom.loadConfig(tMainConfig); GT_Mod.gregtechproxy.mLowGravProcessing = GalacticraftCore.isModLoaded() - && tMainConfig.get("general", "LowGravProcessing", true).getBoolean(true); - GT_Mod.gregtechproxy.mUseGreatlyShrukenReplacementList = tMainConfig - .get("general", "GTNH Optimised Material Loading", true).getBoolean(true); + && tMainConfig.get("general", "LowGravProcessing", true) + .getBoolean(true); + GT_Mod.gregtechproxy.mUseGreatlyShrukenReplacementList = tMainConfig.get( + "general", + "GTNH Optimised Material Loading", + true) + .getBoolean(true); Calendar now = Calendar.getInstance(); GT_Mod.gregtechproxy.mAprilFool = GregTech_API.sSpecialFile.get( ConfigCategories.general, "AprilFool", now.get(Calendar.MONTH) == Calendar.APRIL && now.get(Calendar.DAY_OF_MONTH) == 1); - GT_Mod.gregtechproxy.mCropNeedBlock = tMainConfig.get("general", "CropNeedBlockBelow", true).getBoolean(true); + GT_Mod.gregtechproxy.mCropNeedBlock = tMainConfig.get("general", "CropNeedBlockBelow", true) + .getBoolean(true); GT_Mod.gregtechproxy.mDisableOldChemicalRecipes = tMainConfig.get("general", "DisableOldChemicalRecipes", false) - .getBoolean(false); + .getBoolean(false); GT_Mod.gregtechproxy.mAMHInteraction = tMainConfig.get("general", "AllowAutoMaintenanceHatchInteraction", false) - .getBoolean(false); + .getBoolean(false); GregTech_API.mOutputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "OutputRF", true); GregTech_API.mInputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "InputRF", false); GregTech_API.mEUtoRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "100EUtoRF", 360); GregTech_API.mRFtoEU = GregTech_API.sOPStuff.get(ConfigCategories.general, "100RFtoEU", 20); GregTech_API.mRFExplosions = GregTech_API.sOPStuff.get(ConfigCategories.general, "RFExplosions", false); GregTech_API.meIOLoaded = EnderIO.isModLoaded(); - GT_Mod.gregtechproxy.mForceFreeFace = GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "forceFreeFace", true); + GT_Mod.gregtechproxy.mForceFreeFace = GregTech_API.sMachineFile.get( + ConfigCategories.machineconfig, + "forceFreeFace", + true); GT_Mod.gregtechproxy.mBrickedBlastFurnace = tMainConfig.get("general", "BrickedBlastFurnace", true) - .getBoolean(true); + .getBoolean(true); GT_Mod.gregtechproxy.mEasierIVPlusCables = tMainConfig.get("general", "EasierEVPlusCables", false) - .getBoolean(false); - GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre = tMainConfig - .get("general", "MixedOreOnlyYieldsTwoThirdsOfPureOre", false).getBoolean(false); - GT_Mod.gregtechproxy.enableBlackGraniteOres = GregTech_API.sWorldgenFile - .get("general", "enableBlackGraniteOres", GT_Mod.gregtechproxy.enableBlackGraniteOres); - GT_Mod.gregtechproxy.enableRedGraniteOres = GregTech_API.sWorldgenFile - .get("general", "enableRedGraniteOres", GT_Mod.gregtechproxy.enableRedGraniteOres); - GT_Mod.gregtechproxy.enableMarbleOres = GregTech_API.sWorldgenFile - .get("general", "enableMarbleOres", GT_Mod.gregtechproxy.enableMarbleOres); - GT_Mod.gregtechproxy.enableBasaltOres = GregTech_API.sWorldgenFile - .get("general", "enableBasaltOres", GT_Mod.gregtechproxy.enableBasaltOres); - GT_Mod.gregtechproxy.gt6Pipe = tMainConfig.get("general", "GT6StyledPipesConnection", true).getBoolean(true); - GT_Mod.gregtechproxy.gt6Cable = tMainConfig.get("general", "GT6StyledWiresConnection", true).getBoolean(true); + .getBoolean(false); + GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre = tMainConfig.get( + "general", + "MixedOreOnlyYieldsTwoThirdsOfPureOre", + false) + .getBoolean(false); + GT_Mod.gregtechproxy.enableBlackGraniteOres = GregTech_API.sWorldgenFile.get( + "general", + "enableBlackGraniteOres", + GT_Mod.gregtechproxy.enableBlackGraniteOres); + GT_Mod.gregtechproxy.enableRedGraniteOres = GregTech_API.sWorldgenFile.get( + "general", + "enableRedGraniteOres", + GT_Mod.gregtechproxy.enableRedGraniteOres); + GT_Mod.gregtechproxy.enableMarbleOres = GregTech_API.sWorldgenFile.get( + "general", + "enableMarbleOres", + GT_Mod.gregtechproxy.enableMarbleOres); + GT_Mod.gregtechproxy.enableBasaltOres = GregTech_API.sWorldgenFile.get( + "general", + "enableBasaltOres", + GT_Mod.gregtechproxy.enableBasaltOres); + GT_Mod.gregtechproxy.gt6Pipe = tMainConfig.get("general", "GT6StyledPipesConnection", true) + .getBoolean(true); + GT_Mod.gregtechproxy.gt6Cable = tMainConfig.get("general", "GT6StyledWiresConnection", true) + .getBoolean(true); GT_Mod.gregtechproxy.ic2EnergySourceCompat = tMainConfig.get("general", "Ic2EnergySourceCompat", true) - .getBoolean(true); - GT_Mod.gregtechproxy.costlyCableConnection = tMainConfig - .get("general", "CableConnectionRequiresSolderingMaterial", false).getBoolean(false); - GT_LanguageManager.i18nPlaceholder = tMainConfig - .get("general", "EnablePlaceholderForMaterialNamesInLangFile", true).getBoolean(true); - GT_MetaTileEntity_LongDistancePipelineBase.minimalDistancePoints = tMainConfig - .get("general", "LongDistancePipelineMinimalDistancePoints", 64).getInt(64); + .getBoolean(true); + GT_Mod.gregtechproxy.costlyCableConnection = tMainConfig.get( + "general", + "CableConnectionRequiresSolderingMaterial", + false) + .getBoolean(false); + GT_LanguageManager.i18nPlaceholder = tMainConfig.get( + "general", + "EnablePlaceholderForMaterialNamesInLangFile", + true) + .getBoolean(true); + GT_MetaTileEntity_LongDistancePipelineBase.minimalDistancePoints = tMainConfig.get( + "general", + "LongDistancePipelineMinimalDistancePoints", + 64) + .getInt(64); GregTech_API.mUseOnlyGoodSolderingMaterials = GregTech_API.sRecipeFile.get( ConfigCategories.Recipes.harderrecipes, "useonlygoodsolderingmaterials", GregTech_API.mUseOnlyGoodSolderingMaterials); - GT_Mod.gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties - .get("havestLevel", "activateHarvestLevelChange", false); // TODO CHECK + GT_Mod.gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties.get( + "havestLevel", + "activateHarvestLevelChange", + false); // TODO CHECK if (GT_Mod.gregtechproxy.mChangeHarvestLevels) { - GT_Mod.gregtechproxy.mGraniteHavestLevel = GregTech_API.sMaterialProperties - .get("havestLevel", "graniteHarvestLevel", 3); - GT_Mod.gregtechproxy.mMaxHarvestLevel = Math - .min(15, GregTech_API.sMaterialProperties.get("havestLevel", "maxLevel", 7)); - Materials.getMaterialsMap().values().parallelStream() - .filter( - tMaterial -> tMaterial != null && tMaterial.mToolQuality > 0 - && tMaterial.mMetaItemSubID < GT_Mod.gregtechproxy.mHarvestLevel.length - && tMaterial.mMetaItemSubID >= 0) - .forEach( - tMaterial -> GT_Mod.gregtechproxy.mHarvestLevel[tMaterial.mMetaItemSubID] = GregTech_API.sMaterialProperties - .get("materialHavestLevel", tMaterial.mDefaultLocalName, tMaterial.mToolQuality)); + GT_Mod.gregtechproxy.mGraniteHavestLevel = GregTech_API.sMaterialProperties.get( + "havestLevel", + "graniteHarvestLevel", + 3); + GT_Mod.gregtechproxy.mMaxHarvestLevel = Math.min( + 15, + GregTech_API.sMaterialProperties.get("havestLevel", "maxLevel", 7)); + Materials.getMaterialsMap() + .values() + .parallelStream() + .filter( + tMaterial -> tMaterial != null && tMaterial.mToolQuality > 0 + && tMaterial.mMetaItemSubID < GT_Mod.gregtechproxy.mHarvestLevel.length + && tMaterial.mMetaItemSubID >= 0) + .forEach( + tMaterial -> GT_Mod.gregtechproxy.mHarvestLevel[tMaterial.mMetaItemSubID] = GregTech_API.sMaterialProperties.get( + "materialHavestLevel", + tMaterial.mDefaultLocalName, + tMaterial.mToolQuality)); } - if (tMainConfig.get("general", "hardermobspawners", true).getBoolean(true)) { - Blocks.mob_spawner.setHardness(500.0F).setResistance(6000000.0F); + if (tMainConfig.get("general", "hardermobspawners", true) + .getBoolean(true)) { + Blocks.mob_spawner.setHardness(500.0F) + .setResistance(6000000.0F); } - GT_Mod.gregtechproxy.mOnline = tMainConfig.get(GT_Mod.aTextGeneral, "online", true).getBoolean(false); - - GT_Mod.gregtechproxy.mUpgradeCount = Math - .min(64, Math.max(1, tMainConfig.get("features", "UpgradeStacksize", 4).getInt())); + GT_Mod.gregtechproxy.mOnline = tMainConfig.get(GT_Mod.aTextGeneral, "online", true) + .getBoolean(false); + + GT_Mod.gregtechproxy.mUpgradeCount = Math.min( + 64, + Math.max( + 1, + tMainConfig.get("features", "UpgradeStacksize", 4) + .getInt())); for (OrePrefixes tPrefix : OrePrefixes.values()) { if (tPrefix.mIsUsedForOreProcessing) { - tPrefix.mDefaultStackSize = ((byte) Math - .min(64, Math.max(1, tMainConfig.get("features", "MaxOreStackSize", 64).getInt()))); + tPrefix.mDefaultStackSize = ((byte) Math.min( + 64, + Math.max( + 1, + tMainConfig.get("features", "MaxOreStackSize", 64) + .getInt()))); } else if (tPrefix == OrePrefixes.plank) { - tPrefix.mDefaultStackSize = ((byte) Math - .min(64, Math.max(16, tMainConfig.get("features", "MaxPlankStackSize", 64).getInt()))); + tPrefix.mDefaultStackSize = ((byte) Math.min( + 64, + Math.max( + 16, + tMainConfig.get("features", "MaxPlankStackSize", 64) + .getInt()))); } else if ((tPrefix == OrePrefixes.wood) || (tPrefix == OrePrefixes.treeLeaves) || (tPrefix == OrePrefixes.treeSapling) || (tPrefix == OrePrefixes.log)) { - tPrefix.mDefaultStackSize = ((byte) Math - .min(64, Math.max(16, tMainConfig.get("features", "MaxLogStackSize", 64).getInt()))); + tPrefix.mDefaultStackSize = ((byte) Math.min( + 64, + Math.max( + 16, + tMainConfig.get("features", "MaxLogStackSize", 64) + .getInt()))); } else if (tPrefix.mIsUsedForBlocks) { - tPrefix.mDefaultStackSize = ((byte) Math - .min(64, Math.max(16, tMainConfig.get("features", "MaxOtherBlockStackSize", 64).getInt()))); + tPrefix.mDefaultStackSize = ((byte) Math.min( + 64, + Math.max( + 16, + tMainConfig.get("features", "MaxOtherBlockStackSize", 64) + .getInt()))); } } @@ -714,54 +888,78 @@ public class GT_PreLoad { "ctm_block_whitelist", new String[] { "team.chisel.block.BlockCarvable", "team.chisel.block.BlockCarvableGlass" }) - .getStringList())); + .getStringList())); GT_Values.mCTMDisabledBlock.addAll( Arrays.asList( tMainConfig.get( "general", "ctm_block_blacklist", - new String[] { "team.chisel.block.BlockRoadLine" }).getStringList())); + new String[] { "team.chisel.block.BlockRoadLine" }) + .getStringList())); } public static void loadClientConfig() { final String sBDye0 = "ColorModulation."; - Arrays.stream(Dyes.values()).filter(tDye -> (tDye != Dyes._NULL) && (tDye.mIndex < 0)).forEach(tDye -> { - String sBDye1 = sBDye0 + tDye; - tDye.mRGBa[0] = ((short) Math - .min(255, Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "R", tDye.mOriginalRGBa[0])))); - tDye.mRGBa[1] = ((short) Math - .min(255, Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "G", tDye.mOriginalRGBa[1])))); - tDye.mRGBa[2] = ((short) Math - .min(255, Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "B", tDye.mOriginalRGBa[2])))); - }); - GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion = GregTech_API.sClientDataFile - .get("render", "TileAmbientOcclusion", true); + Arrays.stream(Dyes.values()) + .filter(tDye -> (tDye != Dyes._NULL) && (tDye.mIndex < 0)) + .forEach(tDye -> { + String sBDye1 = sBDye0 + tDye; + tDye.mRGBa[0] = ((short) Math.min( + 255, + Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "R", tDye.mOriginalRGBa[0])))); + tDye.mRGBa[1] = ((short) Math.min( + 255, + Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "G", tDye.mOriginalRGBa[1])))); + tDye.mRGBa[2] = ((short) Math.min( + 255, + Math.max(0, GregTech_API.sClientDataFile.get(sBDye1, "B", tDye.mOriginalRGBa[2])))); + }); + GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion = GregTech_API.sClientDataFile.get( + "render", + "TileAmbientOcclusion", + true); GT_Mod.gregtechproxy.mRenderGlowTextures = GregTech_API.sClientDataFile.get("render", "GlowTextures", true); - GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped = GregTech_API.sClientDataFile - .get("render", "RenderFlippedMachinesFlipped", true); - GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch = GregTech_API.sClientDataFile - .get("render", "RenderIndicatorsOnHatch", true); - GT_Mod.gregtechproxy.mRenderDirtParticles = GregTech_API.sClientDataFile - .get("render", "RenderDirtParticles", true); - GT_Mod.gregtechproxy.mRenderPollutionFog = GregTech_API.sClientDataFile - .get("render", "RenderPollutionFog", true); - - GT_Mod.gregtechproxy.mCoverTabsVisible = GregTech_API.sClientDataFile - .get("interface", "DisplayCoverTabs", true); + GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped = GregTech_API.sClientDataFile.get( + "render", + "RenderFlippedMachinesFlipped", + true); + GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch = GregTech_API.sClientDataFile.get( + "render", + "RenderIndicatorsOnHatch", + true); + GT_Mod.gregtechproxy.mRenderDirtParticles = GregTech_API.sClientDataFile.get( + "render", + "RenderDirtParticles", + true); + GT_Mod.gregtechproxy.mRenderPollutionFog = GregTech_API.sClientDataFile.get( + "render", + "RenderPollutionFog", + true); + + GT_Mod.gregtechproxy.mCoverTabsVisible = GregTech_API.sClientDataFile.get( + "interface", + "DisplayCoverTabs", + true); GT_Mod.gregtechproxy.mCoverTabsFlipped = GregTech_API.sClientDataFile.get("interface", "FlipCoverTabs", false); GT_Mod.gregtechproxy.mTooltipVerbosity = GregTech_API.sClientDataFile.get("interface", "TooltipVerbosity", 2); - GT_Mod.gregtechproxy.mTooltipShiftVerbosity = GregTech_API.sClientDataFile - .get("interface", "TooltipShiftVerbosity", 3); + GT_Mod.gregtechproxy.mTooltipShiftVerbosity = GregTech_API.sClientDataFile.get( + "interface", + "TooltipShiftVerbosity", + 3); GT_Mod.gregtechproxy.mTitleTabStyle = GregTech_API.sClientDataFile.get("interface", "TitleTabStyle", 0); GT_Mod.gregtechproxy.mNEIRecipeSecondMode = GregTech_API.sClientDataFile.get("nei", "RecipeSecondMode", true); GT_Mod.gregtechproxy.mNEIRecipeOwner = GregTech_API.sClientDataFile.get("nei", "RecipeOwner", false); - GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace = GregTech_API.sClientDataFile - .get("nei", "RecipeOwnerStackTrace", false); + GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace = GregTech_API.sClientDataFile.get( + "nei", + "RecipeOwnerStackTrace", + false); GT_Mod.gregtechproxy.mNEIOriginalVoltage = GregTech_API.sClientDataFile.get("nei", "OriginalVoltage", false); - GT_Mod.gregtechproxy.mWailaTransformerVoltageTier = GregTech_API.sClientDataFile - .get("waila", "WailaTransformerVoltageTier", true); + GT_Mod.gregtechproxy.mWailaTransformerVoltageTier = GregTech_API.sClientDataFile.get( + "waila", + "WailaTransformerVoltageTier", + true); final String[] Circuits = GregTech_API.sClientDataFile.get("interface", "CircuitsOrder"); GT_Mod.gregtechproxy.mCircuitsOrder.clear(); diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java index af03441d02..96ae4b8259 100644 --- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java +++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java @@ -144,7 +144,10 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { if (cacheHolder.getCachedRecipesVersion() != GT_Mod.gregtechproxy.getReloadCount() || (cache = cacheHolder.getCachedRecipes()) == null) { cache = mRecipeMap.mRecipeList.stream() // do not use parallel stream. This is already parallelized by NEI - .filter(r -> !r.mHidden).sorted().map(CachedDefaultRecipe::new).collect(Collectors.toList()); + .filter(r -> !r.mHidden) + .sorted() + .map(CachedDefaultRecipe::new) + .collect(Collectors.toList()); // while the NEI parallelize handlers, for each individual handler it still uses sequential execution model, // so we do not need any synchronization here // even if it does break, at worst case it's just recreating the cache multiple times, which should be fine @@ -190,14 +193,17 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); } } - if (aResult.getUnlocalizedName().startsWith("gt.blockores")) { + if (aResult.getUnlocalizedName() + .startsWith("gt.blockores")) { for (int i = 0; i < 8; i++) { tResults.add(new ItemStack(aResult.getItem(), 1, aResult.getItemDamage() % 1000 + i * 1000)); } } addFluidStacks(aResult, tResults); for (CachedDefaultRecipe recipe : getCache()) { - if (tResults.stream().anyMatch(stack -> recipe.contains(recipe.mOutputs, stack))) arecipes.add(recipe); + if (tResults.stream() + .anyMatch(stack -> recipe.contains(recipe.mOutputs, stack))) + arecipes.add(recipe); } } @@ -220,10 +226,12 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { private List<CachedDefaultRecipe> getTieredRecipes(Power power) { List<CachedDefaultRecipe> recipes = getCache(); if (recipes.size() > 0) { - recipes = recipes.stream().filter( - recipe -> power.compareTo(GT_Utility.getTier(recipe.mRecipe.mEUt), recipe.mRecipe.mSpecialValue) - >= 0) - .collect(Collectors.toList()); + recipes = recipes.stream() + .filter( + recipe -> power.compareTo( + GT_Utility.getTier(recipe.mRecipe.mEUt), + recipe.mRecipe.mSpecialValue) >= 0) + .collect(Collectors.toList()); } return recipes; } @@ -254,7 +262,9 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { } addFluidStacks(aInput, tInputs); for (CachedDefaultRecipe recipe : getCache()) { - if (tInputs.stream().anyMatch(stack -> recipe.contains(recipe.mInputs, stack))) arecipes.add(recipe); + if (tInputs.stream() + .anyMatch(stack -> recipe.contains(recipe.mInputs, stack))) + arecipes.add(recipe); } } @@ -483,7 +493,8 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { } private boolean hostRectContainsMouse(NEI_TransferRectHost host, Point mousePos) { - return host.getNeiTransferRect().contains(mousePos); + return host.getNeiTransferRect() + .contains(mousePos); } private boolean handleTransferRectMouseClick(NEI_TransferRectHost gui, boolean usage) { @@ -719,8 +730,11 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { for (Widget child : modularWindow.getChildren()) { if (child instanceof SlotWidget) { SlotWidget widget = (SlotWidget) child; - if (widget.getMcSlot().getItemHandler() == itemInputsInventory) { - int i = widget.getMcSlot().getSlotIndex(); + if (widget.getMcSlot() + .getItemHandler() + == itemInputsInventory) { + int i = widget.getMcSlot() + .getSlotIndex(); Object input = aRecipe instanceof GT_Recipe.GT_Recipe_WithAlt ? ((GT_Recipe.GT_Recipe_WithAlt) aRecipe).getAltRepresentativeInput(i) : aRecipe.getRepresentativeInput(i); @@ -733,50 +747,68 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { widget.getPos().y + 1, true)); } - } else if (widget.getMcSlot().getItemHandler() == itemOutputsInventory) { - int i = widget.getMcSlot().getSlotIndex(); - if (aRecipe.mOutputs.length > i && aRecipe.mOutputs[i] != null) { - mOutputs.add( - new FixedPositionedStack( - aRecipe.mOutputs[i], - GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes, - widget.getPos().x + 1, - widget.getPos().y + 1, - aRecipe.getOutputChance(i), - GT_NEI_DefaultHandler.this.mRecipeMap.mNEIUnificateOutput)); - } - } else if (widget.getMcSlot().getItemHandler() == specialSlotInventory) { - if (aRecipe.mSpecialItems != null) { - mInputs.add( - new FixedPositionedStack( - aRecipe.mSpecialItems, - GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes, - widget.getPos().x + 1, - widget.getPos().y + 1)); - } - } else if (widget.getMcSlot().getItemHandler() == fluidInputsInventory) { - int i = widget.getMcSlot().getSlotIndex(); - if (aRecipe.mFluidInputs.length > i && aRecipe.mFluidInputs[i] != null - && aRecipe.mFluidInputs[i].getFluid() != null) { - mInputs.add( - new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[i], true), - GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes, - widget.getPos().x + 1, - widget.getPos().y + 1)); - } - } else if (widget.getMcSlot().getItemHandler() == fluidOutputsInventory) { - int i = widget.getMcSlot().getSlotIndex(); - if (aRecipe.mFluidOutputs.length > i && aRecipe.mFluidOutputs[i] != null - && aRecipe.mFluidOutputs[i].getFluid() != null) { - mOutputs.add( - new FixedPositionedStack( - GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[i], true), - GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes, - widget.getPos().x + 1, - widget.getPos().y + 1)); - } - } + } else if (widget.getMcSlot() + .getItemHandler() + == itemOutputsInventory) { + int i = widget.getMcSlot() + .getSlotIndex(); + if (aRecipe.mOutputs.length > i && aRecipe.mOutputs[i] != null) { + mOutputs.add( + new FixedPositionedStack( + aRecipe.mOutputs[i], + GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes, + widget.getPos().x + 1, + widget.getPos().y + 1, + aRecipe.getOutputChance(i), + GT_NEI_DefaultHandler.this.mRecipeMap.mNEIUnificateOutput)); + } + } else + if (widget.getMcSlot() + .getItemHandler() + == specialSlotInventory) { + if (aRecipe.mSpecialItems != null) { + mInputs.add( + new FixedPositionedStack( + aRecipe.mSpecialItems, + GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes, + widget.getPos().x + 1, + widget.getPos().y + 1)); + } + } else + if (widget.getMcSlot() + .getItemHandler() + == fluidInputsInventory) { + int i = widget.getMcSlot() + .getSlotIndex(); + if (aRecipe.mFluidInputs.length > i && aRecipe.mFluidInputs[i] != null + && aRecipe.mFluidInputs[i].getFluid() != null) { + mInputs.add( + new FixedPositionedStack( + GT_Utility.getFluidDisplayStack( + aRecipe.mFluidInputs[i], + true), + GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes, + widget.getPos().x + 1, + widget.getPos().y + 1)); + } + } else + if (widget.getMcSlot() + .getItemHandler() + == fluidOutputsInventory) { + int i = widget.getMcSlot() + .getSlotIndex(); + if (aRecipe.mFluidOutputs.length > i && aRecipe.mFluidOutputs[i] != null + && aRecipe.mFluidOutputs[i].getFluid() != null) { + mOutputs.add( + new FixedPositionedStack( + GT_Utility.getFluidDisplayStack( + aRecipe.mFluidOutputs[i], + true), + GT_NEI_DefaultHandler.this.mRecipeMap.renderRealStackSizes, + widget.getPos().x + 1, + widget.getPos().y + 1)); + } + } } } @@ -1027,7 +1059,8 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { // Holds 16 elements without rehashing mTierIndexes = new HashMap<>(GT_Values.V.length + 1, 1f); assert mCachedRecipes != null; - Iterator<CachedDefaultRecipe> iterator = Objects.requireNonNull(mCachedRecipes.get()).iterator(); + Iterator<CachedDefaultRecipe> iterator = Objects.requireNonNull(mCachedRecipes.get()) + .iterator(); int index = 0; int minIndex = 0; @@ -1036,8 +1069,8 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { byte lowestTier = 0; while (iterator.hasNext()) { CachedDefaultRecipe recipe = iterator.next(); - byte recipeTier = GT_Utility - .getTier(recipe.mRecipe.mEUt / GT_NEI_DefaultHandler.this.mRecipeMap.mAmperage); + byte recipeTier = GT_Utility.getTier( + recipe.mRecipe.mEUt / GT_NEI_DefaultHandler.this.mRecipeMap.mAmperage); if (recipeTier != previousTier) { if (maxIndex != -1) { mTierIndexes.put(previousTier, Range.between(minIndex, maxIndex)); @@ -1061,7 +1094,8 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { while (mTierIndexes.get(lowTier) == null) { lowTier++; } - return mTierIndexes.get(lowTier).getMinimum(); + return mTierIndexes.get(lowTier) + .getMinimum(); } private int getHighIndexForTier(byte upperTier) { @@ -1069,7 +1103,8 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { while (mTierIndexes.get(highTier) == null) { highTier--; } - return mTierIndexes.get(highTier).getMaximum(); + return mTierIndexes.get(highTier) + .getMaximum(); } } } diff --git a/src/main/java/gregtech/nei/NEI_GT_Config.java b/src/main/java/gregtech/nei/NEI_GT_Config.java index 5c530ed709..7927f065e7 100644 --- a/src/main/java/gregtech/nei/NEI_GT_Config.java +++ b/src/main/java/gregtech/nei/NEI_GT_Config.java @@ -34,11 +34,16 @@ public class NEI_GT_Config implements IConfigureNEI { * will be assigned a value of 0. Negative values are fine. */ private static final ImmutableMap<GT_Recipe.GT_Recipe_Map, Integer> RECIPE_MAP_ORDERING = ImmutableMap.<GT_Recipe.GT_Recipe_Map, Integer>builder() - .put(GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes, 1) - .put(GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes, 2).build(); + .put( + GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes, + 1) + .put( + GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes, + 2) + .build(); - private static final Comparator<RecipeMapHandler> RECIPE_MAP_HANDLER_COMPARATOR = Comparator - .comparingInt(handler -> RECIPE_MAP_ORDERING.getOrDefault(handler.getRecipeMap(), 0)); + private static final Comparator<RecipeMapHandler> RECIPE_MAP_HANDLER_COMPARATOR = Comparator.comparingInt( + handler -> RECIPE_MAP_ORDERING.getOrDefault(handler.getRecipeMap(), 0)); public static boolean sIsAdded = true; @@ -55,7 +60,9 @@ public class NEI_GT_Config implements IConfigureNEI { @Override public void loadConfig() { sIsAdded = false; - if (FMLCommonHandler.instance().getEffectiveSide().isClient()) { + if (FMLCommonHandler.instance() + .getEffectiveSide() + .isClient()) { List<RecipeMapHandler> handlers = new ArrayList<>(); for (GT_Recipe.GT_Recipe_Map tMap : GT_Recipe.GT_Recipe_Map.sMappings) { diff --git a/src/main/java/gregtech/nei/RecipeMapHandler.java b/src/main/java/gregtech/nei/RecipeMapHandler.java index 1019d13e28..dbe1d74fd3 100644 --- a/src/main/java/gregtech/nei/RecipeMapHandler.java +++ b/src/main/java/gregtech/nei/RecipeMapHandler.java @@ -34,7 +34,10 @@ abstract class RecipeMapHandler extends TemplateRecipeHandler { } protected void drawText(int aX, int aY, String aString, int aColor) { - Minecraft.getMinecraft().fontRenderer - .drawString(aString, aX, aY, overrideTextColor != -1 ? overrideTextColor : aColor); + Minecraft.getMinecraft().fontRenderer.drawString( + aString, + aX, + aY, + overrideTextColor != -1 ? overrideTextColor : aColor); } } diff --git a/src/main/java/gregtech/nei/dumper/GregTechIDDumper.java b/src/main/java/gregtech/nei/dumper/GregTechIDDumper.java index dfcc2f567c..d3c41ed822 100644 --- a/src/main/java/gregtech/nei/dumper/GregTechIDDumper.java +++ b/src/main/java/gregtech/nei/dumper/GregTechIDDumper.java @@ -40,8 +40,8 @@ public abstract class GregTechIDDumper extends DataDumper { protected void logWarn() { if (!NewHorizonsCoreMod.isModLoaded()) { NEIClientUtils.printChatMessage( - new ChatComponentTranslation("nei.options.tools.dump.gt5u.warn_env") - .setChatStyle(new ChatStyle().setColor(EnumChatFormatting.DARK_RED))); + new ChatComponentTranslation("nei.options.tools.dump.gt5u.warn_env").setChatStyle( + new ChatStyle().setColor(EnumChatFormatting.DARK_RED))); } } diff --git a/src/main/java/gregtech/nei/dumper/MaterialDumper.java b/src/main/java/gregtech/nei/dumper/MaterialDumper.java index 60b32e11f1..cf8f38934e 100644 --- a/src/main/java/gregtech/nei/dumper/MaterialDumper.java +++ b/src/main/java/gregtech/nei/dumper/MaterialDumper.java @@ -24,8 +24,9 @@ public class MaterialDumper extends GregTechIDDumper { @Override protected Iterable<String[]> dump(Mode mode) { List<String[]> dump = new ArrayList<>(); - Map<Integer, Materials> idMap = Arrays.stream(GregTech_API.sGeneratedMaterials).filter(Objects::nonNull) - .collect(Collectors.toMap(m -> m.mMetaItemSubID, m -> m)); + Map<Integer, Materials> idMap = Arrays.stream(GregTech_API.sGeneratedMaterials) + .filter(Objects::nonNull) + .collect(Collectors.toMap(m -> m.mMetaItemSubID, m -> m)); for (int i = 0; i < 1000; i++) { if (mode == Mode.FREE && !idMap.containsKey(i)) { dump.add(new String[] { String.valueOf(i), "", }); diff --git a/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java b/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java index 0e89183854..d23e8b9897 100644 --- a/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java +++ b/src/main/java/gregtech/nei/dumper/MetaTileEntityDumper.java @@ -26,8 +26,10 @@ public class MetaTileEntityDumper extends GregTechIDDumper { list.add(new String[] { String.valueOf(i), "", "", }); } else if (mode == Mode.USED && mte != null) { list.add( - new String[] { String.valueOf(i), mte.getStackForm(1).getDisplayName(), - mte.getClass().getSimpleName() }); + new String[] { String.valueOf(i), mte.getStackForm(1) + .getDisplayName(), + mte.getClass() + .getSimpleName() }); } } return list; diff --git a/src/test/java/gregtech/overclock/GT_OverclockCalculator_UnitTest.java b/src/test/java/gregtech/overclock/GT_OverclockCalculator_UnitTest.java index 827bc48908..1dcb6003fb 100644 --- a/src/test/java/gregtech/overclock/GT_OverclockCalculator_UnitTest.java +++ b/src/test/java/gregtech/overclock/GT_OverclockCalculator_UnitTest.java @@ -17,9 +17,14 @@ class GT_OverclockCalculator_UnitTest { void fullPerfectOverclockEBF_Test() { int heatDiscounts = (1800 * 4) / 900; long correctConsumption = (long) Math.ceil(VP[5] * Math.pow(0.95, heatDiscounts)); - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[5]) - .setDuration(1024).enableHeatOC().enableHeatDiscount().setRecipeHeat(1800).setMultiHeat(1800 * 5) - .calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[5]) + .setDuration(1024) + .enableHeatOC() + .enableHeatDiscount() + .setRecipeHeat(1800) + .setMultiHeat(1800 * 5) + .calculate(); assertEquals(1024 >> 8, calculator.getDuration(), messageDuration); assertEquals(correctConsumption, calculator.getConsumption(), messageEUt); } @@ -28,18 +33,28 @@ class GT_OverclockCalculator_UnitTest { void imperfectOverclockEBFWithOneHeatDiscount_Test() { int heatDiscounts = 1; long correctConsumption = (long) Math.ceil(VP[5] * Math.pow(0.95, heatDiscounts)); - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[5]) - .setDuration(1024).enableHeatOC().enableHeatDiscount().setRecipeHeat(1800).setMultiHeat(2700) - .calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[5]) + .setDuration(1024) + .enableHeatOC() + .enableHeatDiscount() + .setRecipeHeat(1800) + .setMultiHeat(2700) + .calculate(); assertEquals(1024 >> 4, calculator.getDuration(), messageDuration); assertEquals(correctConsumption, calculator.getConsumption(), messageEUt); } @Test void imperfectOverclockEBFWithoutHeatDiscounts_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[5]) - .setDuration(1024).enableHeatOC().enableHeatDiscount().setRecipeHeat(1800).setMultiHeat(1800) - .calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[5]) + .setDuration(1024) + .enableHeatOC() + .enableHeatDiscount() + .setRecipeHeat(1800) + .setMultiHeat(1800) + .calculate(); assertEquals(1024 >> 4, calculator.getDuration(), messageDuration); assertEquals(VP[5], calculator.getConsumption(), messageEUt); } @@ -48,25 +63,35 @@ class GT_OverclockCalculator_UnitTest { void perfectAndImperfectOverclockEBFWithTwoHeatDiscounts_Test() { int heatDiscounts = 2; long correctConsumption = (long) Math.ceil(VP[5] * Math.pow(0.95, heatDiscounts)); - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[5]) - .setDuration(1024).enableHeatOC().enableHeatDiscount().setRecipeHeat(1800).setMultiHeat(3600) - .calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[5]) + .setDuration(1024) + .enableHeatOC() + .enableHeatDiscount() + .setRecipeHeat(1800) + .setMultiHeat(3600) + .calculate(); assertEquals(1024 >> 5, calculator.getDuration(), messageDuration); assertEquals(correctConsumption, calculator.getConsumption(), messageEUt); } @Test void generalImperfectOverclock_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]) - .setDuration(1024).calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setDuration(1024) + .calculate(); assertEquals(1024 >> 5, calculator.getDuration(), messageDuration); assertEquals(VP[6], calculator.getConsumption(), messageEUt); } @Test void generalPerfectOverclock_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]) - .setDuration(2048).enablePerfectOC().calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setDuration(2048) + .enablePerfectOC() + .calculate(); assertEquals(2048 >> 10, calculator.getDuration(), messageDuration); assertEquals(VP[6], calculator.getConsumption(), messageEUt); } @@ -75,89 +100,127 @@ class GT_OverclockCalculator_UnitTest { void weirdHeatEBF_Test() { int heatDiscounts = 3; long correctConsumption = (long) Math.ceil(VP[6] * Math.pow(0.95, heatDiscounts)); - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]) - .setDuration(2048).enableHeatOC().enableHeatDiscount().setRecipeHeat(486).setMultiHeat(3900) - .calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setDuration(2048) + .enableHeatOC() + .enableHeatDiscount() + .setRecipeHeat(486) + .setMultiHeat(3900) + .calculate(); assertEquals(2048 >> 6, calculator.getDuration(), messageDuration); assertEquals(correctConsumption, calculator.getConsumption(), messageEUt); } @Test void doubleEnergyHatchOC_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6] + V[6]) - .setAmperage(2).setDuration(1024).calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6] + V[6]) + .setAmperage(2) + .setDuration(1024) + .calculate(); assertEquals(1024 >> 6, calculator.getDuration(), messageDuration); assertEquals(VP[7], calculator.getConsumption(), messageEUt); } @Test void multiAmpHatchOC_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]) - .setAmperage(256).setDuration(1024).calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setAmperage(256) + .setDuration(1024) + .calculate(); assertEquals(1024 >> 9, calculator.getDuration(), messageDuration); assertEquals(VP[10], calculator.getConsumption(), messageEUt); } @Test void weirdAmpHatchOC_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]) - .setAmperage(320).setDuration(1024).calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setAmperage(320) + .setDuration(1024) + .calculate(); assertEquals(1024 >> 9, calculator.getDuration(), messageDuration); assertEquals(VP[10], calculator.getConsumption(), messageEUt); } @Test void parallelImperfectOC_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[8]).setAmperage(4) - .setDuration(1024).setParallel(16).calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[8]) + .setAmperage(4) + .setDuration(1024) + .setParallel(16) + .calculate(); assertEquals(1024 >> 6, calculator.getDuration(), messageDuration); assertEquals(VP[9], calculator.getConsumption(), messageEUt); } @Test void parallelPerfectOC_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[8]).setAmperage(4) - .setDuration(4096).setParallel(16).enablePerfectOC().calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[8]) + .setAmperage(4) + .setDuration(4096) + .setParallel(16) + .enablePerfectOC() + .calculate(); assertEquals(4096 >> 12, calculator.getDuration(), messageDuration); assertEquals(VP[9], calculator.getConsumption(), messageEUt); } @Test void parallelMultiAmpOC_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]) - .setAmperage(320).setDuration(1024).setParallel(16).calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setAmperage(320) + .setDuration(1024) + .setParallel(16) + .calculate(); assertEquals(1024 >> 7, calculator.getDuration(), messageDuration); assertEquals(VP[10], calculator.getConsumption(), messageEUt); } @Test void weirdParallelOC_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[8]) - .setDuration(1024).setParallel(8).calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[8]) + .setDuration(1024) + .setParallel(8) + .calculate(); assertEquals(1024 >> 5, calculator.getDuration(), messageDuration); assertEquals(VP[6] * 8, calculator.getConsumption(), messageEUt); } @Test void weirdParallelAndAmpsOC_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[8]) - .setAmperage(320).setDuration(1024).setParallel(8).calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[8]) + .setAmperage(320) + .setDuration(1024) + .setParallel(8) + .calculate(); assertEquals(1024 >> 9, calculator.getDuration(), messageDuration); assertEquals(VP[6] * 8 * 256, calculator.getConsumption(), messageEUt); } @Test void weirdTimeOC_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]) - .setDuration(77).calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setDuration(77) + .calculate(); assertEquals(77 >> 5, calculator.getDuration(), messageDuration); assertEquals(VP[6], calculator.getConsumption(), messageEUt); } @Test void stopsCorrectlyWhenOneTicking_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]).setDuration(1) - .calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setDuration(1) + .calculate(); assertEquals(1, calculator.getDuration(), messageDuration); assertEquals(VP[1], calculator.getConsumption(), messageEUt); } @@ -165,8 +228,11 @@ class GT_OverclockCalculator_UnitTest { @Test void imperfectOCWithEUtDiscount_Test() { long correctConsumption = (long) Math.ceil(VP[1] * 0.9f) << 10; - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]) - .setEUtDiscount(0.9f).setDuration(1024).calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setEUtDiscount(0.9f) + .setDuration(1024) + .calculate(); assertEquals(1024 >> 5, calculator.getDuration(), messageDuration); assertEquals(correctConsumption, calculator.getConsumption(), messageEUt); } @@ -174,48 +240,71 @@ class GT_OverclockCalculator_UnitTest { @Test void perfectOCWithEUtDiscount_Test() { long correctConsumption = (long) Math.ceil(VP[1] * 0.9f) << 10; - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]) - .setEUtDiscount(0.9f).setDuration(1024).enablePerfectOC().calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setEUtDiscount(0.9f) + .setDuration(1024) + .enablePerfectOC() + .calculate(); assertEquals(1024 >> 10, calculator.getDuration(), messageDuration); assertEquals(correctConsumption, calculator.getConsumption(), messageEUt); } @Test void imperfectOCWithSpeedBoost_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]) - .setSpeedBoost(0.9f).setDuration(1024).calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setSpeedBoost(0.9f) + .setDuration(1024) + .calculate(); assertEquals((int) (1024 * 0.9f) >> 5, calculator.getDuration(), messageDuration); assertEquals(VP[6], calculator.getConsumption(), messageEUt); } @Test void perfectOCWithSpeedBoost_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]) - .setSpeedBoost(0.9f).setDuration(2048).enablePerfectOC().calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setSpeedBoost(0.9f) + .setDuration(2048) + .enablePerfectOC() + .calculate(); assertEquals((int) (2048 * 0.9f) >> 10, calculator.getDuration(), messageDuration); assertEquals(VP[6], calculator.getConsumption(), messageEUt); } @Test void oneTickDiscountTurnsToOne_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]).setDuration(1) - .enableOneTickDiscount().calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setDuration(1) + .enableOneTickDiscount() + .calculate(); assertEquals(1, calculator.getDuration(), messageDuration); assertEquals(1, calculator.getConsumption(), messageEUt); } @Test void oneTickDiscountImperfectOC_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]) - .setSpeedBoost(1.1f).setDuration(4).enableOneTickDiscount().calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setSpeedBoost(1.1f) + .setDuration(4) + .enableOneTickDiscount() + .calculate(); assertEquals(1, calculator.getDuration(), messageDuration); assertEquals(480 >> 3, calculator.getConsumption(), messageEUt); } @Test void oneTickDiscountPerfectOC_Test() { - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]).setEUt(V[6]) - .setSpeedBoost(1.1f).setDuration(16).enablePerfectOC().enableOneTickDiscount().calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[1]) + .setEUt(V[6]) + .setSpeedBoost(1.1f) + .setDuration(16) + .enablePerfectOC() + .enableOneTickDiscount() + .calculate(); assertEquals(1, calculator.getDuration(), messageDuration); assertEquals(480 >> 6, calculator.getConsumption(), messageEUt); } @@ -223,8 +312,11 @@ class GT_OverclockCalculator_UnitTest { @Test void ulvRecipeWithDiscount_Test() { long correctConsumption = (long) Math.ceil((VP[0] << 10) * 0.9f); - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[0]).setEUt(V[6]) - .setEUtDiscount(0.9f).setDuration(1024).calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[0]) + .setEUt(V[6]) + .setEUtDiscount(0.9f) + .setDuration(1024) + .calculate(); assertEquals(1024 >> 5, calculator.getDuration(), messageDuration); assertEquals(correctConsumption, calculator.getConsumption(), messageEUt); } @@ -232,8 +324,12 @@ class GT_OverclockCalculator_UnitTest { @Test void ulvRecipeWithDiscountWithParallel_Test() { long correctConsumption = (long) Math.ceil((VP[0] << 6) * 14 * 0.9f); - GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[0]).setEUt(V[5]) - .setEUtDiscount(0.9f).setParallel(14).setDuration(1024).calculate(); + GT_OverclockCalculator calculator = new GT_OverclockCalculator().setRecipeEUt(VP[0]) + .setEUt(V[5]) + .setEUtDiscount(0.9f) + .setParallel(14) + .setDuration(1024) + .calculate(); assertEquals(1024 >> 3, calculator.getDuration(), messageDuration); assertEquals(correctConsumption, calculator.getConsumption(), messageEUt); } |