From 67b65a4160b39c65bbd6c0a7264ef9b89c18eac3 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Tue, 3 Sep 2024 14:14:16 +0200 Subject: [PATCH] the renaming (#73) --- dependencies.gradle | 2 +- .../cropspp/GTHandler/CropItemList.java | 64 ++-- .../GTHandler/GTCraftingRecipeLoader.java | 83 +++-- .../GTHandler/GTNHMachineRecipeLoader.java | 290 +++++++++--------- .../GTHandler/machines/CropGeneExtractor.java | 40 +-- .../GTHandler/machines/CropReplicator.java | 28 +- .../GTHandler/machines/CropSynthesiser.java | 26 +- .../GTHandler/machines/CropWeedPicker.java | 34 +- .../crops/gregtechCrops/GarnydniaCrop.java | 24 +- .../cropspp/fluids/AlkoholImpure.java | 8 +- 10 files changed, 298 insertions(+), 301 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 2ef70fe..b737c47 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,7 +4,7 @@ dependencies { api("com.github.GTNewHorizons:CropLoadCore:0.2.0:dev") api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") - devOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.29:dev") + devOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.56:dev") compileOnly(deobf("https://media.forgecdn.net/files/2499/612/BiomesOPlenty-1.7.10-2.1.0.2308-universal.jar")) compileOnly("com.github.GTNewHorizons:twilightforest:2.6.33:dev") { transitive = false diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/CropItemList.java b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/CropItemList.java index cea0526..4a948c7 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/CropItemList.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/CropItemList.java @@ -1,15 +1,15 @@ package com.github.bartimaeusnek.cropspp.GTHandler; -import static gregtech.api.enums.GT_Values.W; +import static gregtech.api.enums.GTValues.W; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import gregtech.api.interfaces.IItemContainer; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public enum CropItemList implements IItemContainer { @@ -53,14 +53,14 @@ public IItemContainer set(Item aItem) { return this; } ItemStack aStack = new ItemStack(aItem, 1, 0); - mStack = GT_Utility.copyAmount(1, aStack); + mStack = GTUtility.copyAmount(1, aStack); return this; } @Override public IItemContainer set(ItemStack aStack) { mHasNotBeenSet = false; - mStack = GT_Utility.copyAmount(1, aStack); + mStack = GTUtility.copyAmount(1, aStack); return this; } @@ -69,7 +69,7 @@ public Item getItem() { if (mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(mStack)) { + if (GTUtility.isStackInvalid(mStack)) { return null; } return mStack.getItem(); @@ -80,7 +80,7 @@ public Block getBlock() { if (mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); } - return GT_Utility.getBlockFromItem(getItem()); + return GTUtility.getBlockFromItem(getItem()); } @Override @@ -95,8 +95,8 @@ public boolean isStackEqual(Object aStack) { @Override public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT) { - return !GT_Utility.isStackInvalid(aStack) - && GT_Utility.areUnificationsEqual((ItemStack) aStack, aWildcard ? getWildcard(1) : get(1), aIgnoreNBT); + return !GTUtility.isStackInvalid(aStack) + && GTUtility.areUnificationsEqual((ItemStack) aStack, aWildcard ? getWildcard(1) : get(1), aIgnoreNBT); } @Override @@ -104,10 +104,10 @@ public ItemStack get(long aAmount, Object... aReplacements) { if (mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(mStack)); + return GTUtility.copyAmount(aAmount, GTOreDictUnificator.get(mStack)); } @Override @@ -115,10 +115,10 @@ public ItemStack getWildcard(long aAmount, Object... aReplacements) { if (mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmountAndMetaData(aAmount, W, GT_OreDictUnificator.get(mStack)); + return GTUtility.copyAmountAndMetaData(aAmount, W, GTOreDictUnificator.get(mStack)); } @Override @@ -126,10 +126,10 @@ public ItemStack getUndamaged(long aAmount, Object... aReplacements) { if (mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(mStack)); + return GTUtility.copyAmountAndMetaData(aAmount, 0, GTOreDictUnificator.get(mStack)); } @Override @@ -137,30 +137,30 @@ public ItemStack getAlmostBroken(long aAmount, Object... aReplacements) { if (mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmountAndMetaData(aAmount, mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(mStack)); + return GTUtility.copyAmountAndMetaData(aAmount, mStack.getMaxDamage() - 1, GTOreDictUnificator.get(mStack)); } @Override public ItemStack getWithName(long aAmount, String aDisplayName, Object... aReplacements) { ItemStack rStack = get(1, aReplacements); - if (GT_Utility.isStackInvalid(rStack)) { + if (GTUtility.isStackInvalid(rStack)) { return null; } rStack.setStackDisplayName(aDisplayName); - return GT_Utility.copyAmount(aAmount, rStack); + return GTUtility.copyAmount(aAmount, rStack); } @Override public ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements) { ItemStack rStack = get(1, aReplacements); - if (GT_Utility.isStackInvalid(rStack)) { + if (GTUtility.isStackInvalid(rStack)) { return null; } - GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false); - return GT_Utility.copyAmount(aAmount, rStack); + GTModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false); + return GTUtility.copyAmount(aAmount, rStack); } @Override @@ -168,10 +168,10 @@ public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplace if (mHasNotBeenSet) { throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); } - if (GT_Utility.isStackInvalid(mStack)) { - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(mStack)) { + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(mStack)); + return GTUtility.copyAmountAndMetaData(aAmount, aMetaValue, GTOreDictUnificator.get(mStack)); } @Override @@ -180,7 +180,7 @@ public IItemContainer registerOre(Object... aOreNames) { throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); } for (Object tOreName : aOreNames) { - GT_OreDictUnificator.registerOre(tOreName, get(1)); + GTOreDictUnificator.registerOre(tOreName, get(1)); } return this; } @@ -191,7 +191,7 @@ public IItemContainer registerWildcardAsOre(Object... aOreNames) { throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); } for (Object tOreName : aOreNames) { - GT_OreDictUnificator.registerOre(tOreName, getWildcard(1)); + GTOreDictUnificator.registerOre(tOreName, getWildcard(1)); } return this; } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTCraftingRecipeLoader.java b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTCraftingRecipeLoader.java index 23722e4..b84a065 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTCraftingRecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTCraftingRecipeLoader.java @@ -11,8 +11,8 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; import ic2.core.Ic2Items; public class GTCraftingRecipeLoader implements Runnable { @@ -31,8 +31,8 @@ public class GTCraftingRecipeLoader implements Runnable { private static final String aTextMotorWire = "EWE"; private static final String aTextWirePump = "WPW"; - private static final long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE; + private static final long bitsd = GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE; public GTCraftingRecipeLoader() { super(); @@ -41,122 +41,122 @@ public GTCraftingRecipeLoader() { public void run() { CropItemList.weedingTrowel.set(Ic2Items.weedingTrowel); CropItemList.Spade.set(CppItems.itemSpadeStack); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CppItems.itemSpadeStack, bitsd, new Object[] { "fPh", "PWP", " S ", 'P', OrePrefixes.plateDense.get(Materials.Steel), 'W', CropItemList.weedingTrowel, 'S', OrePrefixes.stickLong.get(Materials.Wood) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropGeneExtractorLV.get(1L), bitsd, new Object[] { "RTR", aTextWireHull, "CRC", 'M', ItemList.Hull_LV, 'T', ItemList.Emitter_LV, 'R', ItemList.Sensor_LV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.Tin) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropGeneExtractorMV.get(1L), bitsd, new Object[] { "RTR", aTextWireHull, "CRC", 'M', ItemList.Hull_MV, 'T', ItemList.Emitter_MV, 'R', ItemList.Sensor_MV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropGeneExtractorHV.get(1L), bitsd, new Object[] { "RTR", aTextWireHull, "CRC", 'M', ItemList.Hull_HV, 'T', ItemList.Emitter_HV, 'R', ItemList.Sensor_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropGeneExtractorEV.get(1L), bitsd, new Object[] { "RTR", aTextWireHull, "CRC", 'M', ItemList.Hull_EV, 'T', ItemList.Emitter_EV, 'R', ItemList.Sensor_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropGeneExtractorIV.get(1L), bitsd, new Object[] { "RTR", aTextWireHull, "CRC", 'M', ItemList.Hull_IV, 'T', ItemList.Emitter_IV, 'R', ItemList.Sensor_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropGeneExtractorLuV.get(1L), bitsd, new Object[] { "RTR", aTextWireHull, "CRC", 'M', ItemList.Hull_LuV, 'T', ItemList.Emitter_LuV, 'R', ItemList.Sensor_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt01.get(Materials.VanadiumGallium) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropGeneExtractorZPM.get(1L), bitsd, new Object[] { "RTR", aTextWireHull, "CRC", 'M', ItemList.Hull_ZPM, 'T', ItemList.Emitter_ZPM, 'R', ItemList.Sensor_ZPM, 'C', OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'W', OrePrefixes.cableGt01.get(Materials.Naquadah) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropGeneExtractorUV.get(1L), bitsd, new Object[] { "RTR", aTextWireHull, "CRC", 'M', ItemList.Hull_UV, 'T', ItemList.Emitter_UV, 'R', ItemList.Sensor_UV, 'C', OrePrefixes.circuit.get(Materials.Infinite), 'W', OrePrefixes.cableGt01.get(Materials.NaquadahAlloy) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropGeneExtractorUHV.get(1L), bitsd, new Object[] { "RTR", aTextWireHull, "CRC", 'M', ItemList.Hull_MAX, 'T', ItemList.Emitter_UHV, 'R', ItemList.Sensor_UHV, 'C', OrePrefixes.circuit.get(Materials.Bio), 'W', OrePrefixes.wireGt01.get(Materials.SuperconductorUV) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropReplicatorLV.get(1L), bitsd, new Object[] { "CFC", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_LV, 'F', ItemList.Field_Generator_LV, 'E', ItemList.Emitter_LV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt04.get(Materials.Tin) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropReplicatorMV.get(1L), bitsd, new Object[] { "CFC", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_MV, 'F', ItemList.Field_Generator_MV, 'E', ItemList.Emitter_MV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt04.get(Materials.AnyCopper) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropReplicatorHV.get(1L), bitsd, new Object[] { "CFC", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_HV, 'F', ItemList.Field_Generator_HV, 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt04.get(Materials.Gold) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropReplicatorEV.get(1L), bitsd, new Object[] { "CFC", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_EV, 'F', ItemList.Field_Generator_EV, 'E', ItemList.Emitter_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt04.get(Materials.Aluminium) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropReplicatorIV.get(1L), bitsd, new Object[] { "CFC", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_IV, 'F', ItemList.Field_Generator_IV, 'E', ItemList.Emitter_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropReplicatorLuV.get(1L), bitsd, new Object[] { "CFC", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_LuV, 'E', ItemList.Emitter_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt04.get(Materials.VanadiumGallium) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropReplicatorZPM.get(1L), bitsd, new Object[] { "CFC", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_ZPM, 'E', ItemList.Emitter_ZPM, 'C', OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'W', OrePrefixes.cableGt04.get(Materials.Naquadah) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropReplicatorUV.get(1L), bitsd, new Object[] { "CFC", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_UV, 'F', ItemList.Field_Generator_UV, 'E', ItemList.Emitter_UV, 'C', OrePrefixes.circuit.get(Materials.Infinite), 'W', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropReplicatorUHV.get(1L), bitsd, new Object[] { "CFC", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_MAX, 'F', @@ -164,72 +164,71 @@ public void run() { OrePrefixes.circuit.get(Materials.Bio), 'W', OrePrefixes.wireGt04.get(Materials.SuperconductorUV) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropSynthesiserLV.get(1L), bitsd, new Object[] { "FCF", aTextCableHull, "EEE", 'M', ItemList.Hull_LV, 'F', ItemList.Field_Generator_LV, 'E', ItemList.Emitter_LV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt04.get(Materials.Tin) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropSynthesiserMV.get(1L), bitsd, new Object[] { "FCF", aTextCableHull, "EEE", 'M', ItemList.Hull_MV, 'F', ItemList.Field_Generator_MV, 'E', ItemList.Emitter_MV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt04.get(Materials.AnyCopper) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropSynthesiserHV.get(1L), bitsd, new Object[] { "FCF", aTextCableHull, "EEE", 'M', ItemList.Hull_HV, 'F', ItemList.Field_Generator_HV, 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt04.get(Materials.Gold) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropSynthesiserEV.get(1L), bitsd, new Object[] { "FCF", aTextCableHull, "EEE", 'M', ItemList.Hull_EV, 'F', ItemList.Field_Generator_EV, 'E', ItemList.Emitter_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt04.get(Materials.Aluminium) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropSynthesiserIV.get(1L), bitsd, new Object[] { "FCF", aTextCableHull, "EEE", 'M', ItemList.Hull_IV, 'F', ItemList.Field_Generator_IV, 'E', ItemList.Emitter_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropSynthesiserLuV.get(1L), bitsd, new Object[] { "FCF", aTextCableHull, "EEE", 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_LuV, 'E', ItemList.Emitter_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt04.get(Materials.VanadiumGallium) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropSynthesiserZPM.get(1L), bitsd, new Object[] { "FCF", aTextCableHull, "EEE", 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_ZPM, 'E', ItemList.Emitter_ZPM, 'C', OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'W', OrePrefixes.cableGt04.get(Materials.Naquadah) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropSynthesiserUV.get(1L), bitsd, new Object[] { "FCF", aTextCableHull, "EEE", 'M', ItemList.Hull_UV, 'F', ItemList.Field_Generator_UV, 'E', ItemList.Emitter_UV, 'C', OrePrefixes.circuit.get(Materials.Infinite), 'W', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( CropItemList.cropSynthesiserUHV.get(1L), bitsd, new Object[] { "FCF", aTextCableHull, "EEE", 'M', ItemList.Hull_MAX, 'F', ItemList.Field_Generator_UHV, 'E', ItemList.Emitter_UHV, 'C', OrePrefixes.circuit.get(Materials.Bio), 'W', OrePrefixes.wireGt04.get(Materials.SuperconductorUV) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( new ItemStack(itemLens), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.MIRRORED - | GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { " fL", " Sr", "S ", 'L', - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1L), 'S', - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L) }); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, + GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.MIRRORED + | GTModHandler.RecipeBits.DISMANTLEABLE + | GTModHandler.RecipeBits.REVERSIBLE, + new Object[] { " fL", " Sr", "S ", 'L', GTOreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1L), + 'S', GTOreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L) }); + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1L), + GTModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "FfF", "FGF", "FDF", 'F', new ItemStack(Items.flint), 'G', new ItemStack(Blocks.glass), 'D', new ItemStack(Items.diamond) }); } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTNHMachineRecipeLoader.java b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTNHMachineRecipeLoader.java index 083172d..89f9be6 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTNHMachineRecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/GTNHMachineRecipeLoader.java @@ -18,11 +18,11 @@ import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.HOURS; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.HOURS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import java.util.Locale; @@ -38,17 +38,17 @@ import com.github.bartimaeusnek.cropspp.items.CppItems; import com.github.bartimaeusnek.cropspp.items.CppPotions; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import ic2.core.Ic2Items; public class GTNHMachineRecipeLoader implements Runnable { @@ -64,41 +64,41 @@ public final void run() { // Magic Modifier = Primordial Pear, // StonePlant - GT_Values.RA.stdBuilder().itemInputs(Materials.Marble.getDust(9)).itemOutputs(Materials.Marble.getBlocks(1)) + GTValues.RA.stdBuilder().itemInputs(Materials.Marble.getDust(9)).itemOutputs(Materials.Marble.getBlocks(1)) .duration(15 * SECONDS).eut(2).addTo(compressorRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.GraniteRed.getDust(1)) + GTValues.RA.stdBuilder().itemInputs(Materials.GraniteRed.getDust(1)) .itemOutputs(Materials.GraniteRed.getPlates(1)).duration(15 * SECONDS).eut(2).addTo(compressorRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.GraniteBlack.getDust(1)) + GTValues.RA.stdBuilder().itemInputs(Materials.GraniteBlack.getDust(1)) .itemOutputs(Materials.GraniteBlack.getPlates(1)).duration(15 * SECONDS).eut(2) .addTo(compressorRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Stone.getPlates(9)).itemOutputs(new ItemStack(Blocks.stone)) + GTValues.RA.stdBuilder().itemInputs(Materials.Stone.getPlates(9)).itemOutputs(new ItemStack(Blocks.stone)) .duration(15 * SECONDS).eut(2).addTo(compressorRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.GraniteRed.getPlates(9)) - .itemOutputs(new ItemStack(GregTech_API.sBlockGranites, 1, 8)).duration(15 * SECONDS).eut(2) + GTValues.RA.stdBuilder().itemInputs(Materials.GraniteRed.getPlates(9)) + .itemOutputs(new ItemStack(GregTechAPI.sBlockGranites, 1, 8)).duration(15 * SECONDS).eut(2) .addTo(compressorRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.GraniteBlack.getPlates(9)) - .itemOutputs(new ItemStack(GregTech_API.sBlockGranites)).duration(15 * SECONDS).eut(2) + GTValues.RA.stdBuilder().itemInputs(Materials.GraniteBlack.getPlates(9)) + .itemOutputs(new ItemStack(GregTechAPI.sBlockGranites)).duration(15 * SECONDS).eut(2) .addTo(compressorRecipes); // honey related - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(9)) .itemOutputs(new ItemStack(Items.sugar, 9, 0)) .fluidInputs(new FluidStack(FluidRegistry.getFluid("for.honey"), 1000)).duration(51 * SECONDS).eut(8) .addTo(centrifugeRecipes); if (BiomesOPlenty.isModLoaded()) { - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(9)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(9)) .itemOutputs(new ItemStack(Items.sugar, 9, 0)) .fluidInputs(new FluidStack(FluidRegistry.getFluid("honey"), 1000)).duration(51 * SECONDS).eut(8) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidInputs(new FluidStack(FluidRegistry.getFluid("honey"), 1000)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("for.honey"), 1000)).duration(51 * SECONDS) .eut(8).addTo(centrifugeRecipes); @@ -109,7 +109,7 @@ public final void run() { for (int i = 0; i < CppPotions.textureNames.length; i++) { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(CppItems.CppPotions, 1, i)) + GTValues.RA.stdBuilder().itemInputs(new ItemStack(CppItems.CppPotions, 1, i)) .itemOutputs(new ItemStack(Items.glass_bottle)) .fluidOutputs( new FluidStack( @@ -118,7 +118,7 @@ public final void run() { 250)) .duration(4 * TICKS).eut(1).addTo(fluidCannerRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.glass_bottle)) + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Items.glass_bottle)) .itemOutputs(new ItemStack(CppItems.CppPotions, 1, i)) .fluidInputs( new FluidStack( @@ -129,159 +129,159 @@ public final void run() { } - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.Mash, 10)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.Mash, 10)) .fluidOutputs(new FluidStack(CppFluids.Wash, 8)).duration(50 * SECONDS).eut(2).addTo(fermentingRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.Wash, 20)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.Wash, 20)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.wine"), 8)).duration(50 * SECONDS).eut(2) .addTo(fermentingRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.wheatyjuice"), 10)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.wheatyjuice"), 10)) .fluidOutputs(new FluidStack(CppFluids.FWheat, 8)).duration(51 * SECONDS).eut(2) .addTo(fermentingRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.reedwater"), 10)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.reedwater"), 10)) .fluidOutputs(new FluidStack(CppFluids.FReed, 8)).duration(51 * SECONDS).eut(2) .addTo(fermentingRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.rum"), 1000)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.rum"), 1000)) .fluidOutputs(Materials.Ethanol.getFluid(580), Materials.Water.getFluid(420)).duration(4 * SECONDS) .eut(180).addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.piratebrew"), 1000)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.piratebrew"), 1000)) .fluidOutputs(Materials.Ethanol.getFluid(800), Materials.Water.getFluid(200)).duration(4 * SECONDS) .eut(180).addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.beer"), 1000)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.beer"), 1000)) .fluidOutputs(Materials.Ethanol.getFluid(45), Materials.Water.getFluid(955)).duration(4 * SECONDS) .eut(180).addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.darkbeer"), 1000)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.darkbeer"), 1000)) .fluidOutputs(Materials.Ethanol.getFluid(75), Materials.Water.getFluid(925)).duration(4 * SECONDS) .eut(180).addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.cider"), 1000)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.cider"), 1000)) .fluidOutputs(Materials.Ethanol.getFluid(100), Materials.Water.getFluid(900)).duration(4 * SECONDS) .eut(180).addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.wine"), 1000)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.wine"), 1000)) .fluidOutputs(Materials.Ethanol.getFluid(120), Materials.Water.getFluid(880)).duration(4 * SECONDS) .eut(180).addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 1000)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 1000)) .fluidOutputs(Materials.Ethanol.getFluid(400), Materials.Water.getFluid(600)).duration(4 * SECONDS) .eut(180).addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 1000)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 1000)) .fluidOutputs(Materials.Ethanol.getFluid(160), Materials.Water.getFluid(840)).duration(4 * SECONDS) .eut(180).addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.Korn, 1000)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.Korn, 1000)) .fluidOutputs(Materials.Ethanol.getFluid(320), Materials.Water.getFluid(680)).duration(4 * SECONDS) .eut(180).addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.DKorn, 1000)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.DKorn, 1000)) .fluidOutputs(Materials.Ethanol.getFluid(380), Materials.Water.getFluid(620)).duration(4 * SECONDS) .eut(180).addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.SWhine, 1000)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.SWhine, 1000)) .fluidOutputs(Materials.Ethanol.getFluid(700), Materials.Water.getFluid(300)).duration(4 * SECONDS) .eut(180).addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.GHP, 1000)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.GHP, 1000)) .fluidOutputs(Materials.Ethanol.getFluid(750), Materials.Water.getFluid(250)).duration(4 * SECONDS) .eut(180).addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.jagi, 1000)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.jagi, 1000)) .fluidOutputs(Materials.Ethanol.getFluid(350), Materials.Water.getFluid(650)).duration(4 * SECONDS) .eut(180).addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.njagi, 1000)) + GTValues.RA.stdBuilder().fluidInputs(new FluidStack(CppFluids.njagi, 1000)) .fluidOutputs(Materials.Ethanol.getFluid(350), Materials.Water.getFluid(650)).duration(4 * SECONDS) .eut(180).addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.rum"), 100)) .fluidOutputs(Materials.Ethanol.getFluid(50)).duration(16 * TICKS).eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.rum"), 100)) .fluidOutputs(Materials.Water.getFluid(42)).duration(16 * TICKS).eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 100)) .fluidOutputs(Materials.Ethanol.getFluid(35)).duration(16 * TICKS).eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 100)) .fluidOutputs(Materials.Water.getFluid(60)).duration(16 * TICKS).eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidInputs(new FluidStack(CppFluids.Korn, 100)).fluidOutputs(Materials.Ethanol.getFluid(25)) .duration(16 * TICKS).eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs(new FluidStack(CppFluids.Korn, 100)).fluidOutputs(Materials.Water.getFluid(68)) .duration(16 * TICKS).eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidInputs(new FluidStack(CppFluids.DKorn, 100)).fluidOutputs(Materials.Ethanol.getFluid(30)) .duration(16 * TICKS).eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs(new FluidStack(CppFluids.DKorn, 100)).fluidOutputs(Materials.Water.getFluid(62)) .duration(16 * TICKS).eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidInputs(new FluidStack(CppFluids.FWheat, 80)).fluidOutputs(new FluidStack(CppFluids.Korn, 1)) .duration(1 * SECONDS + 2 * TICKS).eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs(new FluidStack(CppFluids.FWheat, 95)).fluidOutputs(new FluidStack(CppFluids.DKorn, 1)) .duration(1 * SECONDS + 4 * TICKS).eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(3)) .fluidInputs(new FluidStack(CppFluids.FWheat, 100)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 1)) .duration(1 * SECONDS + 8 * TICKS).eut(64).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(4)) .fluidInputs(new FluidStack(CppFluids.FWheat, 200)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("fermentedbiomass"), 3)) .duration(1 * SECONDS + 8 * TICKS).eut(64).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(5)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(5)) .fluidInputs(new FluidStack(CppFluids.FWheat, 1000)).fluidOutputs(Materials.Ethanol.getFluid(4)) .duration(11 * SECONDS).eut(TierEU.RECIPE_MV).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidInputs(new FluidStack(CppFluids.FReed, 100)).fluidOutputs(new FluidStack(CppFluids.SWhine, 7)) .duration(1 * SECONDS + 2 * TICKS).eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(4)) .fluidInputs(new FluidStack(CppFluids.FReed, 200)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("fermentedbiomass"), 4)) .duration(1 * SECONDS + 4 * TICKS).eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(5)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(5)) .fluidInputs(new FluidStack(CppFluids.FReed, 1000)).fluidOutputs(Materials.Ethanol.getFluid(5)) .duration(11 * SECONDS).eut(TierEU.RECIPE_MV).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(4)) .fluidInputs(new FluidStack(CppFluids.Mash, 200)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("biomass"), 4)).duration(1 * SECONDS + 4 * TICKS) .eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidInputs(new FluidStack(CppFluids.Wash, 100)).fluidOutputs(new FluidStack(CppFluids.GHP, 6)) .duration(1 * SECONDS + 2 * TICKS).eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(4)) .fluidInputs(new FluidStack(CppFluids.Wash, 100)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("fermentedbiomass"), 14)) .duration(1 * SECONDS + 4 * TICKS).eut(24).addTo(distilleryRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Items.sugar, 32, 0), new ItemStack(Items.dye, 4, 1), @@ -292,7 +292,7 @@ public final void run() { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 4375)).duration(10 * TICKS) .eut(8).addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Items.sugar, 8, 0), new ItemStack(Items.dye, 1, 1), @@ -304,7 +304,7 @@ public final void run() { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 1500)).duration(10 * TICKS) .eut(8).addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Items.sugar, 8, 0), new ItemStack(Items.dye, 1, 1), @@ -315,7 +315,7 @@ public final void run() { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 2000)).duration(10 * TICKS) .eut(8).addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Items.sugar, 8, 0), new ItemStack(Items.dye, 1, 1), @@ -326,7 +326,7 @@ public final void run() { .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.alcopops"), 1750)).duration(10 * TICKS) .eut(8).addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Items.sugar, 8, 0), OreDict.ISget("cropSpiceleaf"), @@ -337,7 +337,7 @@ public final void run() { .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 4000)) .fluidOutputs(new FluidStack(CppFluids.njagi, 5000)).duration(10 * TICKS).eut(8).addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Crop_Drop_Chilly.get(1), Materials.CosmicNeutronium.getDustTiny(1), @@ -348,64 +348,64 @@ public final void run() { .fluidInputs(new FluidStack(CppFluids.njagi, 50000)).fluidOutputs(new FluidStack(CppFluids.jagi, 250)) .duration(1 * TICKS).eut(TierEU.RECIPE_LuV).addTo(mixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1)).itemOutputs(Materials.Empty.getCells(1)) + GTValues.RA.stdBuilder().itemInputs(Materials.Water.getCells(1)).itemOutputs(Materials.Empty.getCells(1)) .fluidInputs(Materials.Ethanol.getFluid(1000)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.vodka"), 2500)).duration(10 * TICKS).eut(8) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), new ItemStack(Items.sugar)) + GTValues.RA.stdBuilder().itemInputs(Materials.Water.getCells(1), new ItemStack(Items.sugar)) .itemOutputs(Materials.Empty.getCells(1)).fluidInputs(new FluidStack(CppFluids.SWhine, 5000)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.rum"), 6000)).duration(10 * TICKS).eut(8) .addTo(mixerRecipes); // Brewery for (ItemStack itemStack : OreDictionary.getOres("listAllberry")) { - GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16)).fluidInputs(Materials.Water.getFluid(750)) + GTValues.RA.stdBuilder().itemInputs(itemStack.splitStack(16)).fluidInputs(Materials.Water.getFluid(750)) .fluidOutputs(new FluidStack(CppFluids.Mash, 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) .addTo(brewingRecipes); } - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.sugar, 8)) + GTValues.RA.stdBuilder().itemInputs(new ItemStack(Items.sugar, 8)) .fluidInputs(new FluidStack(FluidRegistry.getFluid("potion.weakness"), 750)) .fluidOutputs(new FluidStack(CppFluids.Mash, 750)).duration(6 * SECONDS + 8 * TICKS).eut(4) .addTo(brewingRecipes); // Sugar Related - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(CppItems.CppBerries, 1, 1)) + GTValues.RA.stdBuilder().itemInputs(new ItemStack(CppItems.CppBerries, 1, 1)) .itemOutputs(new ItemStack(Items.sugar, 8, 0)).duration(6 * SECONDS + 8 * TICKS).eut(4) .addTo(extractorRecipes); // Dyes from Plants for (ItemStack itemStack : OreDictionary.getOres("cropBlackberry")) { - GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + GTValues.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeblack"), 288)) .duration(30 * SECONDS).eut(48).addTo(UniversalChemical); } for (ItemStack itemStack : OreDictionary.getOres("cropBlueberry")) { - GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + GTValues.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeblue"), 288)) .duration(30 * SECONDS).eut(48).addTo(UniversalChemical); } for (ItemStack itemStack : OreDictionary.getOres("cropRaspberry")) { - GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + GTValues.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyepink"), 288)) .duration(30 * SECONDS).eut(48).addTo(UniversalChemical); } for (ItemStack itemStack : OreDictionary.getOres("cropVine")) { if (!itemStack.getUnlocalizedName().equals("tile.Thornvines")) { - GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + GTValues.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) .fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyegreen"), 288)) .duration(30 * SECONDS).eut(48).addTo(UniversalChemical); } else { - GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + GTValues.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) .fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeyellow"), 288)) .duration(30 * SECONDS).eut(48).addTo(UniversalChemical); @@ -413,21 +413,21 @@ public final void run() { } } for (ItemStack itemStack : OreDictionary.getOres("cropCacti")) { - GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + GTValues.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) .fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyegreen"), 288)) .duration(30 * SECONDS).eut(48).addTo(UniversalChemical); } for (ItemStack itemStack : OreDictionary.getOres("cropGooseberry")) { - GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + GTValues.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyeyellow"), 288)) .duration(30 * SECONDS).eut(48).addTo(UniversalChemical); } for (ItemStack itemStack : OreDictionary.getOres("cropStrawberry")) { - GT_Values.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) + GTValues.RA.stdBuilder().itemInputs(itemStack.splitStack(16), Materials.Salt.getDust(2)) .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyered"), 288)) .duration(30 * SECONDS).eut(48).addTo(UniversalChemical); @@ -436,41 +436,41 @@ public final void run() { if (BiomesOPlenty.isModLoaded()) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(BiomesOPlenty.ID, "food", 16), Materials.Salt.getDust(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(BiomesOPlenty.ID, "food", 16), Materials.Salt.getDust(2)) .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyered"), 288)) .duration(30 * SECONDS).eut(48).addTo(UniversalChemical); } - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(CppItems.CppBerries, 16, 0), Materials.Salt.getDust(2)) + GTValues.RA.stdBuilder().itemInputs(new ItemStack(CppItems.CppBerries, 16, 0), Materials.Salt.getDust(2)) .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyepurple"), 288)) .duration(30 * SECONDS).eut(48).addTo(UniversalChemical); if (Natura.isModLoaded()) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(Natura.ID, "berry.nether", 16, 0), Materials.Salt.getDust(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(Natura.ID, "berry.nether", 16, 0), Materials.Salt.getDust(2)) .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelime"), 288)) .duration(30 * SECONDS).eut(48).addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(Natura.ID, "berry.nether", 16, 1), Materials.Salt.getDust(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(Natura.ID, "berry.nether", 16, 1), Materials.Salt.getDust(2)) .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelightgray"), 288)) .duration(30 * SECONDS).eut(48).addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(Natura.ID, "berry.nether", 16, 2), Materials.Salt.getDust(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(Natura.ID, "berry.nether", 16, 2), Materials.Salt.getDust(2)) .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelightblue"), 288)) .duration(30 * SECONDS).eut(48).addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(Natura.ID, "berry.nether", 16, 3), Materials.Salt.getDust(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(Natura.ID, "berry.nether", 16, 3), Materials.Salt.getDust(2)) .itemOutputs(new ItemStack(Items.sugar)).fluidInputs(Materials.SulfuricAcid.getFluid(432)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("dye.chemical.dyelime"), 288)) .duration(30 * SECONDS).eut(48).addTo(UniversalChemical); @@ -478,51 +478,51 @@ public final void run() { } // Goldfish - GT_Values.RA.stdBuilder().itemInputs(CppItems.GoldfischS).itemOutputs(new ItemStack(Items.gold_nugget)) + GTValues.RA.stdBuilder().itemInputs(CppItems.GoldfischS).itemOutputs(new ItemStack(Items.gold_nugget)) .outputChances(1).fluidOutputs(Materials.FishOil.getFluid(100)).duration(16 * TICKS).eut(8) .addTo(fluidExtractionRecipes); - GT_Values.RA.stdBuilder().itemInputs(CppItems.GoldfischS) + GTValues.RA.stdBuilder().itemInputs(CppItems.GoldfischS) .itemOutputs(Materials.MeatRaw.getDust(1), Materials.Gold.getDustTiny(1)).outputChances(10000, 100) .duration(3 * TICKS).eut(8).addTo(maceratorRecipes); // Space Modifier - GT_Values.RA.stdBuilder().itemInputs(Materials.Iron.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) + GTValues.RA.stdBuilder().itemInputs(Materials.Iron.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) .itemOutputs(Materials.MeteoricIron.getDust(1)) .fluidInputs( Materials.UUMatter .getFluid(Materials.MeteoricIron.getNeutrons() + Materials.MeteoricIron.getProtons())) .duration(12 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Steel.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) + GTValues.RA.stdBuilder().itemInputs(Materials.Steel.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) .itemOutputs(Materials.MeteoricSteel.getDust(1)) .fluidInputs( Materials.UUMatter .getFluid(Materials.MeteoricSteel.getNeutrons() + Materials.MeteoricSteel.getProtons())) .duration(12 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Bismuth.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) + GTValues.RA.stdBuilder().itemInputs(Materials.Bismuth.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) .itemOutputs(Materials.Oriharukon.getDust(1)) .fluidInputs( Materials.UUMatter .getFluid(Materials.Oriharukon.getNeutrons() + Materials.Oriharukon.getProtons())) .duration(12 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Titanium.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) + GTValues.RA.stdBuilder().itemInputs(Materials.Titanium.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) .itemOutputs(Materials.Desh.getDust(1)) .fluidInputs(Materials.UUMatter.getFluid(Materials.Desh.getNeutrons() + Materials.Desh.getProtons())) .duration(12 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); // Non-elements - GT_Values.RA.stdBuilder().itemInputs(Materials.Ice.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) + GTValues.RA.stdBuilder().itemInputs(Materials.Ice.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) .itemOutputs(Materials.CallistoIce.getDust(1)) .fluidInputs( Materials.UUMatter .getFluid((Materials.Water.getProtons() + Materials.Water.getNeutrons()) * 10)) .duration(12 * SECONDS).eut(TierEU.RECIPE_IV).addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Lead.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) + GTValues.RA.stdBuilder().itemInputs(Materials.Lead.getDust(1), new ItemStack(CppItems.Modifier, 16, 0)) .itemOutputs(Materials.Ledox.getDust(1)) .fluidInputs( Materials.UUMatter @@ -531,23 +531,23 @@ public final void run() { if (Mods.Avaritia.isModLoaded()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem(Avaritia.ID, "Resource", 1, 1), + GTModHandler.getModItem(Avaritia.ID, "Resource", 1, 1), new ItemStack(CppItems.Modifier, 32, 0)) .itemOutputs(Materials.MysteriousCrystal.getDust(1)).fluidInputs(Materials.UUMatter.getFluid(100)) .duration(12 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(multiblockChemicalReactorRecipes); } - GT_Values.RA.stdBuilder().itemInputs(Materials.MeteoricIron.getDust(1), new ItemStack(CppItems.Modifier, 64, 0)) + GTValues.RA.stdBuilder().itemInputs(Materials.MeteoricIron.getDust(1), new ItemStack(CppItems.Modifier, 64, 0)) .itemOutputs(Materials.DeepIron.getDust(1)) .fluidInputs( Materials.UUMatter .getFluid((Materials.Neutronium.getNeutrons() + Materials.Neutronium.getProtons()))) .duration(6 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Plutonium241.getDust(1), new ItemStack(CppItems.Modifier, 64, 0)) + GTValues.RA.stdBuilder().itemInputs(Materials.Plutonium241.getDust(1), new ItemStack(CppItems.Modifier, 64, 0)) .itemOutputs(Materials.BlackPlutonium.getDust(1)) .fluidInputs( Materials.UUMatter @@ -557,48 +557,48 @@ public final void run() { if (Mods.Thaumcraft.isModLoaded()) { // Magic Modifier PrimP - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemEldritchObject", 1, 3)) + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Thaumcraft.ID, "ItemEldritchObject", 1, 3)) .itemOutputs(new ItemStack(CppItems.Modifier, 8, 1)).duration(6 * SECONDS + 8 * TICKS).eut(4) .addTo(extractorRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(CppItems.Modifier, 1, 1)) - .itemOutputs(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 16, 14)) + GTValues.RA.stdBuilder().itemInputs(new ItemStack(CppItems.Modifier, 1, 1)) + .itemOutputs(GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 16, 14)) .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(extractorRecipes); if (Mods.NewHorizonsCoreMod.isModLoaded()) { - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(CppItems.Modifier, 16, 1)) + GTValues.RA.stdBuilder().itemInputs(new ItemStack(CppItems.Modifier, 16, 1)) .itemOutputs(com.dreammaster.item.ItemList.PrimordialPearlFragment.getIS().splitStack(3)) .fluidInputs(Materials.UUMatter.getFluid(52)).duration(20 * MINUTES).eut(384) .addTo(RecipeMaps.autoclaveRecipes); } - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 32, 14)) + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 32, 14)) .itemOutputs(new ItemStack(CppItems.Modifier, 1, 1)).fluidInputs(Materials.UUMatter.getFluid(500)) .duration(2 * MINUTES).eut(TierEU.RECIPE_MV).addTo(RecipeMaps.autoclaveRecipes); // Magic Modifier - GT_Values.RA.stdBuilder().itemInputs(Materials.Iron.getDust(1), new ItemStack(CppItems.Modifier, 1, 1)) + GTValues.RA.stdBuilder().itemInputs(Materials.Iron.getDust(1), new ItemStack(CppItems.Modifier, 1, 1)) .itemOutputs(Materials.Thaumium.getDust(1)) .fluidInputs( Materials.UUMatter .getFluid(Materials.Thaumium.getNeutrons() + Materials.Thaumium.getProtons())) .duration(12 * SECONDS).eut(TierEU.RECIPE_MV).addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Thaumium.getDust(1), new ItemStack(CppItems.Modifier, 1, 1)) + GTValues.RA.stdBuilder().itemInputs(Materials.Thaumium.getDust(1), new ItemStack(CppItems.Modifier, 1, 1)) .itemOutputs(Materials.Void.getDust(1)) .fluidInputs( Materials.UUMatter .getFluid(Materials.Arsenic.getNeutrons() + Materials.Arsenic.getProtons())) .duration(12 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Void.getDust(1), new ItemStack(CppItems.Modifier, 2, 1)) + GTValues.RA.stdBuilder().itemInputs(Materials.Void.getDust(1), new ItemStack(CppItems.Modifier, 2, 1)) .itemOutputs(Materials.Shadow.getDust(1)) .fluidInputs( Materials.UUMatter.getFluid(Materials.Indium.getNeutrons() + Materials.Indium.getProtons())) .duration(12 * SECONDS).eut(TierEU.RECIPE_IV).addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder().itemInputs(Materials.Shadow.getDust(1), new ItemStack(CppItems.Modifier, 16, 1)) + GTValues.RA.stdBuilder().itemInputs(Materials.Shadow.getDust(1), new ItemStack(CppItems.Modifier, 16, 1)) .itemOutputs(Materials.Ichorium.getIngots(1)) .fluidInputs( Materials.UUMatter @@ -610,7 +610,7 @@ public final void run() { // Magic Modifier + Space Modifier - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(CppItems.Modifier, 16, 0), new ItemStack(CppItems.Modifier, 4, 1)) .itemOutputs(Materials.Mytryl.getDust(1)) .fluidInputs( @@ -620,114 +620,114 @@ public final void run() { .duration(1 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_IV).addTo(multiblockChemicalReactorRecipes); // coral buff - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(BiomesOPlenty.ID, "coral1", 64, 15)) + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(BiomesOPlenty.ID, "coral1", 64, 15)) .itemOutputs(Materials.Sunnarium.getDust(4)).fluidInputs(Materials.UUMatter.getFluid(2)) .duration(12 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_IV).requiresCleanRoom() .addTo(RecipeMaps.autoclaveRecipes); if (BiomesOPlenty.isModLoaded()) { - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(BiomesOPlenty.ID, "treeMoss", 8)) + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(BiomesOPlenty.ID, "treeMoss", 8)) .itemOutputs(Ic2Items.plantBall.copy()).duration(15 * SECONDS).eut(2).addTo(compressorRecipes); } // Not a noob trophy. - GT_Values.RA.stdBuilder().itemInputs(Materials.Neutronium.getBlocks(64), Materials.Neutronium.getBlocks(64)) + GTValues.RA.stdBuilder().itemInputs(Materials.Neutronium.getBlocks(64), Materials.Neutronium.getBlocks(64)) .itemOutputs(CppItems.Trophy).duration(29826 * HOURS + 9 * MINUTES + 42 * SECONDS + 7 * TICKS).eut(8) .addTo(extruderRecipes); // Space Flower UUM - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(CppItems.Modifier, 1, 0)) + GTValues.RA.stdBuilder().itemInputs(new ItemStack(CppItems.Modifier, 1, 0)) .fluidOutputs(Materials.UUMatter.getFluid(2L)).duration(6 * SECONDS + 8 * TICKS).eut(4) .addTo(fluidExtractionRecipes); // Chem Refine - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(CppItems.Modifier, 9, 0), - GT_ModHandler.getModItem(GalacticraftCore.ID, "item.meteoricIronRaw", 1, 0)) + GTModHandler.getModItem(GalacticraftCore.ID, "item.meteoricIronRaw", 1, 0)) .itemOutputs(Materials.MeteoricIron.getDust(4)).fluidInputs(Materials.Water.getFluid(1000)) .duration(12 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(CppItems.Modifier, 9, 0), - GT_ModHandler.getModItem("GalacticraftMars", "item.null", 1L, 0)) + GTModHandler.getModItem("GalacticraftMars", "item.null", 1L, 0)) .itemOutputs(Materials.Desh.getDust(4)).fluidInputs(Materials.Water.getFluid(1000)) .duration(12 * SECONDS).eut(TierEU.RECIPE_HV).addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.MeteoricIron), 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.MeteoricIron), 4)) + GTOreDictUnificator.get(OrePrefixes.crushed.get(Materials.MeteoricIron), 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.MeteoricIron), 4)) .fluidInputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_HV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.Desh), 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.Desh), 4)) + GTOreDictUnificator.get(OrePrefixes.crushed.get(Materials.Desh), 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.Desh), 4)) .fluidInputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_HV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.Oriharukon), 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.Oriharukon), 4)) + GTOreDictUnificator.get(OrePrefixes.crushed.get(Materials.Oriharukon), 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.Oriharukon), 4)) .fluidInputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_HV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.Ledox), 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.Ledox), 4)) + GTOreDictUnificator.get(OrePrefixes.crushed.get(Materials.Ledox), 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.Ledox), 4)) .fluidInputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_HV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.CallistoIce), 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.CallistoIce), 4)) + GTOreDictUnificator.get(OrePrefixes.crushed.get(Materials.CallistoIce), 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.CallistoIce), 4)) .fluidInputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_HV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.BlackPlutonium), 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.BlackPlutonium), 4)) + GTOreDictUnificator.get(OrePrefixes.crushed.get(Materials.BlackPlutonium), 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.BlackPlutonium), 4)) .fluidInputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LuV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(CppItems.Modifier, 9, 0), - GT_OreDictUnificator.get(OrePrefixes.crushed.get(Materials.DeepIron), 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.DeepIron), 4)) + GTOreDictUnificator.get(OrePrefixes.crushed.get(Materials.DeepIron), 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified.get(Materials.DeepIron), 4)) .fluidInputs(Materials.Water.getFluid(1000)).duration(12 * SECONDS).eut(TierEU.RECIPE_LuV) .addTo(multiblockChemicalReactorRecipes); // Potions from Netherberries - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(Natura.ID, "berry.nether", 16, 0)) + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Natura.ID, "berry.nether", 16, 0)) .fluidInputs(Materials.Water.getFluid(750)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.regen"), 750)) .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(brewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(Natura.ID, "berry.nether", 16, 1)) + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Natura.ID, "berry.nether", 16, 1)) .fluidInputs(Materials.Water.getFluid(750)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.nightvision"), 750)) .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(brewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(Natura.ID, "berry.nether", 16, 2)) + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Natura.ID, "berry.nether", 16, 2)) .fluidInputs(Materials.Water.getFluid(750)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.speed"), 750)) .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(brewingRecipes); - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(Natura.ID, "berry.nether", 16, 3)) + GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(Natura.ID, "berry.nether", 16, 3)) .fluidInputs(Materials.Water.getFluid(750)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("potion.strength"), 750)) .duration(6 * SECONDS + 8 * TICKS).eut(4).addTo(brewingRecipes); diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropGeneExtractor.java b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropGeneExtractor.java index 63891e5..1a38432 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropGeneExtractor.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropGeneExtractor.java @@ -27,22 +27,22 @@ import com.gtnewhorizons.modularui.api.math.Pos2d; import com.gtnewhorizons.modularui.common.widget.SlotWidget; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.SoundResource; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; +import gregtech.api.metatileentity.implementations.MTEBasicMachine; import gregtech.api.recipe.BasicUIProperties; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.behaviors.Behaviour_DataOrb; +import gregtech.api.util.GTUtility; +import gregtech.common.items.behaviors.BehaviourDataOrb; import ic2.api.crops.CropCard; import ic2.api.crops.Crops; -public class CropGeneExtractor extends GT_MetaTileEntity_BasicMachine { +public class CropGeneExtractor extends MTEBasicMachine { public CropGeneExtractor(int aID, String aName, String aNameRegional, int aTier) { super( @@ -122,26 +122,26 @@ public int checkRecipe(boolean skipOC) { switch (bStack.getItemDamage()) { case 1: - Behaviour_DataOrb.setDataTitle(this.mOutputItems[0], "Crop-Specimen-Scan"); - Behaviour_DataOrb + BehaviourDataOrb.setDataTitle(this.mOutputItems[0], "Crop-Specimen-Scan"); + BehaviourDataOrb .setDataName(this.mOutputItems[0], tNBT.getString("owner") + ":" + tNBT.getString("name")); break; case 2: - Behaviour_DataOrb.setDataTitle(this.mOutputItems[0], "Crop-Growth-Scan"); - Behaviour_DataOrb.setDataName(this.mOutputItems[0], Byte.toString(GrGaRe[0])); + BehaviourDataOrb.setDataTitle(this.mOutputItems[0], "Crop-Growth-Scan"); + BehaviourDataOrb.setDataName(this.mOutputItems[0], Byte.toString(GrGaRe[0])); break; case 3: - Behaviour_DataOrb.setDataTitle(this.mOutputItems[0], "Crop-Gain-Scan"); - Behaviour_DataOrb.setDataName(this.mOutputItems[0], Byte.toString(GrGaRe[1])); + BehaviourDataOrb.setDataTitle(this.mOutputItems[0], "Crop-Gain-Scan"); + BehaviourDataOrb.setDataName(this.mOutputItems[0], Byte.toString(GrGaRe[1])); break; case 4: - Behaviour_DataOrb.setDataTitle(this.mOutputItems[0], "Crop-Resistance-Scan"); - Behaviour_DataOrb.setDataName(this.mOutputItems[0], Byte.toString(GrGaRe[2])); + BehaviourDataOrb.setDataTitle(this.mOutputItems[0], "Crop-Resistance-Scan"); + BehaviourDataOrb.setDataName(this.mOutputItems[0], Byte.toString(GrGaRe[2])); break; default: break; } - long power = GT_Values.V[(card.tier() + 2) / 2]; + long power = GTValues.V[(card.tier() + 2) / 2]; calculateOverclockedNess((int) (power - (power / 10)), 6000); if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; @@ -153,7 +153,7 @@ public int checkRecipe(boolean skipOC) { public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) { super.startSoundLoop(aIndex, aX, aY, aZ); if (aIndex == 1) { - GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, 10, 1.0F, aX, aY, aZ); + GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, 10, 1.0F, aX, aY, aZ); } } @@ -165,7 +165,7 @@ public void startProcess() { public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) { if (ItemList.IC2_Crop_Seeds.isStackEqual(aStack, true, true)) return isValidSlot(aIndex) && aStack != null && aIndex < mInventory.length - && (mInventory[aIndex] == null || GT_Utility.areStacksEqual(aStack, mInventory[aIndex])) + && (mInventory[aIndex] == null || GTUtility.areStacksEqual(aStack, mInventory[aIndex])) && allowPutStack(getBaseMetaTileEntity(), aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); return false; } @@ -175,8 +175,8 @@ public boolean allowSelectCircuit() { return true; } - private static final FallbackableUITexture progressBarTexture = GT_UITextures - .fallbackableProgressbar("crop_gene_extractor", GT_UITextures.PROGRESSBAR_ARROW); + private static final FallbackableUITexture progressBarTexture = GTUITextures + .fallbackableProgressbar("crop_gene_extractor", GTUITextures.PROGRESSBAR_ARROW); @Override protected BasicUIProperties getUIProperties() { @@ -193,6 +193,6 @@ protected SlotWidget createItemInputSlot(int index, IDrawable[] backgrounds, Pos protected SlotWidget createSpecialSlot(IDrawable[] backgrounds, Pos2d pos, BasicUIProperties uiProperties) { return (SlotWidget) super.createSpecialSlot(backgrounds, pos, uiProperties) .setGTTooltip(() -> mTooltipCache.getData("bpp.machines.special_slot.tooltip")) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DATA_ORB); + .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_DATA_ORB); } } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropReplicator.java b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropReplicator.java index 8a38df7..5e7b564 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropReplicator.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropReplicator.java @@ -27,22 +27,22 @@ import com.gtnewhorizons.modularui.api.math.Pos2d; import com.gtnewhorizons.modularui.common.widget.SlotWidget; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.SoundResource; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; +import gregtech.api.metatileentity.implementations.MTEBasicMachine; import gregtech.api.recipe.BasicUIProperties; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import ic2.api.crops.CropCard; import ic2.api.crops.Crops; -public class CropReplicator extends GT_MetaTileEntity_BasicMachine { +public class CropReplicator extends MTEBasicMachine { public CropReplicator(int aID, String aName, String aNameRegional, int aTier) { super( @@ -100,13 +100,13 @@ public int checkRecipe(boolean skipOC) { ItemStack aStack = getInputAt(0); ItemStack bStack = getInputAt(1); - if (GT_Utility.areUnificationsEqual(aStack, Materials.UUMatter.getCells(1), true) + if (GTUtility.areUnificationsEqual(aStack, Materials.UUMatter.getCells(1), true) && ItemList.IC2_Crop_Seeds.isStackEqual(bStack, true, true)) { ItemStack helper = bStack; bStack = aStack; aStack = helper; } - if (GT_Utility.areUnificationsEqual(bStack, Materials.UUMatter.getCells(1), true) + if (GTUtility.areUnificationsEqual(bStack, Materials.UUMatter.getCells(1), true) && ItemList.IC2_Crop_Seeds.isStackEqual(aStack, true, true)) { NBTTagCompound tNBT = aStack.getTagCompound(); @@ -123,7 +123,7 @@ public int checkRecipe(boolean skipOC) { aStack.stackSize -= 1; this.mOutputItems[1] = Materials.Empty.getCells(card.tier()); - long power = GT_Values.V[(card.tier() + 2) / 2]; + long power = GTValues.V[(card.tier() + 2) / 2]; power *= mAmperage; calculateOverclockedNess((int) (power - (power / 10)), 12000); if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) @@ -136,7 +136,7 @@ public int checkRecipe(boolean skipOC) { public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) { super.startSoundLoop(aIndex, aX, aY, aZ); if (aIndex == 1) { - GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, 10, 1.0F, aX, aY, aZ); + GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, 10, 1.0F, aX, aY, aZ); } } @@ -146,11 +146,11 @@ public void startProcess() { @Override public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) { - if (GT_Utility.areUnificationsEqual(aStack, Materials.UUMatter.getCells(1), true) + if (GTUtility.areUnificationsEqual(aStack, Materials.UUMatter.getCells(1), true) || ItemList.IC2_Crop_Seeds.isStackEqual(aStack, true, true)) return isValidSlot(aIndex) && aStack != null && aIndex < mInventory.length - && (mInventory[aIndex] == null || GT_Utility.areStacksEqual(aStack, mInventory[aIndex])) + && (mInventory[aIndex] == null || GTUtility.areStacksEqual(aStack, mInventory[aIndex])) && allowPutStack( getBaseMetaTileEntity(), aIndex, @@ -159,8 +159,8 @@ && allowPutStack( return false; } - private static final FallbackableUITexture progressBarTexture = GT_UITextures - .fallbackableProgressbar("crop_replicator", GT_UITextures.PROGRESSBAR_ARROW); + private static final FallbackableUITexture progressBarTexture = GTUITextures + .fallbackableProgressbar("crop_replicator", GTUITextures.PROGRESSBAR_ARROW); @Override protected BasicUIProperties getUIProperties() { @@ -171,7 +171,7 @@ protected BasicUIProperties getUIProperties() { protected SlotWidget createItemInputSlot(int index, IDrawable[] backgrounds, Pos2d pos) { if (index == 0) { return (SlotWidget) super.createItemInputSlot(index, backgrounds, pos) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_CANISTER); + .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_CANISTER); } else { return (SlotWidget) super.createItemInputSlot(index, backgrounds, pos) .setBackground(getGUITextureSet().getItemSlot(), CPP_UITextures.OVERLAY_SLOT_SEED); diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropSynthesiser.java b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropSynthesiser.java index b78d644..a991fd5 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropSynthesiser.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropSynthesiser.java @@ -29,22 +29,22 @@ import com.gtnewhorizons.modularui.api.math.Pos2d; import com.gtnewhorizons.modularui.common.widget.SlotWidget; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.SoundResource; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; +import gregtech.api.metatileentity.implementations.MTEBasicMachine; import gregtech.api.recipe.BasicUIProperties; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.behaviors.Behaviour_DataOrb; +import gregtech.api.util.GTUtility; +import gregtech.common.items.behaviors.BehaviourDataOrb; import ic2.api.crops.CropCard; import ic2.api.crops.Crops; -public class CropSynthesiser extends GT_MetaTileEntity_BasicMachine { +public class CropSynthesiser extends MTEBasicMachine { public CropSynthesiser(int aID, String aName, String aNameRegional, int aTier) { super( @@ -115,7 +115,7 @@ public int checkRecipe(boolean skipOC) { HashMap CropStats = new HashMap<>(); for (byte i = 0; i <= 3; ++i) - CropStats.put(Behaviour_DataOrb.getDataTitle(aStacks[i]), Behaviour_DataOrb.getDataName(aStacks[i])); + CropStats.put(BehaviourDataOrb.getDataTitle(aStacks[i]), BehaviourDataOrb.getDataName(aStacks[i])); String owner = CropStats.get("Crop-Specimen-Scan"); String name = owner.split(":")[1]; @@ -149,7 +149,7 @@ public int checkRecipe(boolean skipOC) { this.mFluid.amount -= neededUUM; - long power = GT_Values.V[(card.tier() + 2) / 2]; + long power = GTValues.V[(card.tier() + 2) / 2]; power *= mAmperage; calculateOverclockedNess((int) (power - (power / 10)), 12000); @@ -164,7 +164,7 @@ public int checkRecipe(boolean skipOC) { public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) { super.startSoundLoop(aIndex, aX, aY, aZ); if (aIndex == 1) { - GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, 10, 1.0F, aX, aY, aZ); + GTUtility.doSoundAtClient(SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, 10, 1.0F, aX, aY, aZ); } } @@ -187,13 +187,13 @@ public int getCapacity() { public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) { if (ItemList.Tool_DataOrb.isStackEqual(aStack, false, true)) return isValidSlot(aIndex) && aStack != null && aIndex < mInventory.length - && (mInventory[aIndex] == null || GT_Utility.areStacksEqual(aStack, mInventory[aIndex])) + && (mInventory[aIndex] == null || GTUtility.areStacksEqual(aStack, mInventory[aIndex])) && allowPutStack(getBaseMetaTileEntity(), aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); return false; } - private static final FallbackableUITexture progressBarTexture = GT_UITextures - .fallbackableProgressbar("crop_synthesiser", GT_UITextures.PROGRESSBAR_ARROW); + private static final FallbackableUITexture progressBarTexture = GTUITextures + .fallbackableProgressbar("crop_synthesiser", GTUITextures.PROGRESSBAR_ARROW); @Override protected BasicUIProperties getUIProperties() { @@ -203,6 +203,6 @@ protected BasicUIProperties getUIProperties() { @Override protected SlotWidget createItemInputSlot(int index, IDrawable[] backgrounds, Pos2d pos) { return (SlotWidget) super.createItemInputSlot(index, backgrounds, pos) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DATA_ORB); + .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_DATA_ORB); } } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropWeedPicker.java b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropWeedPicker.java index 7fa45b3..6206074 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropWeedPicker.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropWeedPicker.java @@ -1,6 +1,6 @@ package com.github.bartimaeusnek.cropspp.GTHandler.machines; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -17,18 +17,18 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUIInfos; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Utility; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Pump; +import gregtech.api.util.GTUtility; +import gregtech.common.tileentities.machines.basic.MTEPump; import ic2.core.crop.TileEntityCrop; -public class CropWeedPicker extends GT_MetaTileEntity_Hatch { +public class CropWeedPicker extends MTEHatch { public CropWeedPicker(int aID, String aName, String aNameRegional, int aTier) { super( @@ -66,7 +66,7 @@ public int getCapacity() { public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) { return isValidSlot(aIndex) && aStack != null && aIndex < mInventory.length - && (mInventory[aIndex] == null || GT_Utility.areStacksEqual(aStack, mInventory[aIndex])) + && (mInventory[aIndex] == null || GTUtility.areStacksEqual(aStack, mInventory[aIndex])) && allowPutStack(getBaseMetaTileEntity(), aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); } @@ -108,15 +108,13 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (this.getBaseMetaTileEntity().isServerSide()) { if (!((this.getBaseMetaTileEntity().isAllowedToWork()) - && (GT_Utility.areStacksEqual(mInventory[0], CppItems.itemSpadeStack) - || GT_Utility.areStacksEqual(mInventory[0], ic2.core.Ic2Items.weedingTrowel)) + && (GTUtility.areStacksEqual(mInventory[0], CppItems.itemSpadeStack) + || GTUtility.areStacksEqual(mInventory[0], ic2.core.Ic2Items.weedingTrowel)) && (this.getFluid().amount >= 20) - && (this.getBaseMetaTileEntity() - .isUniversalEnergyStored(GT_MetaTileEntity_Pump.getEuUsagePerTier(this.mTier))))) + && (this.getBaseMetaTileEntity().isUniversalEnergyStored(MTEPump.getEuUsagePerTier(this.mTier))))) return; - this.getBaseMetaTileEntity() - .decreaseStoredEnergyUnits(GT_MetaTileEntity_Pump.getEuUsagePerTier(this.mTier), true); + this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(MTEPump.getEuUsagePerTier(this.mTier), true); this.getFluid().amount -= 20; int xmin = this.getBaseMetaTileEntity().getXCoord() > 0 @@ -157,7 +155,7 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -271,14 +269,14 @@ public ITexture[] getTexturesInactive(ITexture aBaseTexture) { @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)) + new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK).setPos(7, 16).setSize(71, 45)) .widget( new SlotWidget(inventoryHandler, getInputSlot()) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN) + .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_IN) .setPos(79, 16)) .widget(new TextWidget("Liquid Amount").setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 20)).widget( TextWidget - .dynamicString(() -> GT_Utility.parseNumberToString(mFluid != null ? mFluid.amount : 0)) + .dynamicString(() -> GTUtility.parseNumberToString(mFluid != null ? mFluid.amount : 0)) .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(10, 30)); } } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/crops/gregtechCrops/GarnydniaCrop.java b/src/main/java/com/github/bartimaeusnek/cropspp/crops/gregtechCrops/GarnydniaCrop.java index 10de955..d319d5e 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/crops/gregtechCrops/GarnydniaCrop.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/crops/gregtechCrops/GarnydniaCrop.java @@ -10,14 +10,14 @@ import com.github.bartimaeusnek.cropspp.ConfigValues; import com.github.bartimaeusnek.cropspp.abstracts.BasicCrop; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; import gregtech.api.objects.XSTR; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.common.blocks.GT_Block_Ores_Abstract; -import gregtech.common.blocks.GT_TileEntity_Ores; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.common.blocks.BlockOresAbstract; +import gregtech.common.blocks.TileEntityOres; import ic2.api.crops.ICropTile; public class GarnydniaCrop extends BasicCrop { @@ -106,13 +106,13 @@ public boolean isBlockBelow(ICropTile aCrop) { Block tBlock = aCrop.getWorld() .getBlock(aCrop.getLocation().posX, aCrop.getLocation().posY - i, aCrop.getLocation().posZ); - if (tBlock instanceof GT_Block_Ores_Abstract) { + if (tBlock instanceof BlockOresAbstract) { 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 + if (tTileEntity instanceof TileEntityOres) { + Materials tMaterial = GregTechAPI.sGeneratedMaterials[((TileEntityOres) tTileEntity).mMetaData % 1000]; if (tMaterial != null && tMaterial != Materials._NULL) { return tMaterial == Materials.GarnetRed || tMaterial == Materials.GarnetYellow; @@ -123,7 +123,7 @@ public boolean isBlockBelow(ICropTile aCrop) { aCrop.getLocation().posX, aCrop.getLocation().posY - i, aCrop.getLocation().posZ); - ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); + ItemData tAssotiation = GTOreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); if (tAssotiation != null && (tAssotiation.mPrefix.toString().startsWith("ore") || tAssotiation.mPrefix == OrePrefixes.block) @@ -152,13 +152,13 @@ public ItemStack getGain(ICropTile iCropTile) { int chance = XSTR.XSTR_INSTANCE.nextInt(100); - if (chance >= 95) drop = GT_OreDictUnificator.get(OrePrefixes.gemExquisite, dropMat, 1); + if (chance >= 95) drop = GTOreDictUnificator.get(OrePrefixes.gemExquisite, dropMat, 1); else if (chance >= 80) drop = dropMat.getGems(1); - else if (chance == 42) drop = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.GarnetSand, 1); + else if (chance == 42) drop = GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.GarnetSand, 1); else if (chance >= 40) drop = dropMat.getDust(1); - else if (chance == 23) drop = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, dropMat, 1); + else if (chance == 23) drop = GTOreDictUnificator.get(OrePrefixes.crushedPurified, dropMat, 1); else if (chance >= 20) drop = dropMat.getDustSmall(1); - else if (chance == 13 || chance == 17) drop = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, dropMat, 1); + else if (chance == 13 || chance == 17) drop = GTOreDictUnificator.get(OrePrefixes.crushedPurified, dropMat, 1); else drop = dropMat.getDustTiny(1); return drop; } diff --git a/src/main/java/com/github/bartimaeusnek/cropspp/fluids/AlkoholImpure.java b/src/main/java/com/github/bartimaeusnek/cropspp/fluids/AlkoholImpure.java index f541d60..beed92a 100644 --- a/src/main/java/com/github/bartimaeusnek/cropspp/fluids/AlkoholImpure.java +++ b/src/main/java/com/github/bartimaeusnek/cropspp/fluids/AlkoholImpure.java @@ -1,11 +1,11 @@ package com.github.bartimaeusnek.cropspp.fluids; -import static gregtech.api.enums.GT_Values.RES_PATH_BLOCK; +import static gregtech.api.enums.GTValues.RES_PATH_BLOCK; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; public class AlkoholImpure extends Fluid implements Runnable { @@ -20,13 +20,13 @@ public AlkoholImpure(String name, long d, String texture) { this.isGaseous = false; this.temperature = 295; this.density = this.viscosity; - GregTech_API.sGTBlockIconload.add(this); + GregTechAPI.sGTBlockIconload.add(this); FluidRegistry.registerFluid(this); } @Override public void run() { - setIcons(GregTech_API.sBlockIcons.registerIcon(RES_PATH_BLOCK + "fluids/fluid." + texture)); + setIcons(GregTechAPI.sBlockIcons.registerIcon(RES_PATH_BLOCK + "fluids/fluid." + texture)); } public long getPercentage() {