From eaefda2c02376f9016120f197239ac49f527fe82 Mon Sep 17 00:00:00 2001 From: DauphalXir Date: Fri, 4 Oct 2024 11:08:06 +0800 Subject: [PATCH] adapt270b2 --- dependencies.gradle | 28 ++-- .../common/api/enums/CustomItemList.java | 72 +++++----- .../NHUtilities/common/items/FuelRodList.java | 80 +++++------ .../items/aItemCore/RadioactiveItem.java | 4 +- .../common/items/itemFuelRod/FuelRod.java | 4 +- .../NHUtilities_TC_ElectricBlastFurnace.java | 96 ++++++------- .../common/recipes/GTRecipes/GTRecipes.java | 127 +++++++++--------- .../TCRecipes/ArcaneCraftingRecipes.java | 4 +- .../common/research/GTApiResearch.java | 46 +++---- .../BaseMetaTileEntityAcceleration_Mixin.java | 12 +- .../late/GregTech/DisableDebuff_Mixin.java | 4 +- 11 files changed, 241 insertions(+), 236 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 56b76df..abe7951 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,20 +1,21 @@ dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.66:dev") - implementation('com.github.GTNewHorizons:NewHorizonsCoreMod:2.5.16:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.25:dev') + implementation('com.github.GTNewHorizons:NewHorizonsCoreMod:2.6.57:dev') - implementation("com.github.GTNewHorizons:EnderIO:2.8.9:dev") - implementation("com.github.GTNewHorizons:ae2stuff:0.8.2-GTNH:dev") + implementation("com.github.GTNewHorizons:EnderIO:2.8.17:dev") + implementation("com.github.GTNewHorizons:ae2stuff:0.8.3-GTNH:dev") // bauble things & extended things - implementation("com.github.GTNewHorizons:Baubles:1.0.4:dev") - implementation("com.github.GTNewHorizons:Draconic-Evolution:1.3.5-GTNH:dev") - implementation("com.github.GTNewHorizons:Botania:1.11.3-GTNH:dev") + implementation("com.github.GTNewHorizons:Baubles:1.0.4:dev") // late + // implementation("com.github.GTNewHorizons:Baubles-Expanded:2.0.3:dev") + implementation("com.github.GTNewHorizons:Draconic-Evolution:1.3.11.GTNH:dev") + implementation("com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev") // Avaritia things - implementation("com.github.GTNewHorizons:Avaritia:1.49:dev") - implementation("com.github.GTNewHorizons:Avaritiaddons:1.7.1-GTNH:dev") + implementation("com.github.GTNewHorizons:Avaritia:1.52:dev") + implementation("com.github.GTNewHorizons:Avaritiaddons:1.8.3-GTNH:dev") implementation("com.github.GTNewHorizons:Eternal-Singularity:1.2.1:dev") - implementation("com.github.GTNewHorizons:Universal-Singularities:8.7.0:dev") + implementation("com.github.GTNewHorizons:Universal-Singularities:8.8.0:dev") // worldedit modified implementation("com.github.GTNewHorizons:worldedit-gtnh:v0.0.7:dev") @@ -23,16 +24,15 @@ dependencies { implementation("com.github.GTNewHorizons:SpiceOfLife:2.1.12-carrot:dev") // jabba - implementation("com.github.GTNewHorizons:Jabba:1.3.5:dev") + implementation("com.github.GTNewHorizons:Jabba:1.4.6:dev") // debug info & nbtEdit - runtimeOnly("com.github.GTNewHorizons:ServerUtilities:2.0.66:dev") + runtimeOnly("com.github.GTNewHorizons:ServerUtilities:2.0.79:dev") runtimeOnly files("libs/ForgeNBTEdit.jar") runtimeOnly files("libs/inventorytweaks-1.7.0-dev.jar") // Thaumcraft things - implementation('com.github.GTNewHorizons:ThaumicTinkerer:2.9.4:dev') - implementation('com.github.GTNewHorizons:WitchingGadgets:1.5.0-GTNH:dev') + implementation('com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev') } diff --git a/src/main/java/com/xir/NHUtilities/common/api/enums/CustomItemList.java b/src/main/java/com/xir/NHUtilities/common/api/enums/CustomItemList.java index 59101f2..7a0bea3 100644 --- a/src/main/java/com/xir/NHUtilities/common/api/enums/CustomItemList.java +++ b/src/main/java/com/xir/NHUtilities/common/api/enums/CustomItemList.java @@ -1,7 +1,7 @@ package com.xir.NHUtilities.common.api.enums; -import static gregtech.api.enums.GT_Values.NI; -import static gregtech.api.enums.GT_Values.W; +import static gregtech.api.enums.GTValues.NI; +import static gregtech.api.enums.GTValues.W; import java.util.Locale; @@ -10,11 +10,11 @@ import net.minecraft.item.ItemStack; import gregtech.api.interfaces.IItemContainer; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; @SuppressWarnings("deprecation") public enum CustomItemList implements IItemContainer { @@ -42,28 +42,28 @@ public IItemContainer set(Item aItem) { mHasNotBeenSet = false; if (aItem == null) 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; } @Override public Item getItem() { sanityCheck(); - if (GT_Utility.isStackInvalid(mStack)) return null; + if (GTUtility.isStackInvalid(mStack)) return null; return mStack.getItem(); } @Override public Block getBlock() { sanityCheck(); - return GT_Utility.getBlockFromItem(getItem()); + return GTUtility.getBlockFromItem(getItem()); } @Override @@ -79,50 +79,50 @@ public boolean isStackEqual(Object aStack) { @Override public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT) { if (mDeprecated && !mWarned) { - new Exception(this + " is now deprecated").printStackTrace(GT_Log.err); + new Exception(this + " is now deprecated").printStackTrace(GTLog.err); // warn only once mWarned = true; } - if (GT_Utility.isStackInvalid(aStack)) return false; - return GT_Utility.areUnificationsEqual((ItemStack) aStack, aWildcard ? getWildcard(1) : get(1), aIgnoreNBT); + if (GTUtility.isStackInvalid(aStack)) return false; + return GTUtility.areUnificationsEqual((ItemStack) aStack, aWildcard ? getWildcard(1) : get(1), aIgnoreNBT); } @Override public ItemStack get(long aAmount, Object... aReplacements) { sanityCheck(); - if (GT_Utility.isStackInvalid(mStack)) { - GT_Log.out.println("Object in the ItemList is null at:"); - new NullPointerException().printStackTrace(GT_Log.out); - return GT_Utility.copyAmount(aAmount, aReplacements); + if (GTUtility.isStackInvalid(mStack)) { + GTLog.out.println("Object in the ItemList is null at:"); + new NullPointerException().printStackTrace(GTLog.out); + return GTUtility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(mStack)); + return GTUtility.copyAmount(aAmount, GTOreDictUnificator.get(mStack)); } @Override public ItemStack getWildcard(long aAmount, Object... aReplacements) { sanityCheck(); - if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements); - return GT_Utility.copyAmountAndMetaData(aAmount, W, GT_OreDictUnificator.get(mStack)); + if (GTUtility.isStackInvalid(mStack)) return GTUtility.copyAmount(aAmount, aReplacements); + return GTUtility.copyAmountAndMetaData(aAmount, W, GTOreDictUnificator.get(mStack)); } @Override public ItemStack getUndamaged(long aAmount, Object... aReplacements) { sanityCheck(); - if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements); - return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(mStack)); + if (GTUtility.isStackInvalid(mStack)) return GTUtility.copyAmount(aAmount, aReplacements); + return GTUtility.copyAmountAndMetaData(aAmount, 0, GTOreDictUnificator.get(mStack)); } @Override public ItemStack getAlmostBroken(long aAmount, Object... aReplacements) { sanityCheck(); - if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements); - return GT_Utility.copyAmountAndMetaData(aAmount, mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(mStack)); + if (GTUtility.isStackInvalid(mStack)) return GTUtility.copyAmount(aAmount, aReplacements); + 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)) return NI; + if (GTUtility.isStackInvalid(rStack)) return NI; // CamelCase alphanumeric words from aDisplayName StringBuilder tCamelCasedDisplayNameBuilder = new StringBuilder(); @@ -143,36 +143,36 @@ public ItemStack getWithName(long aAmount, String aDisplayName, Object... aRepla // Construct a translation key from UnlocalizedName and CamelCased DisplayName final String tKey = rStack.getUnlocalizedName() + ".with." + tCamelCasedDisplayNameBuilder + ".name"; - rStack.setStackDisplayName(GT_LanguageManager.addStringLocalization(tKey, aDisplayName)); - return GT_Utility.copyAmount(aAmount, rStack); + rStack.setStackDisplayName(GTLanguageManager.addStringLocalization(tKey, aDisplayName)); + 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)) return null; - GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false); - return GT_Utility.copyAmount(aAmount, rStack); + if (GTUtility.isStackInvalid(rStack)) return null; + GTModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false); + return GTUtility.copyAmount(aAmount, rStack); } @Override public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements) { sanityCheck(); - if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements); - return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(mStack)); + if (GTUtility.isStackInvalid(mStack)) return GTUtility.copyAmount(aAmount, aReplacements); + return GTUtility.copyAmountAndMetaData(aAmount, aMetaValue, GTOreDictUnificator.get(mStack)); } @Override public IItemContainer registerOre(Object... aOreNames) { sanityCheck(); - for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, get(1)); + for (Object tOreName : aOreNames) GTOreDictUnificator.registerOre(tOreName, get(1)); return this; } @Override public IItemContainer registerWildcardAsOre(Object... aOreNames) { sanityCheck(); - for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, getWildcard(1)); + for (Object tOreName : aOreNames) GTOreDictUnificator.registerOre(tOreName, getWildcard(1)); return this; } @@ -184,7 +184,7 @@ private void sanityCheck() { if (mHasNotBeenSet) throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!"); if (mDeprecated && !mWarned) { - new Exception(this + " is now deprecated").printStackTrace(GT_Log.err); + new Exception(this + " is now deprecated").printStackTrace(GTLog.err); // warn only once mWarned = true; } diff --git a/src/main/java/com/xir/NHUtilities/common/items/FuelRodList.java b/src/main/java/com/xir/NHUtilities/common/items/FuelRodList.java index 69ae285..24a2c64 100644 --- a/src/main/java/com/xir/NHUtilities/common/items/FuelRodList.java +++ b/src/main/java/com/xir/NHUtilities/common/items/FuelRodList.java @@ -16,20 +16,20 @@ public class FuelRodList { public static ItemBasic primordialPearlDust; public static DepletedFuelRod depletedFuelRodExcitedRadianceUranium; - public static DepletedFuelRod depletedFuelRodExcitedRadianceUranium_2; - public static DepletedFuelRod depletedFuelRodExcitedRadianceUranium_4; + public static DepletedFuelRod depletedFuelRodExcitedRadianceUranium2; + public static DepletedFuelRod depletedFuelRodExcitedRadianceUranium4; public static DepletedFuelRod depletedFuelRodSuperExcitedPrimordialPearlPlutonium; - public static DepletedFuelRod depletedFuelRodSuperExcitedPrimordialPearlPlutonium_2; - public static DepletedFuelRod depletedFuelRodSuperExcitedPrimordialPearlPlutonium_4; + public static DepletedFuelRod depletedFuelRodSuperExcitedPrimordialPearlPlutonium2; + public static DepletedFuelRod depletedFuelRodSuperExcitedPrimordialPearlPlutonium4; public static FuelRod fuelRodExcitedRadianceUranium; - public static FuelRod fuelRodExcitedRadianceUranium_2; - public static FuelRod fuelRodExcitedRadianceUranium_4; + public static FuelRod fuelRodExcitedRadianceUranium2; + public static FuelRod fuelRodExcitedRadianceUranium4; public static FuelRod fuelRodSuperExcitedPrimordialPearlPlutonium; - public static FuelRod fuelRodSuperExcitedPrimordialPearlPlutonium_2; - public static FuelRod fuelRodSuperExcitedPrimordialPearlPlutonium_4; + public static FuelRod fuelRodSuperExcitedPrimordialPearlPlutonium2; + public static FuelRod fuelRodSuperExcitedPrimordialPearlPlutonium4; public static void fuelRodInit() { @@ -40,74 +40,74 @@ public static void fuelRodInit() { primordialPearlDust = new ItemBasic("primordialPearlDust"); depletedFuelRodExcitedRadianceUranium = new DepletedFuelRod("depletedFuelRodExcitedRadianceUranium", 100); - depletedFuelRodExcitedRadianceUranium_2 = new DepletedFuelRod("depletedFuelRodExcitedRadianceUranium_2", 200); - depletedFuelRodExcitedRadianceUranium_4 = new DepletedFuelRod("depletedFuelRodExcitedRadianceUranium_4", 400); + depletedFuelRodExcitedRadianceUranium2 = new DepletedFuelRod("depletedFuelRodExcitedRadianceUranium_2", 200); + depletedFuelRodExcitedRadianceUranium4 = new DepletedFuelRod("depletedFuelRodExcitedRadianceUranium_4", 400); depletedFuelRodSuperExcitedPrimordialPearlPlutonium = new DepletedFuelRod( "depletedFuelRodSuperExcitedPrimordialPearlPlutonium", 800); - depletedFuelRodSuperExcitedPrimordialPearlPlutonium_2 = new DepletedFuelRod( + depletedFuelRodSuperExcitedPrimordialPearlPlutonium2 = new DepletedFuelRod( "depletedFuelRodSuperExcitedPrimordialPearlPlutonium_2", 1600); - depletedFuelRodSuperExcitedPrimordialPearlPlutonium_4 = new DepletedFuelRod( + depletedFuelRodSuperExcitedPrimordialPearlPlutonium4 = new DepletedFuelRod( "depletedFuelRodSuperExcitedPrimordialPearlPlutonium_4", 3200); fuelRodExcitedRadianceUranium = new FuelRod( "fuelRodExcitedRadianceUranium", 1, - 2000, - 26, + 20000, + 64, 4000, 86400, 0F, new ItemStack(depletedFuelRodExcitedRadianceUranium, 1)); - fuelRodExcitedRadianceUranium_2 = new FuelRod( + fuelRodExcitedRadianceUranium2 = new FuelRod( "fuelRodExcitedRadianceUranium_2", 2, - 2000, - 26, + 20000, + 64, 4000, 86400, 0F, - new ItemStack(depletedFuelRodExcitedRadianceUranium_2, 1)); - fuelRodExcitedRadianceUranium_4 = new FuelRod( + new ItemStack(depletedFuelRodExcitedRadianceUranium2, 1)); + fuelRodExcitedRadianceUranium4 = new FuelRod( "fuelRodExcitedRadianceUranium_4", 4, - 2000, - 26, + 20000, + 64, 4000, 86400, 0F, - new ItemStack(depletedFuelRodExcitedRadianceUranium_4, 1)); + new ItemStack(depletedFuelRodExcitedRadianceUranium4, 1)); fuelRodSuperExcitedPrimordialPearlPlutonium = new FuelRod( "fuelRodSuperExcitedPrimordialPearlPlutonium", 1, - 8600, + 86000, 80, 12800, 15000, - 3.3F, + 6.3F, new ItemStack(depletedFuelRodSuperExcitedPrimordialPearlPlutonium, 1)); - fuelRodSuperExcitedPrimordialPearlPlutonium_2 = new FuelRod( + fuelRodSuperExcitedPrimordialPearlPlutonium2 = new FuelRod( "fuelRodSuperExcitedPrimordialPearlPlutonium_2", 2, - 8600, + 86000, 80, 12800, 15000, - 3.3F, - new ItemStack(depletedFuelRodSuperExcitedPrimordialPearlPlutonium_2, 1)); - fuelRodSuperExcitedPrimordialPearlPlutonium_4 = new FuelRod( + 6.3F, + new ItemStack(depletedFuelRodSuperExcitedPrimordialPearlPlutonium2, 1)); + fuelRodSuperExcitedPrimordialPearlPlutonium4 = new FuelRod( "fuelRodSuperExcitedPrimordialPearlPlutonium_4", 4, - 8600, + 86000, 80, 12800, 15000, - 3.3F, - new ItemStack(depletedFuelRodSuperExcitedPrimordialPearlPlutonium_4, 1)); + 6.3F, + new ItemStack(depletedFuelRodSuperExcitedPrimordialPearlPlutonium4, 1)); RegisterUtils.registerItem(ichorFuelRod); RegisterUtils.registerItem(shadowFuelRod); @@ -115,20 +115,20 @@ public static void fuelRodInit() { RegisterUtils.registerItem(primordialPearlDust); RegisterUtils.registerItem(depletedFuelRodExcitedRadianceUranium); - RegisterUtils.registerItem(depletedFuelRodExcitedRadianceUranium_2); - RegisterUtils.registerItem(depletedFuelRodExcitedRadianceUranium_4); + RegisterUtils.registerItem(depletedFuelRodExcitedRadianceUranium2); + RegisterUtils.registerItem(depletedFuelRodExcitedRadianceUranium4); RegisterUtils.registerItem(fuelRodExcitedRadianceUranium); - RegisterUtils.registerItem(fuelRodExcitedRadianceUranium_2); - RegisterUtils.registerItem(fuelRodExcitedRadianceUranium_4); + RegisterUtils.registerItem(fuelRodExcitedRadianceUranium2); + RegisterUtils.registerItem(fuelRodExcitedRadianceUranium4); RegisterUtils.registerItem(depletedFuelRodSuperExcitedPrimordialPearlPlutonium); - RegisterUtils.registerItem(depletedFuelRodSuperExcitedPrimordialPearlPlutonium_2); - RegisterUtils.registerItem(depletedFuelRodSuperExcitedPrimordialPearlPlutonium_4); + RegisterUtils.registerItem(depletedFuelRodSuperExcitedPrimordialPearlPlutonium2); + RegisterUtils.registerItem(depletedFuelRodSuperExcitedPrimordialPearlPlutonium4); RegisterUtils.registerItem(fuelRodSuperExcitedPrimordialPearlPlutonium); - RegisterUtils.registerItem(fuelRodSuperExcitedPrimordialPearlPlutonium_2); - RegisterUtils.registerItem(fuelRodSuperExcitedPrimordialPearlPlutonium_4); + RegisterUtils.registerItem(fuelRodSuperExcitedPrimordialPearlPlutonium2); + RegisterUtils.registerItem(fuelRodSuperExcitedPrimordialPearlPlutonium4); } } diff --git a/src/main/java/com/xir/NHUtilities/common/items/aItemCore/RadioactiveItem.java b/src/main/java/com/xir/NHUtilities/common/items/aItemCore/RadioactiveItem.java index 9a7a426..318c35a 100644 --- a/src/main/java/com/xir/NHUtilities/common/items/aItemCore/RadioactiveItem.java +++ b/src/main/java/com/xir/NHUtilities/common/items/aItemCore/RadioactiveItem.java @@ -7,7 +7,7 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import ic2.core.IC2Potion; public class RadioactiveItem extends ItemBasic { @@ -23,7 +23,7 @@ public RadioactiveItem(String name, int mRadio) { public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int slot, boolean isHeld) { super.onUpdate(stack, worldIn, entityIn, slot, isHeld); EntityLivingBase tPlayer = (EntityPlayer) entityIn; - if (!GT_Utility.isWearingFullRadioHazmat(tPlayer)) { + if (!GTUtility.isWearingFullRadioHazmat(tPlayer)) { tPlayer.addPotionEffect(new PotionEffect(IC2Potion.radiation.id, mRadio, 4)); } } diff --git a/src/main/java/com/xir/NHUtilities/common/items/itemFuelRod/FuelRod.java b/src/main/java/com/xir/NHUtilities/common/items/itemFuelRod/FuelRod.java index a7d0640..2a9059a 100644 --- a/src/main/java/com/xir/NHUtilities/common/items/itemFuelRod/FuelRod.java +++ b/src/main/java/com/xir/NHUtilities/common/items/itemFuelRod/FuelRod.java @@ -14,7 +14,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import ic2.api.item.IBoxable; import ic2.api.reactor.IReactor; import ic2.api.reactor.IReactorComponent; @@ -94,7 +94,7 @@ public void processChamber(IReactor reactor, ItemStack stack, int x, int y, bool } } if (this.getCustomDamage(stack) >= this.getMaxCustomDamage() - 1) { - reactor.setItemAt(x, y, GT_Utility.copyAmount(1, depletedResult)); + reactor.setItemAt(x, y, GTUtility.copyAmount(1, depletedResult)); } else if (heatRun) { this.setCustomDamage(stack, this.getCustomDamage(stack) + 1); } diff --git a/src/main/java/com/xir/NHUtilities/common/machine/multi/NHUtilities_TC_ElectricBlastFurnace.java b/src/main/java/com/xir/NHUtilities/common/machine/multi/NHUtilities_TC_ElectricBlastFurnace.java index 7b7aca2..49f779d 100644 --- a/src/main/java/com/xir/NHUtilities/common/machine/multi/NHUtilities_TC_ElectricBlastFurnace.java +++ b/src/main/java/com/xir/NHUtilities/common/machine/multi/NHUtilities_TC_ElectricBlastFurnace.java @@ -2,22 +2,22 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static com.xir.NHUtilities.main.ReferencedInfo.MOD_NAME; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.enums.GT_Values.VN; +import static gregtech.api.enums.GTValues.VN; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.InputHatch; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.Muffler; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE_GLOW; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_GLOW; import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.ofCoil; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.ofCoil; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.util.ArrayList; import java.util.Arrays; @@ -40,8 +40,8 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import com.xir.NHUtilities.config.Config; -import gregtech.GT_Mod; -import gregtech.api.GregTech_API; +import gregtech.GTMod; +import gregtech.api.GregTechAPI; import gregtech.api.enums.HeatingCoilLevel; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; @@ -51,26 +51,26 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_AbstractMultiFurnace; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; +import gregtech.common.tileentities.machines.multi.MTEAbstractMultiFurnace; -public class NHUtilities_TC_ElectricBlastFurnace extends - GT_MetaTileEntity_AbstractMultiFurnace implements ISurvivalConstructable { +public class NHUtilities_TC_ElectricBlastFurnace extends MTEAbstractMultiFurnace + implements ISurvivalConstructable { private int mHeatingCapacity = 0; - protected final ArrayList mPollutionOutputHatches = new ArrayList<>(); + protected final ArrayList mPollutionOutputHatches = new ArrayList<>(); protected final FluidStack[] pollutionFluidStacks = { Materials.CarbonDioxide.getGas(1000), Materials.CarbonMonoxide.getGas(1000), Materials.SulfurDioxide.getGas(1000) }; protected static final int CASING_INDEX = 11; @@ -98,7 +98,7 @@ public class NHUtilities_TC_ElectricBlastFurnace extends .withCount(t -> t.mPollutionOutputHatches.size())) .casingIndex(CASING_INDEX) .dot(1) - .buildAndChain(GregTech_API.sBlockCasings1, CASING_INDEX)) + .buildAndChain(GregTechAPI.sBlockCasings1, CASING_INDEX)) .addElement('m', Muffler.newAny(CASING_INDEX, 2)) .addElement( 'C', @@ -111,16 +111,16 @@ public class NHUtilities_TC_ElectricBlastFurnace extends .atLeast(InputHatch, OutputHatch, InputBus, OutputBus, Maintenance, Energy) .casingIndex(CASING_INDEX) .dot(1) - .buildAndChain(GregTech_API.sBlockCasings1, CASING_INDEX)) + .buildAndChain(GregTechAPI.sBlockCasings1, CASING_INDEX)) .build(); public boolean addOutputHatchToTopList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return mPollutionOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchOutput) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return mPollutionOutputHatches.add((MTEHatchOutput) aMetaTileEntity); } return false; } @@ -141,7 +141,7 @@ public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack a if (!checkPiece(STRUCTURE_PIECE_MAIN, 1, 3, 0)) return false; if (getCoilLevel() == HeatingCoilLevel.None) return false; if (mMaintenanceHatches.size() != 1) return false; - this.mHeatingCapacity = (int) getCoilLevel().getHeat() + 100 * (GT_Utility.getTier(getMaxInputVoltage()) - 2); + this.mHeatingCapacity = (int) getCoilLevel().getHeat() + 100 * (GTUtility.getTier(getMaxInputVoltage()) - 2); return true; } @@ -156,8 +156,8 @@ public IStructureDefinition getStructureDef } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(StatCollector.translateToLocal("nhu.tcebf.machine.type")) .addInfo(StatCollector.translateToLocal("nhu.tcebf.machine.info_1")) .addInfo(StatCollector.translateToLocal("nhu.tcebf.machine.info_2")) @@ -244,7 +244,7 @@ private ITexture[] tcCustomTexture(ForgeDirection side, ForgeDirection aFacing, @Override public int getPollutionPerSecond(ItemStack aStack) { - return GT_Mod.gregtechproxy.mPollutionEBFPerSecond; + return GTMod.gregtechproxy.mPollutionEBFPerSecond; } @Override @@ -259,7 +259,7 @@ protected ProcessingLogic createProcessingLogic() { @Nonnull @Override - protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe) { + protected OverclockCalculator createOverclockCalculator(@Nonnull GTRecipe recipe) { return super.createOverclockCalculator(recipe).setRecipeHeat(recipe.mSpecialValue) .setMachineHeat(mHeatingCapacity) .setHeatOC(true) @@ -267,7 +267,7 @@ protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe re } @Override - protected @Nonnull CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) { + protected @Nonnull CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) { return recipe.mSpecialValue <= mHeatingCapacity ? CheckRecipeResultRegistry.SUCCESSFUL : CheckRecipeResultRegistry.insufficientHeat(recipe.mSpecialValue); } @@ -280,7 +280,7 @@ protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe re public boolean addOutput(FluidStack aLiquid) { if (aLiquid == null) return false; FluidStack tLiquid = aLiquid.copy(); - ArrayList tOutputHatches; + ArrayList tOutputHatches; if (isPollutionFluid(tLiquid)) { tOutputHatches = this.mPollutionOutputHatches; multiplyPollutionFluidAmount(tLiquid); @@ -310,7 +310,7 @@ public List getFluidOutputSlots(FluidStack[] toOutput) { public int getPollutionReduction() { int reduction = 100; - for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) { + for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) { reduction = Math.min(tHatch.calculatePollutionReduction(100), reduction); } return reduction; @@ -325,7 +325,7 @@ public String[] getInfoData() { int mPollutionReduction = getPollutionReduction(); long storedEnergy = 0; long maxEnergy = 0; - for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) { + for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) { storedEnergy += tHatch.getBaseMetaTileEntity() .getStoredEU(); maxEnergy += tHatch.getBaseMetaTileEntity() @@ -335,36 +335,36 @@ public String[] getInfoData() { return new String[] { StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(mProgresstime / 20) + + GTUtility.formatNumbers(mProgresstime / 20) + EnumChatFormatting.RESET + " s / " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(mMaxProgresstime / 20) + + GTUtility.formatNumbers(mMaxProgresstime / 20) + EnumChatFormatting.RESET + " s", StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(storedEnergy) + + GTUtility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(maxEnergy) + + GTUtility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU", StatCollector.translateToLocal("GT5U.multiblock.usage") + ": " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(-mEUt) + + GTUtility.formatNumbers(-mEUt) + EnumChatFormatting.RESET + " EU/t", StatCollector.translateToLocal("GT5U.multiblock.mei") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(getMaxInputVoltage()) + + GTUtility.formatNumbers(getMaxInputVoltage()) + EnumChatFormatting.RESET + " EU/t(*2A) " + StatCollector.translateToLocal("GT5U.machines.tier") + ": " + EnumChatFormatting.YELLOW - + VN[GT_Utility.getTier(getMaxInputVoltage())] + + VN[GTUtility.getTier(getMaxInputVoltage())] + EnumChatFormatting.RESET, StatCollector.translateToLocal("GT5U.multiblock.problems") + ": " + EnumChatFormatting.RED @@ -379,7 +379,7 @@ public String[] getInfoData() { + " %", StatCollector.translateToLocal("GT5U.EBF.heat") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(mHeatingCapacity) + + GTUtility.formatNumbers(mHeatingCapacity) + EnumChatFormatting.RESET + " K", StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " @@ -398,7 +398,7 @@ public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBu @Override public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { inputSeparation = !inputSeparation; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); } diff --git a/src/main/java/com/xir/NHUtilities/common/recipes/GTRecipes/GTRecipes.java b/src/main/java/com/xir/NHUtilities/common/recipes/GTRecipes/GTRecipes.java index 04ffb83..da91627 100644 --- a/src/main/java/com/xir/NHUtilities/common/recipes/GTRecipes/GTRecipes.java +++ b/src/main/java/com/xir/NHUtilities/common/recipes/GTRecipes/GTRecipes.java @@ -1,25 +1,24 @@ package com.xir.NHUtilities.common.recipes.GTRecipes; -import static com.github.technus.tectech.thing.CustomItemList.hatch_CreativeMaintenance; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.extractorRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; -import static witchinggadgets.common.WGContent.ItemMaterial; +import static tectech.thing.CustomItemList.hatch_CreativeMaintenance; import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.xir.NHUtilities.common.items.FuelRodList; -import goodgenerator.items.MyMaterial; -import gregtech.api.enums.GT_Values; +import bartworks.system.material.WerkstoffLoader; +import goodgenerator.items.GGMaterial; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import thaumic.tinkerer.common.ThaumicTinkerer; import thaumic.tinkerer.common.item.kami.ItemKamiResource; @@ -30,123 +29,129 @@ public class GTRecipes { public static void registerNHUtilitiesGTRecipe() { // ichor fuel rod - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 4), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Ichorium, 2), - GT_Utility.getIntegratedCircuit(2)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 4), + GTOreDictUnificator.get(OrePrefixes.ring, Materials.Ichorium, 2), + GTUtility.getIntegratedCircuit(2)) .itemOutputs(new ItemStack(FuelRodList.ichorFuelRod, 1)) .duration(50 * SECOND) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(FuelRodList.fuelRodSuperExcitedPrimordialPearlPlutonium, 2), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Ichorium, 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(new ItemStack(FuelRodList.fuelRodSuperExcitedPrimordialPearlPlutonium_2, 1)) + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Ichorium, 4), + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(new ItemStack(FuelRodList.fuelRodSuperExcitedPrimordialPearlPlutonium2, 1)) .duration(10 * SECOND) .noOptimize() .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(FuelRodList.fuelRodSuperExcitedPrimordialPearlPlutonium, 4), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Ichorium, 6), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(new ItemStack(FuelRodList.fuelRodSuperExcitedPrimordialPearlPlutonium_4, 1)) + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Ichorium, 6), + GTUtility.getIntegratedCircuit(4)) + .itemOutputs(new ItemStack(FuelRodList.fuelRodSuperExcitedPrimordialPearlPlutonium4, 1)) .duration(10 * SECOND) .noOptimize() .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - new ItemStack(FuelRodList.fuelRodSuperExcitedPrimordialPearlPlutonium_2, 2), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Ichorium, 4), - GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(new ItemStack(FuelRodList.fuelRodSuperExcitedPrimordialPearlPlutonium_4, 1)) + new ItemStack(FuelRodList.fuelRodSuperExcitedPrimordialPearlPlutonium2, 2), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Ichorium, 4), + GTUtility.getIntegratedCircuit(5)) + .itemOutputs(new ItemStack(FuelRodList.fuelRodSuperExcitedPrimordialPearlPlutonium4, 1)) .duration(10 * SECOND) .noOptimize() .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); // radiance fuel rod - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Shadow, 4), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Shadow, 2), - GT_Utility.getIntegratedCircuit(2)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Shadow, 4), + GTOreDictUnificator.get(OrePrefixes.ring, Materials.Shadow, 2), + GTUtility.getIntegratedCircuit(2)) .itemOutputs(new ItemStack(FuelRodList.shadowFuelRod, 1)) .duration(50 * SECOND) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(FuelRodList.fuelRodExcitedRadianceUranium, 2), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Shadow, 4), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(new ItemStack(FuelRodList.fuelRodExcitedRadianceUranium_2, 1)) + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Shadow, 4), + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(new ItemStack(FuelRodList.fuelRodExcitedRadianceUranium2, 1)) .duration(10 * SECOND) .noOptimize() .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(FuelRodList.fuelRodExcitedRadianceUranium, 4), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Shadow, 6), - GT_Utility.getIntegratedCircuit(4)) - .itemOutputs(new ItemStack(FuelRodList.fuelRodExcitedRadianceUranium_4, 1)) + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Shadow, 6), + GTUtility.getIntegratedCircuit(4)) + .itemOutputs(new ItemStack(FuelRodList.fuelRodExcitedRadianceUranium4, 1)) .duration(10 * SECOND) .noOptimize() .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - new ItemStack(FuelRodList.fuelRodExcitedRadianceUranium_2, 2), - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Shadow, 4), - GT_Utility.getIntegratedCircuit(5)) - .itemOutputs(new ItemStack(FuelRodList.fuelRodExcitedRadianceUranium_4, 1)) + new ItemStack(FuelRodList.fuelRodExcitedRadianceUranium2, 2), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Shadow, 4), + GTUtility.getIntegratedCircuit(5)) + .itemOutputs(new ItemStack(FuelRodList.fuelRodExcitedRadianceUranium4, 1)) .duration(10 * SECOND) .noOptimize() .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); // centrifuge - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(FuelRodList.depletedFuelRodSuperExcitedPrimordialPearlPlutonium, 1)) .itemOutputs(new ItemStack(FuelRodList.ichorFuelRod, 1)) - .itemOutputs(new ItemStack(FuelRodList.ichorFuelRod, 1), new ItemStack(ItemMaterial, 1, 12)) + .itemOutputs( + new ItemStack(FuelRodList.ichorFuelRod, 1), + thaumcraft.api.ItemApi.getItem("itemEldritchObject", 3)) .outputChances(10000, 500) - .fluidOutputs(MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1000)) + .fluidOutputs(GGMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1000)) .duration(20 * SECOND) .eut(TierEU.RECIPE_IV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(FuelRodList.depletedFuelRodSuperExcitedPrimordialPearlPlutonium_2, 1)) - .itemOutputs(new ItemStack(FuelRodList.ichorFuelRod, 2), new ItemStack(ItemMaterial, 1, 12)) + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(FuelRodList.depletedFuelRodSuperExcitedPrimordialPearlPlutonium2, 1)) + .itemOutputs( + new ItemStack(FuelRodList.ichorFuelRod, 2), + thaumcraft.api.ItemApi.getItem("itemEldritchObject", 3)) .outputChances(10000, 1500) - .fluidOutputs(MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(2000)) + .fluidOutputs(GGMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(2000)) .duration(20 * SECOND) .eut(TierEU.RECIPE_IV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(FuelRodList.depletedFuelRodSuperExcitedPrimordialPearlPlutonium_4, 1)) - .itemOutputs(new ItemStack(FuelRodList.ichorFuelRod, 4), new ItemStack(ItemMaterial, 1, 12)) + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(FuelRodList.depletedFuelRodSuperExcitedPrimordialPearlPlutonium4, 1)) + .itemOutputs( + new ItemStack(FuelRodList.ichorFuelRod, 4), + thaumcraft.api.ItemApi.getItem("itemEldritchObject", 3)) .outputChances(10000, 3500) - .fluidOutputs(MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(4000)) + .fluidOutputs(GGMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(4000)) .duration(20 * SECOND) .eut(TierEU.RECIPE_IV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(FuelRodList.depletedFuelRodExcitedRadianceUranium, 1)) .itemOutputs( new ItemStack(FuelRodList.shadowFuelRod, 1), @@ -161,8 +166,8 @@ public static void registerNHUtilitiesGTRecipe() { .eut(TierEU.RECIPE_IV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(FuelRodList.depletedFuelRodExcitedRadianceUranium_2, 1)) + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(FuelRodList.depletedFuelRodExcitedRadianceUranium2, 1)) .itemOutputs( new ItemStack(FuelRodList.shadowFuelRod, 2), Materials.Uranium.getDust(32), @@ -176,8 +181,8 @@ public static void registerNHUtilitiesGTRecipe() { .eut(TierEU.RECIPE_IV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(FuelRodList.depletedFuelRodExcitedRadianceUranium_4, 1)) + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(FuelRodList.depletedFuelRodExcitedRadianceUranium4, 1)) .itemOutputs( new ItemStack(FuelRodList.shadowFuelRod, 4), Materials.Uranium.getDust(64), @@ -191,14 +196,14 @@ public static void registerNHUtilitiesGTRecipe() { .eut(TierEU.RECIPE_IV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(thaumcraft.api.ItemApi.getItem("itemEldritchObject", 3)) .itemOutputs(new ItemStack(FuelRodList.primordialPearlDust, 4)) .duration(100 * SECOND) .eut(TierEU.RECIPE_EV) .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(ThaumicTinkerer.registry.getFirstItemFromClass(ItemKamiResource.class), 1, 0)) .itemOutputs(new ItemStack(FuelRodList.ichorDroplet, 2)) .duration(100 * SECOND) @@ -206,8 +211,8 @@ public static void registerNHUtilitiesGTRecipe() { .addTo(extractorRecipes); // for adding debug maintenance recipe - GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Hull_EV.get(1), ItemList.Duct_Tape.get(1), GT_Utility.getIntegratedCircuit(16)) + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Hull_EV.get(1), ItemList.Duct_Tape.get(1), GTUtility.getIntegratedCircuit(16)) .itemOutputs(hatch_CreativeMaintenance.get(1)) .duration(25 * SECOND) .eut(TierEU.RECIPE_HV) diff --git a/src/main/java/com/xir/NHUtilities/common/recipes/TCRecipes/ArcaneCraftingRecipes.java b/src/main/java/com/xir/NHUtilities/common/recipes/TCRecipes/ArcaneCraftingRecipes.java index 8434e72..3e03f64 100644 --- a/src/main/java/com/xir/NHUtilities/common/recipes/TCRecipes/ArcaneCraftingRecipes.java +++ b/src/main/java/com/xir/NHUtilities/common/recipes/TCRecipes/ArcaneCraftingRecipes.java @@ -10,7 +10,7 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -32,6 +32,6 @@ public static void run() { gtcthaumicebf, new Object[] { " a ", "aba", " c ", 'a', ItemList.Machine_Multi_BlastFurnace.get(1L), 'b', new ItemStack(ConfigBlocks.blockCrystal, 1, 1), 'c', - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L) })); + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L) })); } } diff --git a/src/main/java/com/xir/NHUtilities/common/research/GTApiResearch.java b/src/main/java/com/xir/NHUtilities/common/research/GTApiResearch.java index 0a28fa7..34f1ab5 100644 --- a/src/main/java/com/xir/NHUtilities/common/research/GTApiResearch.java +++ b/src/main/java/com/xir/NHUtilities/common/research/GTApiResearch.java @@ -1,8 +1,8 @@ package com.xir.NHUtilities.common.research; import static com.xir.NHUtilities.main.ReferencedInfo.MOD_ID_UPPER; -import static goodgenerator.items.MyMaterial.atomicSeparationCatalyst; -import static goodgenerator.items.MyMaterial.plutoniumBasedLiquidFuelExcited; +import static goodgenerator.items.GGMaterial.atomicSeparationCatalyst; +import static goodgenerator.items.GGMaterial.plutoniumBasedLiquidFuelExcited; import java.util.Arrays; @@ -12,11 +12,11 @@ import com.xir.NHUtilities.common.items.FuelRodList; import goodgenerator.util.ItemRefer; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TC_Aspects; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.enums.TCAspects; +import gregtech.api.util.GTOreDictUnificator; import thaumic.tinkerer.common.ThaumicTinkerer; import thaumic.tinkerer.common.item.ItemBrightNitor; @@ -27,7 +27,7 @@ public class GTApiResearch { private static final String IchoriumFuelRod = "ICHORIUMFUELROD"; public static void addGTApiResearchAndRecipes() { - GregTech_API.sThaumcraftCompat.addResearch( + GregTechAPI.sThaumcraftCompat.addResearch( ShadowMetalFuelRod, StatCollector.translateToLocal(PrefixOfResearchInThaumonomicon + "name." + ShadowMetalFuelRod), StatCollector.translateToLocal(PrefixOfResearchInThaumonomicon + "text." + ShadowMetalFuelRod), @@ -39,12 +39,12 @@ public static void addGTApiResearchAndRecipes() { 2, 0, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 6), - new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 8), - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16)), + new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 6), + new TCAspects.TC_AspectStack(TCAspects.RADIO, 8), + new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 16)), null, new Object[] { "nhu.research.shadowmetalfuelrod_1", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( ShadowMetalFuelRod, new ItemStack(FuelRodList.shadowFuelRod, 1), new ItemStack[] { ItemRefer.High_Density_Uranium.get(1), @@ -61,10 +61,10 @@ public static void addGTApiResearchAndRecipes() { new ItemStack(FuelRodList.fuelRodExcitedRadianceUranium, 1), 8, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256))) }); - GregTech_API.sThaumcraftCompat.addResearch( + new TCAspects.TC_AspectStack(TCAspects.RADIO, 256), + new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 256), + new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 256))) }); + GregTechAPI.sThaumcraftCompat.addResearch( IchoriumFuelRod, StatCollector.translateToLocal(PrefixOfResearchInThaumonomicon + "name." + IchoriumFuelRod), StatCollector.translateToLocal(PrefixOfResearchInThaumonomicon + "text." + IchoriumFuelRod), @@ -76,27 +76,27 @@ public static void addGTApiResearchAndRecipes() { 2, -1, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 6), - new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 8), - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16)), + new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 6), + new TCAspects.TC_AspectStack(TCAspects.RADIO, 8), + new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 16)), null, new Object[] { "nhu.research.ichoriumfuelrod_1", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( IchoriumFuelRod, new ItemStack(FuelRodList.ichorFuelRod, 1), new ItemStack[] { plutoniumBasedLiquidFuelExcited.get(OrePrefixes.cell, 1), atomicSeparationCatalyst.get(OrePrefixes.dust, 1), - GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Ichorium, 1), + GTOreDictUnificator.get(OrePrefixes.cellMolten, Materials.Ichorium, 1), atomicSeparationCatalyst.get(OrePrefixes.dust, 1), new ItemStack(FuelRodList.primordialPearlDust, 1), atomicSeparationCatalyst.get(OrePrefixes.dust, 1), - GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Ichorium, 1), + GTOreDictUnificator.get(OrePrefixes.cellMolten, Materials.Ichorium, 1), atomicSeparationCatalyst.get(OrePrefixes.dust, 1) }, new ItemStack(FuelRodList.fuelRodSuperExcitedPrimordialPearlPlutonium, 1), 16, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1024), - new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 1024), - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1024))) }); + new TCAspects.TC_AspectStack(TCAspects.RADIO, 1024), + new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 1024), + new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 1024))) }); } } diff --git a/src/main/java/com/xir/NHUtilities/mixins/late/GregTech/BaseMetaTileEntityAcceleration_Mixin.java b/src/main/java/com/xir/NHUtilities/mixins/late/GregTech/BaseMetaTileEntityAcceleration_Mixin.java index 0fbf75c..9e9175c 100644 --- a/src/main/java/com/xir/NHUtilities/mixins/late/GregTech/BaseMetaTileEntityAcceleration_Mixin.java +++ b/src/main/java/com/xir/NHUtilities/mixins/late/GregTech/BaseMetaTileEntityAcceleration_Mixin.java @@ -9,9 +9,9 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.metatileentity.BaseMetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_PrimitiveBlastFurnace; +import gregtech.api.metatileentity.implementations.MTEBasicMachine; +import gregtech.api.metatileentity.implementations.MTEMultiBlockBase; +import gregtech.common.tileentities.machines.multi.MTEPrimitiveBlastFurnace; @Mixin(BaseMetaTileEntity.class) public abstract class BaseMetaTileEntityAcceleration_Mixin implements ITileEntityTickAcceleration { @@ -45,19 +45,19 @@ public boolean tickAcceleration(int tickAcceleratedRate) { IMetaTileEntity metaTileEntity = this.getMetaTileEntity(); // for accelerating basic machine - if (metaTileEntity instanceof GT_MetaTileEntity_BasicMachine basicMachine) { + if (metaTileEntity instanceof MTEBasicMachine basicMachine) { basicMachine.mProgresstime = NHUtilities$modify; return true; } // for accelerating multi machine - if (metaTileEntity instanceof GT_MetaTileEntity_MultiBlockBase multiBlockBase) { + if (metaTileEntity instanceof MTEMultiBlockBase multiBlockBase) { multiBlockBase.mProgresstime = NHUtilities$modify; return true; } // for accelerating primitive blast furnace - if (metaTileEntity instanceof GT_MetaTileEntity_PrimitiveBlastFurnace primitiveBlastFurnace) { + if (metaTileEntity instanceof MTEPrimitiveBlastFurnace primitiveBlastFurnace) { primitiveBlastFurnace.mProgresstime = NHUtilities$modify; return true; } diff --git a/src/main/java/com/xir/NHUtilities/mixins/late/GregTech/DisableDebuff_Mixin.java b/src/main/java/com/xir/NHUtilities/mixins/late/GregTech/DisableDebuff_Mixin.java index ad7a586..418150c 100644 --- a/src/main/java/com/xir/NHUtilities/mixins/late/GregTech/DisableDebuff_Mixin.java +++ b/src/main/java/com/xir/NHUtilities/mixins/late/GregTech/DisableDebuff_Mixin.java @@ -7,9 +7,9 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import gregtech.common.blocks.GT_Item_Machines; +import gregtech.common.blocks.ItemMachines; -@Mixin(value = GT_Item_Machines.class) +@Mixin(value = ItemMachines.class) public class DisableDebuff_Mixin { @Redirect(