From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- src/main/java/kubatech/api/eig/EIGBucket.java | 12 +- src/main/java/kubatech/api/eig/EIGMode.java | 14 +- .../java/kubatech/api/eig/IEIGBucketFactory.java | 4 +- src/main/java/kubatech/api/enums/EIGModes.java | 4 +- src/main/java/kubatech/api/enums/ItemList.java | 60 +- src/main/java/kubatech/api/helpers/GTHelper.java | 12 +- .../implementations/KubaTechGTMultiBlockBase.java | 30 +- src/main/java/kubatech/api/utils/StringUtils.java | 4 +- src/main/java/kubatech/loaders/BlockLoader.java | 12 +- src/main/java/kubatech/loaders/DEFCRecipes.java | 166 +-- src/main/java/kubatech/loaders/ItemLoader.java | 86 +- .../java/kubatech/loaders/MobHandlerLoader.java | 14 +- src/main/java/kubatech/loaders/RecipeLoader.java | 103 +- src/main/java/kubatech/loaders/TCLoader.java | 6 +- .../loaders/block/defc/BlockDEFCCasing.java | 63 + .../loaders/block/defc/DEFCCasingBlock.java | 63 - .../loaders/block/defc/DEFCCasingItemBlock.java | 36 - .../loaders/block/defc/ItemBlockDEFCCasing.java | 36 + .../block/kubablock/blocks/BlockTeaAcceptor.java | 64 + .../block/kubablock/blocks/BlockTeaStorage.java | 66 + .../block/kubablock/blocks/TeaAcceptor.java | 64 - .../loaders/block/kubablock/blocks/TeaStorage.java | 66 - .../java/kubatech/loaders/item/items/ItemTea.java | 72 ++ .../loaders/item/items/ItemTeaCollection.java | 209 ++++ .../loaders/item/items/ItemTeaIngredient.java | 41 + .../loaders/item/items/ItemTeaUltimate.java | 216 ++++ src/main/java/kubatech/loaders/item/items/Tea.java | 72 -- .../kubatech/loaders/item/items/TeaCollection.java | 209 ---- .../kubatech/loaders/item/items/TeaIngredient.java | 41 - .../kubatech/loaders/item/items/TeaUltimate.java | 216 ---- src/main/java/kubatech/nei/NEIConfig.java | 69 ++ src/main/java/kubatech/nei/NEI_Config.java | 69 -- .../GT_MetaTileEntity_DEFusionCrafter.java | 281 ----- .../GT_MetaTileEntity_ExtremeEntityCrusher.java | 820 ------------- ...MetaTileEntity_ExtremeIndustrialGreenhouse.java | 1282 -------------------- .../GT_MetaTileEntity_MegaIndustrialApiary.java | 1175 ------------------ .../gregtech/multiblock/MTEDEFusionCrafter.java | 280 +++++ .../multiblock/MTEExtremeEntityCrusher.java | 817 +++++++++++++ .../multiblock/MTEExtremeIndustrialGreenhouse.java | 1274 +++++++++++++++++++ .../multiblock/MTEMegaIndustrialApiary.java | 1173 ++++++++++++++++++ .../multiblock/eigbuckets/EIGFlowerBucket.java | 6 +- .../multiblock/eigbuckets/EIGIC2Bucket.java | 48 +- .../eigbuckets/EIGRainbowCactusBucket.java | 6 +- .../multiblock/eigbuckets/EIGSeedBucket.java | 18 +- .../multiblock/eigbuckets/EIGStemBucket.java | 10 +- .../gregtech/multiblock/eigmodes/EIGIC2Mode.java | 12 +- .../multiblock/eigmodes/EIGNormalMode.java | 8 +- 47 files changed, 4696 insertions(+), 4713 deletions(-) create mode 100644 src/main/java/kubatech/loaders/block/defc/BlockDEFCCasing.java delete mode 100644 src/main/java/kubatech/loaders/block/defc/DEFCCasingBlock.java delete mode 100644 src/main/java/kubatech/loaders/block/defc/DEFCCasingItemBlock.java create mode 100644 src/main/java/kubatech/loaders/block/defc/ItemBlockDEFCCasing.java create mode 100644 src/main/java/kubatech/loaders/block/kubablock/blocks/BlockTeaAcceptor.java create mode 100644 src/main/java/kubatech/loaders/block/kubablock/blocks/BlockTeaStorage.java delete mode 100644 src/main/java/kubatech/loaders/block/kubablock/blocks/TeaAcceptor.java delete mode 100644 src/main/java/kubatech/loaders/block/kubablock/blocks/TeaStorage.java create mode 100644 src/main/java/kubatech/loaders/item/items/ItemTea.java create mode 100644 src/main/java/kubatech/loaders/item/items/ItemTeaCollection.java create mode 100644 src/main/java/kubatech/loaders/item/items/ItemTeaIngredient.java create mode 100644 src/main/java/kubatech/loaders/item/items/ItemTeaUltimate.java delete mode 100644 src/main/java/kubatech/loaders/item/items/Tea.java delete mode 100644 src/main/java/kubatech/loaders/item/items/TeaCollection.java delete mode 100644 src/main/java/kubatech/loaders/item/items/TeaIngredient.java delete mode 100644 src/main/java/kubatech/loaders/item/items/TeaUltimate.java create mode 100644 src/main/java/kubatech/nei/NEIConfig.java delete mode 100644 src/main/java/kubatech/nei/NEI_Config.java delete mode 100644 src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_DEFusionCrafter.java delete mode 100644 src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeEntityCrusher.java delete mode 100644 src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java delete mode 100644 src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java create mode 100644 src/main/java/kubatech/tileentity/gregtech/multiblock/MTEDEFusionCrafter.java create mode 100644 src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java create mode 100644 src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java create mode 100644 src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java (limited to 'src/main/java/kubatech') diff --git a/src/main/java/kubatech/api/eig/EIGBucket.java b/src/main/java/kubatech/api/eig/EIGBucket.java index 6a3dbdb642..0ef9630a72 100644 --- a/src/main/java/kubatech/api/eig/EIGBucket.java +++ b/src/main/java/kubatech/api/eig/EIGBucket.java @@ -10,8 +10,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumChatFormatting; -import gregtech.api.util.GT_Utility; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; +import gregtech.api.util.GTUtility; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; public abstract class EIGBucket { @@ -119,14 +119,14 @@ public abstract class EIGBucket { * @return number of seeds consumed, 0 for wrong item, -1 if it missed the support items, -2 if you tried to consume * 0 or less items; */ - public int tryAddSeed(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse, ItemStack input, int maxConsume, + public int tryAddSeed(MTEExtremeIndustrialGreenhouse greenhouse, ItemStack input, int maxConsume, boolean simulate) { // Abort is input if empty if (input == null || input.stackSize <= 0) return -2; // Cap max to input count maxConsume = Math.min(maxConsume, input.stackSize); // Abort if item isn't an identical seed. - if (!GT_Utility.areStacksEqual(this.seed, input, false)) return 0; + if (!GTUtility.areStacksEqual(this.seed, input, false)) return 0; // no support items, consume and exit early. if (this.supportItems == null || this.supportItems.length <= 0) { @@ -143,7 +143,7 @@ public abstract class EIGBucket { for (ItemStack otherInput : greenhouse.getStoredInputs()) { // filter usable inputs if (otherInput == null || otherInput.stackSize <= 0) continue; - if (!GT_Utility.areStacksEqual(supportItem, otherInput, false)) continue; + if (!GTUtility.areStacksEqual(supportItem, otherInput, false)) continue; // update max consume again maxConsume = Math.min(maxConsume, otherInput.stackSize); toConsumeFrom.addLast(otherInput); @@ -242,6 +242,6 @@ public abstract class EIGBucket { * @param greenhouse The greenhouse that contains the bucket. * @return True if the bucket was successfully validated. {@link EIGBucket#isValid()} should also return true. */ - public abstract boolean revalidate(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse); + public abstract boolean revalidate(MTEExtremeIndustrialGreenhouse greenhouse); } diff --git a/src/main/java/kubatech/api/eig/EIGMode.java b/src/main/java/kubatech/api/eig/EIGMode.java index 68ad633773..b3ebddff1b 100644 --- a/src/main/java/kubatech/api/eig/EIGMode.java +++ b/src/main/java/kubatech/api/eig/EIGMode.java @@ -10,8 +10,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; +import gregtech.api.util.MultiblockTooltipBuilder; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; public abstract class EIGMode { @@ -37,7 +37,7 @@ public abstract class EIGMode { public abstract double getFertilizerBoost(); - public abstract GT_Multiblock_Tooltip_Builder addTooltipInfo(GT_Multiblock_Tooltip_Builder builder); + public abstract MultiblockTooltipBuilder addTooltipInfo(MultiblockTooltipBuilder builder); /** * Used to resolve factory type to an identifier. @@ -98,15 +98,15 @@ public abstract class EIGMode { /** * Attempts to create a new bucket from a given item. Returns if the item cannot be inserted into the EIG. * - * @see IEIGBucketFactory#tryCreateBucket(GT_MetaTileEntity_ExtremeIndustrialGreenhouse, ItemStack) - * @param greenhouse The {@link GT_MetaTileEntity_ExtremeIndustrialGreenhouse} that will contain the seed. + * @see IEIGBucketFactory#tryCreateBucket(MTEExtremeIndustrialGreenhouse, ItemStack) + * @param greenhouse The {@link MTEExtremeIndustrialGreenhouse} that will contain the seed. * @param input The {@link ItemStack} for the input item. * @param maxConsume The maximum amount of items to consume. * @param simulate Whether to actually consume the seed. * @return Null if no bucket could be created from the item. */ - public EIGBucket tryCreateNewBucket(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse, ItemStack input, - int maxConsume, boolean simulate) { + public EIGBucket tryCreateNewBucket(MTEExtremeIndustrialGreenhouse greenhouse, ItemStack input, int maxConsume, + boolean simulate) { // Validate inputs if (input == null) return null; maxConsume = Math.min(input.stackSize, maxConsume); diff --git a/src/main/java/kubatech/api/eig/IEIGBucketFactory.java b/src/main/java/kubatech/api/eig/IEIGBucketFactory.java index 647e544573..5e5ad8f10e 100644 --- a/src/main/java/kubatech/api/eig/IEIGBucketFactory.java +++ b/src/main/java/kubatech/api/eig/IEIGBucketFactory.java @@ -3,13 +3,13 @@ package kubatech.api.eig; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; public interface IEIGBucketFactory { String getNBTIdentifier(); - EIGBucket tryCreateBucket(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse, ItemStack stack); + EIGBucket tryCreateBucket(MTEExtremeIndustrialGreenhouse greenhouse, ItemStack stack); EIGBucket restore(NBTTagCompound nbt); } diff --git a/src/main/java/kubatech/api/enums/EIGModes.java b/src/main/java/kubatech/api/enums/EIGModes.java index a81de2b8c5..ef954ea699 100644 --- a/src/main/java/kubatech/api/enums/EIGModes.java +++ b/src/main/java/kubatech/api/enums/EIGModes.java @@ -2,7 +2,7 @@ package kubatech.api.enums; import java.util.HashMap; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.MultiblockTooltipBuilder; import kubatech.api.eig.EIGMode; import kubatech.tileentity.gregtech.multiblock.eigmodes.EIGIC2Mode; import kubatech.tileentity.gregtech.multiblock.eigmodes.EIGNormalMode; @@ -34,7 +34,7 @@ public class EIGModes { return Normal; } - public static void addTooltipInfo(GT_Multiblock_Tooltip_Builder tt) { + public static void addTooltipInfo(MultiblockTooltipBuilder tt) { // maybe make this use the mods list instead EIGModes.Normal.addTooltipInfo(tt); EIGModes.IC2.addTooltipInfo(tt); diff --git a/src/main/java/kubatech/api/enums/ItemList.java b/src/main/java/kubatech/api/enums/ItemList.java index 02943e3b22..92a5fca22b 100644 --- a/src/main/java/kubatech/api/enums/ItemList.java +++ b/src/main/java/kubatech/api/enums/ItemList.java @@ -1,7 +1,7 @@ package kubatech.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,10 +10,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import gregtech.api.interfaces.IItemContainer; -import gregtech.api.util.GT_LanguageManager; -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.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public enum ItemList implements IItemContainer { @@ -82,14 +82,14 @@ public enum ItemList implements IItemContainer { 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; } @@ -103,7 +103,7 @@ public enum ItemList implements IItemContainer { 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)) return null; + if (GTUtility.isStackInvalid(mStack)) return null; return mStack.getItem(); } @@ -111,7 +111,7 @@ public enum ItemList implements IItemContainer { 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 @@ -126,46 +126,46 @@ public enum ItemList implements IItemContainer { @Override public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT) { - 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) { 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); - return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(mStack)); + if (GTUtility.isStackInvalid(mStack)) return GTUtility.copyAmount(aAmount, aReplacements); + return GTUtility.copyAmount(aAmount, GTOreDictUnificator.get(mStack)); } @Override 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); - 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) { 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); - 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) { 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); - 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(); @@ -186,31 +186,31 @@ public enum ItemList implements IItemContainer { // 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) { 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); - 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) { if (mHasNotBeenSet) 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)); + for (Object tOreName : aOreNames) GTOreDictUnificator.registerOre(tOreName, get(1)); return this; } @@ -218,7 +218,7 @@ public enum ItemList implements IItemContainer { public IItemContainer registerWildcardAsOre(Object... aOreNames) { if (mHasNotBeenSet) 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)); + for (Object tOreName : aOreNames) GTOreDictUnificator.registerOre(tOreName, getWildcard(1)); return this; } diff --git a/src/main/java/kubatech/api/helpers/GTHelper.java b/src/main/java/kubatech/api/helpers/GTHelper.java index 72bbe8cf77..fe6a2a6167 100644 --- a/src/main/java/kubatech/api/helpers/GTHelper.java +++ b/src/main/java/kubatech/api/helpers/GTHelper.java @@ -30,16 +30,16 @@ import net.minecraft.network.PacketBuffer; import com.kuba6000.mobsinfo.api.utils.ItemID; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEMultiBlockBase; import kubatech.api.implementations.KubaTechGTMultiBlockBase; public class GTHelper { - public static long getMaxInputEU(GT_MetaTileEntity_MultiBlockBase mte) { + public static long getMaxInputEU(MTEMultiBlockBase mte) { if (mte instanceof KubaTechGTMultiBlockBase) return ((KubaTechGTMultiBlockBase) mte).getMaxInputEu(); long rEU = 0; - for (GT_MetaTileEntity_Hatch_Energy tHatch : mte.mEnergyHatches) + for (MTEHatchEnergy tHatch : mte.mEnergyHatches) if (tHatch.isValid()) rEU += tHatch.maxEUInput() * tHatch.maxAmperesIn(); return rEU; } @@ -48,7 +48,7 @@ public class GTHelper { return Math.log((double) voltage / 8L) / ln4; } - public static double getVoltageTierD(GT_MetaTileEntity_MultiBlockBase mte) { + public static double getVoltageTierD(MTEMultiBlockBase mte) { return Math.log((double) getMaxInputEU(mte) / 8L) / ln4; } @@ -56,7 +56,7 @@ public class GTHelper { return (int) getVoltageTierD(voltage); } - public static int getVoltageTier(GT_MetaTileEntity_MultiBlockBase mte) { + public static int getVoltageTier(MTEMultiBlockBase mte) { return (int) getVoltageTierD(mte); } diff --git a/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java b/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java index 94b120a3e9..d8f12126c1 100644 --- a/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java +++ b/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java @@ -55,17 +55,17 @@ import com.gtnewhorizons.modularui.common.widget.DynamicPositionedColumn; import com.gtnewhorizons.modularui.common.widget.DynamicPositionedRow; import com.gtnewhorizons.modularui.common.widget.SlotWidget; -import gregtech.api.enums.GT_Values; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.enums.GTValues; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.metatileentity.BaseMetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_OutputBus_ME; +import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEHatchOutputBus; +import gregtech.common.tileentities.machines.MTEHatchOutputBusME; import kubatech.Tags; -public abstract class KubaTechGTMultiBlockBase> - extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase { +public abstract class KubaTechGTMultiBlockBase> + extends MTEExtendedPowerMultiBlockBase { @Deprecated public final int mEUt = 0; @@ -212,8 +212,8 @@ public abstract class KubaTechGTMultiBlockBase isFixed = widget -> getIdealStatus() == getRepairStatus() && mMachine; protected static final Function toggleButtonTextureGetter = val -> val == 0 - ? GT_UITextures.OVERLAY_BUTTON_CROSS - : GT_UITextures.OVERLAY_BUTTON_CHECKMARK; + ? GTUITextures.OVERLAY_BUTTON_CROSS + : GTUITextures.OVERLAY_BUTTON_CHECKMARK; protected static final Function toggleButtonBackgroundGetter = val -> new IDrawable[] { - val == 0 ? GT_UITextures.BUTTON_STANDARD : GT_UITextures.BUTTON_STANDARD_PRESSED }; + val == 0 ? GTUITextures.BUTTON_STANDARD : GTUITextures.BUTTON_STANDARD_PRESSED }; } diff --git a/src/main/java/kubatech/api/utils/StringUtils.java b/src/main/java/kubatech/api/utils/StringUtils.java index 68f6c8249f..408da2dfc9 100644 --- a/src/main/java/kubatech/api/utils/StringUtils.java +++ b/src/main/java/kubatech/api/utils/StringUtils.java @@ -22,7 +22,7 @@ package kubatech.api.utils; import net.minecraft.util.EnumChatFormatting; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; public class StringUtils { @@ -53,6 +53,6 @@ public class StringUtils { } public static String voltageTooltipFormatted(int tier) { - return GT_Values.TIER_COLORS[tier] + GT_Values.VN[tier] + EnumChatFormatting.GRAY; + return GTValues.TIER_COLORS[tier] + GTValues.VN[tier] + EnumChatFormatting.GRAY; } } diff --git a/src/main/java/kubatech/loaders/BlockLoader.java b/src/main/java/kubatech/loaders/BlockLoader.java index fcb077ff15..e2c94a0e4b 100644 --- a/src/main/java/kubatech/loaders/BlockLoader.java +++ b/src/main/java/kubatech/loaders/BlockLoader.java @@ -25,11 +25,11 @@ import net.minecraft.item.ItemBlock; import cpw.mods.fml.common.registry.GameRegistry; import kubatech.api.enums.ItemList; -import kubatech.loaders.block.defc.DEFCCasingBlock; +import kubatech.loaders.block.defc.BlockDEFCCasing; import kubatech.loaders.block.kubablock.KubaBlock; import kubatech.loaders.block.kubablock.KubaItemBlock; -import kubatech.loaders.block.kubablock.blocks.TeaAcceptor; -import kubatech.loaders.block.kubablock.blocks.TeaStorage; +import kubatech.loaders.block.kubablock.blocks.BlockTeaAcceptor; +import kubatech.loaders.block.kubablock.blocks.BlockTeaStorage; import kubatech.tileentity.TeaAcceptorTile; import kubatech.tileentity.TeaStorageTile; @@ -37,7 +37,7 @@ public class BlockLoader { public static final KubaBlock kubaBlock = new KubaBlock(Material.anvil); public static final ItemBlock kubaItemBlock = new KubaItemBlock(kubaBlock); - public static final DEFCCasingBlock defcCasingBlock = new DEFCCasingBlock(); + public static final BlockDEFCCasing defcCasingBlock = new BlockDEFCCasing(); public static void registerBlocks() { GameRegistry.registerTileEntity(TeaAcceptorTile.class, "KT_TeaAcceptor"); @@ -45,7 +45,7 @@ public class BlockLoader { GameRegistry.registerBlock(kubaBlock, null, "kubablocks"); GameRegistry.registerItem(kubaItemBlock, "kubablocks"); - ItemList.TeaAcceptor.set(kubaBlock.registerProxyBlock(new TeaAcceptor())); - ItemList.TeaStorage.set(kubaBlock.registerProxyBlock(new TeaStorage())); + ItemList.TeaAcceptor.set(kubaBlock.registerProxyBlock(new BlockTeaAcceptor())); + ItemList.TeaStorage.set(kubaBlock.registerProxyBlock(new BlockTeaStorage())); } } diff --git a/src/main/java/kubatech/loaders/DEFCRecipes.java b/src/main/java/kubatech/loaders/DEFCRecipes.java index ebea8d751f..37f13c1298 100644 --- a/src/main/java/kubatech/loaders/DEFCRecipes.java +++ b/src/main/java/kubatech/loaders/DEFCRecipes.java @@ -8,7 +8,7 @@ import static gregtech.api.enums.Mods.SuperSolarPanels; import static gregtech.api.enums.Mods.Witchery; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; -import static gregtech.api.util.GT_RecipeConstants.DEFC_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.DEFC_CASING_TIER; import java.util.Arrays; @@ -22,7 +22,7 @@ import com.gtnewhorizons.modularui.api.drawable.UITexture; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; -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.MaterialsUEVplus; @@ -31,12 +31,12 @@ import gregtech.api.enums.TierEU; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMapBackend; import gregtech.api.recipe.RecipeMapBuilder; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gregtech.nei.formatter.SimpleSpecialValueFormatter; -import gtPlusPlus.xmod.forestry.bees.handler.GTPP_CombType; +import gtPlusPlus.xmod.forestry.bees.handler.GTPPCombType; import kubatech.Tags; public class DEFCRecipes { @@ -54,13 +54,13 @@ public class DEFCRecipes { public static void addRecipes() { // Dragonblood recipe for magics haters - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dragon_egg, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64L)) .fluidInputs(Materials.Radon.getPlasma(144)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8L)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)) .eut(TierEU.RECIPE_UHV) .duration(14_000) @@ -68,59 +68,59 @@ public class DEFCRecipes { // Casings - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 6L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 6L)) + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 6L), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 6L)) .fluidInputs(Materials.Void.getMolten(1152L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingBase.get(1)) .eut(TierEU.RECIPE_UV) .duration(24000) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "tile.BloodyIchorium", 1, 0), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6L)) + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "tile.BloodyIchorium", 1, 0), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 6L)) .fluidInputs(Materials.Void.getMolten(1152L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT1.get(1)) .eut(TierEU.RECIPE_UV) .duration(24000) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( kubatech.api.enums.ItemList.DEFCCasingT1.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 6L), - GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 6L), + GTModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0)) .fluidInputs(Materials.Void.getMolten(2304L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT2.get(1)) .eut(TierEU.RECIPE_UV) .duration(24000) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( kubatech.api.enums.ItemList.DEFCCasingT2.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6L), - GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 2, 0)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6L), + GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 2, 0)) .fluidInputs(Materials.Void.getMolten(4608L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT3.get(1)) .eut(TierEU.RECIPE_UHV) .duration(12000) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( kubatech.api.enums.ItemList.DEFCCasingT3.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 6L), - GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 3, 0)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 6L), + GTModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 3, 0)) .fluidInputs(Materials.Void.getMolten(9216L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT4.get(1)) .eut(TierEU.RECIPE_UEV) .duration(12000) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( kubatech.api.enums.ItemList.DEFCCasingT4.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6L), - GT_ModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 4, 0)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6L), + GTModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 4, 0)) .fluidInputs(Materials.Void.getMolten(18432L)) .itemOutputs(kubatech.api.enums.ItemList.DEFCCasingT5.get(1)) .eut(TierEU.RECIPE_UIV) @@ -133,7 +133,7 @@ public class DEFCRecipes { private static final Item EMTItems = GameRegistry.findItem("EMT", "EMTItems"); - private static void addOldHiddenRecipe(GT_Recipe recipe) { + private static void addOldHiddenRecipe(GTRecipe recipe) { if (!ElectroMagicTools.isModLoaded()) return; recipe = recipe.copy(); recipe.mInputs = Arrays.stream(recipe.mInputs) @@ -169,29 +169,29 @@ public class DEFCRecipes { private static void fusionRecipes() { // CORES - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1), ItemList.QuantumEye.get(1L), kubatech.api.enums.ItemList.DEFCDraconicSchematic.get(0L)) .fluidInputs(Materials.Sunnarium.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0)) + .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0)) .eut(TierEU.RECIPE_UV) .duration(400) .metadata(DEFC_CASING_TIER, 1) .addTo(fusionCraftingRecipes) .forEach(DEFCRecipes::addOldHiddenRecipe); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4), - GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 4, 0), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 4), + GTModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 4, 0), ItemList.QuantumStar.get(1L), kubatech.api.enums.ItemList.DEFCWyvernSchematic.get(0L)) .fluidInputs(Materials.Neutronium.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0)) + .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0)) .eut(TierEU.RECIPE_UHV) .duration(800) .metadata(DEFC_CASING_TIER, 2) @@ -199,30 +199,30 @@ public class DEFCRecipes { .forEach(DEFCRecipes::addOldHiddenRecipe); if (Loader.isModLoaded("supersolarpanel")) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), - GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0), - GT_ModHandler.getModItem(SuperSolarPanels.ID, "enderquantumcomponent", 1, 0), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), + GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0), + GTModHandler.getModItem(SuperSolarPanels.ID, "enderquantumcomponent", 1, 0), kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L)) .fluidInputs(Materials.Infinity.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0)) + .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0)) .eut(TierEU.RECIPE_UEV) .duration(1600) .metadata(DEFC_CASING_TIER, 3) .addTo(fusionCraftingRecipes) .forEach(DEFCRecipes::addOldHiddenRecipe); } else { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), - GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ManyullynCrystal", 1, 0), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 4), + GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ManyullynCrystal", 1, 0), kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L)) .fluidInputs(Materials.Infinity.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0)) + .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 1, 0)) .eut(TierEU.RECIPE_UEV) .duration(1600) .metadata(DEFC_CASING_TIER, 3) @@ -230,15 +230,15 @@ public class DEFCRecipes { .forEach(DEFCRecipes::addOldHiddenRecipe); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 4), - GT_ModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 4, 0), - GT_ModHandler.getModItem(DraconicEvolution.ID, "chaosFragment", 2, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 16), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 4), + GTModHandler.getModItem(DraconicEvolution.ID, "awakenedCore", 4, 0), + GTModHandler.getModItem(DraconicEvolution.ID, "chaosFragment", 2, 2), kubatech.api.enums.ItemList.DEFCChaoticSchematic.get(0L)) .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(1440)) - .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 1, 0)) + .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "chaoticCore", 1, 0)) .eut(24_000_000) .duration(3200) .metadata(DEFC_CASING_TIER, 4) @@ -247,28 +247,28 @@ public class DEFCRecipes { // ENERGY CORES - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 4), - GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 1), - GT_ModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Draconium, 8), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 4), + GTModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 1), + GTModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0), kubatech.api.enums.ItemList.DEFCWyvernSchematic.get(0L)) - .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 0)) + .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 0)) .eut(TierEU.RECIPE_UV) .duration(1000) .metadata(DEFC_CASING_TIER, 2) .addTo(fusionCraftingRecipes) .forEach(DEFCRecipes::addOldHiddenRecipe); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 8), - GT_ModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 4, 0), - GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 4), - GT_ModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 8), + GTModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 4, 0), + GTModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 4), + GTModHandler.getModItem(DraconicEvolution.ID, "wyvernCore", 1, 0), kubatech.api.enums.ItemList.DEFCAwakenedSchematic.get(0L)) - .itemOutputs(GT_ModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 1)) + .itemOutputs(GTModHandler.getModItem(DraconicEvolution.ID, "draconiumEnergyCore", 1, 1)) .eut(TierEU.RECIPE_UHV) .duration(2000) .metadata(DEFC_CASING_TIER, 3) @@ -276,11 +276,11 @@ public class DEFCRecipes { .forEach(DEFCRecipes::addOldHiddenRecipe); // Dragon Blood - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dragon_egg, 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Radon.getPlasma(144)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288)) .eut(TierEU.RECIPE_UHV) @@ -289,11 +289,11 @@ public class DEFCRecipes { .noOptimize() .addTo(fusionCraftingRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem(Witchery.ID, "infinityegg", 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GT_Utility.getIntegratedCircuit(1)) + GTModHandler.getModItem(Witchery.ID, "infinityegg", 0), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Radon.getPlasma(72)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432)) .eut(TierEU.RECIPE_UHV) @@ -302,11 +302,11 @@ public class DEFCRecipes { .noOptimize() .addTo(fusionCraftingRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Blocks.dragon_egg, 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GTPP_CombType.DRAGONBLOOD.getStackForType(1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GTPPCombType.DRAGONBLOOD.getStackForType(1)) .fluidInputs(Materials.Radon.getPlasma(216)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432)) .eut(TierEU.RECIPE_UHV) @@ -315,11 +315,11 @@ public class DEFCRecipes { .noOptimize() .addTo(fusionCraftingRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem(Witchery.ID, "infinityegg", 0), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - GTPP_CombType.DRAGONBLOOD.getStackForType(1)) + GTModHandler.getModItem(Witchery.ID, "infinityegg", 0), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GTPPCombType.DRAGONBLOOD.getStackForType(1)) .fluidInputs(Materials.Radon.getPlasma(108)) .fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 648)) .eut(TierEU.RECIPE_UHV) diff --git a/src/main/java/kubatech/loaders/ItemLoader.java b/src/main/java/kubatech/loaders/ItemLoader.java index d8218ea873..a7d37da63a 100644 --- a/src/main/java/kubatech/loaders/ItemLoader.java +++ b/src/main/java/kubatech/loaders/ItemLoader.java @@ -73,10 +73,10 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.common.registry.GameRegistry; import kubatech.loaders.item.ItemProxy; import kubatech.loaders.item.KubaItems; -import kubatech.loaders.item.items.Tea; -import kubatech.loaders.item.items.TeaCollection; -import kubatech.loaders.item.items.TeaIngredient; -import kubatech.loaders.item.items.TeaUltimate; +import kubatech.loaders.item.items.ItemTea; +import kubatech.loaders.item.items.ItemTeaCollection; +import kubatech.loaders.item.items.ItemTeaIngredient; +import kubatech.loaders.item.items.ItemTeaUltimate; public class ItemLoader { @@ -87,45 +87,45 @@ public class ItemLoader { // DON'T EVER CHANGE ORDER IN HERE, ADD NEW ITEMS ON BOTTOM - LegendaryBlackTea.set(kubaitems.registerProxyItem(new TeaCollection("black_tea"))); - LegendaryButterflyTea.set(kubaitems.registerProxyItem(new TeaCollection("butterfly_tea"))); - LegendaryEarlGrayTea.set(kubaitems.registerProxyItem(new TeaCollection("earl_gray_tea"))); - LegendaryGreenTea.set(kubaitems.registerProxyItem(new TeaCollection("green_tea"))); - LegendaryLemonTea.set(kubaitems.registerProxyItem(new TeaCollection("lemon_tea"))); - LegendaryMilkTea.set(kubaitems.registerProxyItem(new TeaCollection("milk_tea"))); - LegendaryOolongTea.set(kubaitems.registerProxyItem(new TeaCollection("oolong_tea"))); - LegendaryPeppermintTea.set(kubaitems.registerProxyItem(new TeaCollection("peppermint_tea"))); - LegendaryPuerhTea.set(kubaitems.registerProxyItem(new TeaCollection("pu-erh_tea"))); - LegendaryRedTea.set(kubaitems.registerProxyItem(new TeaCollection("red_tea"))); - LegendaryWhiteTea.set(kubaitems.registerProxyItem(new TeaCollection("white_tea"))); - LegendaryYellowTea.set(kubaitems.registerProxyItem(new TeaCollection("yellow_tea"))); - LegendaryUltimateTea.set(kubaitems.registerProxyItem(new TeaUltimate())); - - BlackTea.set(kubaitems.registerProxyItem(new Tea("black_tea", 4, 0.3f))); - EarlGrayTea.set(kubaitems.registerProxyItem(new Tea("earl_gray_tea", 4, 0.3f))); - GreenTea.set(kubaitems.registerProxyItem(new Tea("green_tea", 4, 0.3f))); - LemonTea.set(kubaitems.registerProxyItem(new Tea("lemon_tea", 4, 0.3f))); - MilkTea.set(kubaitems.registerProxyItem(new Tea("milk_tea", 4, 0.3f))); - OolongTea.set(kubaitems.registerProxyItem(new Tea("oolong_tea", 4, 0.3f))); - PeppermintTea.set(kubaitems.registerProxyItem(new Tea("peppermint_tea", 4, 0.3f))); - PuerhTea.set(kubaitems.registerProxyItem(new Tea("pu-erh_tea", 4, 0.3f))); - WhiteTea.set(kubaitems.registerProxyItem(new Tea("white_tea", 4, 0.3f))); - YellowTea.set(kubaitems.registerProxyItem(new Tea("yellow_tea", 4, 0.3f))); - - BlackTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("black_tea_leaf"))); - GreenTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("green_tea_leaf"))); - OolongTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("oolong_tea_leaf"))); - PuerhTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("pu-erh_tea_leaf"))); - WhiteTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("white_tea_leaf"))); - YellowTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("yellow_tea_leaf"))); - - TeaLeafDehydrated.set(kubaitems.registerProxyItem(new TeaIngredient("tea_leaf_dehydrated"))); - SteamedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("steamed_tea_leaf"))); - RolledTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("rolled_tea_leaf"))); - OxidizedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("oxidized_tea_leaf"))); - FermentedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("fermented_tea_leaf"))); - BruisedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("bruised_tea_leaf"))); - PartiallyOxidizedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("partially_oxidized_tea_leaf"))); + LegendaryBlackTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("black_tea"))); + LegendaryButterflyTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("butterfly_tea"))); + LegendaryEarlGrayTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("earl_gray_tea"))); + LegendaryGreenTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("green_tea"))); + LegendaryLemonTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("lemon_tea"))); + LegendaryMilkTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("milk_tea"))); + LegendaryOolongTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("oolong_tea"))); + LegendaryPeppermintTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("peppermint_tea"))); + LegendaryPuerhTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("pu-erh_tea"))); + LegendaryRedTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("red_tea"))); + LegendaryWhiteTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("white_tea"))); + LegendaryYellowTea.set(kubaitems.registerProxyItem(new ItemTeaCollection("yellow_tea"))); + LegendaryUltimateTea.set(kubaitems.registerProxyItem(new ItemTeaUltimate())); + + BlackTea.set(kubaitems.registerProxyItem(new ItemTea("black_tea", 4, 0.3f))); + EarlGrayTea.set(kubaitems.registerProxyItem(new ItemTea("earl_gray_tea", 4, 0.3f))); + GreenTea.set(kubaitems.registerProxyItem(new ItemTea("green_tea", 4, 0.3f))); + LemonTea.set(kubaitems.registerProxyItem(new ItemTea("lemon_tea", 4, 0.3f))); + MilkTea.set(kubaitems.registerProxyItem(new ItemTea("milk_tea", 4, 0.3f))); + OolongTea.set(kubaitems.registerProxyItem(new ItemTea("oolong_tea", 4, 0.3f))); + PeppermintTea.set(kubaitems.registerProxyItem(new ItemTea("peppermint_tea", 4, 0.3f))); + PuerhTea.set(kubaitems.registerProxyItem(new ItemTea("pu-erh_tea", 4, 0.3f))); + WhiteTea.set(kubaitems.registerProxyItem(new ItemTea("white_tea", 4, 0.3f))); + YellowTea.set(kubaitems.registerProxyItem(new ItemTea("yellow_tea", 4, 0.3f))); + + BlackTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("black_tea_leaf"))); + GreenTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("green_tea_leaf"))); + OolongTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("oolong_tea_leaf"))); + PuerhTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("pu-erh_tea_leaf"))); + WhiteTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("white_tea_leaf"))); + YellowTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("yellow_tea_leaf"))); + + TeaLeafDehydrated.set(kubaitems.registerProxyItem(new ItemTeaIngredient("tea_leaf_dehydrated"))); + SteamedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("steamed_tea_leaf"))); + RolledTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("rolled_tea_leaf"))); + OxidizedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("oxidized_tea_leaf"))); + FermentedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("fermented_tea_leaf"))); + BruisedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("bruised_tea_leaf"))); + PartiallyOxidizedTeaLeaf.set(kubaitems.registerProxyItem(new ItemTeaIngredient("partially_oxidized_tea_leaf"))); TeaAcceptorResearchNote .set(kubaitems.registerProxyItem(new ItemProxy("tea_acceptor_research_note", "research_note"))); diff --git a/src/main/java/kubatech/loaders/MobHandlerLoader.java b/src/main/java/kubatech/loaders/MobHandlerLoader.java index c7932dd00c..d54edfa260 100644 --- a/src/main/java/kubatech/loaders/MobHandlerLoader.java +++ b/src/main/java/kubatech/loaders/MobHandlerLoader.java @@ -21,8 +21,8 @@ package kubatech.loaders; import static gregtech.api.enums.Mods.InfernalMobs; -import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher.DIAMOND_SPIKES_DAMAGE; -import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher.MOB_SPAWN_INTERVAL; +import static kubatech.tileentity.gregtech.multiblock.MTEExtremeEntityCrusher.DIAMOND_SPIKES_DAMAGE; +import static kubatech.tileentity.gregtech.multiblock.MTEExtremeEntityCrusher.MOB_SPAWN_INTERVAL; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -50,10 +50,10 @@ import com.kuba6000.mobsinfo.api.event.PreMobsRegistrationEvent; import atomicstryker.infernalmobs.common.InfernalMobsCore; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import kubatech.Tags; import kubatech.config.Config; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeEntityCrusher; public class MobHandlerLoader { @@ -90,7 +90,7 @@ public class MobHandlerLoader { mDuration = Math.max(MOB_SPAWN_INTERVAL, (int) ((recipe.maxEntityHealth / DIAMOND_SPIKES_DAMAGE) * 10d)); } - public ItemStack[] generateOutputs(Random rnd, GT_MetaTileEntity_ExtremeEntityCrusher MTE, double attackDamage, + public ItemStack[] generateOutputs(Random rnd, MTEExtremeEntityCrusher MTE, double attackDamage, int lootinglevel, boolean preferInfernalDrops, boolean voidAllDamagedAndEnchantedItems) { MTE.lEUt = mEUt; MTE.mMaxProgresstime = Math.max(MOB_SPAWN_INTERVAL, (int) ((recipe.maxEntityHealth / attackDamage) * 10d)); @@ -235,8 +235,8 @@ public class MobHandlerLoader { if (recipe != null) { event.additionalInformation.addAll( Arrays.asList( - GT_Utility.trans("153", "Usage: ") + GT_Utility.formatNumbers(recipe.mEUt) + " EU/t", - GT_Utility.trans("158", "Time: ") + GT_Utility.formatNumbers(recipe.mDuration / 20d) + " secs")); + GTUtility.trans("153", "Usage: ") + GTUtility.formatNumbers(recipe.mEUt) + " EU/t", + GTUtility.trans("158", "Time: ") + GTUtility.formatNumbers(recipe.mDuration / 20d) + " secs")); } } } diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 94bb9fb8ee..139909851a 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -36,13 +36,13 @@ import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; -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.AssemblyLine; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +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.AssemblyLine; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; import static kubatech.api.enums.ItemList.BlackTea; import static kubatech.api.enums.ItemList.BlackTeaLeaf; @@ -82,29 +82,29 @@ import net.minecraftforge.fluids.FluidRegistry; import cpw.mods.fml.common.registry.GameRegistry; import forestry.plugins.PluginCore; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import ic2.core.Ic2Items; import kubatech.api.enums.ItemList; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_DEFusionCrafter; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_MegaIndustrialApiary; +import kubatech.tileentity.gregtech.multiblock.MTEDEFusionCrafter; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeEntityCrusher; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; +import kubatech.tileentity.gregtech.multiblock.MTEMegaIndustrialApiary; public class RecipeLoader { - protected static final long bitsd = GT_ModHandler.RecipeBits.NOT_REMOVA