diff options
Diffstat (limited to 'src/main/java/kubatech')
34 files changed, 534 insertions, 551 deletions
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<T extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T>> - extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T> { +public abstract class KubaTechGTMultiBlockBase<T extends MTEExtendedPowerMultiBlockBase<T>> + extends MTEExtendedPowerMultiBlockBase<T> { @Deprecated public final int mEUt = 0; @@ -212,8 +212,8 @@ public abstract class KubaTechGTMultiBlockBase<T extends GT_MetaTileEntity_Exten if (list == null || list.isEmpty() || mappingFunction == null) return false; int emptySlots = 0; boolean ignoreEmptiness = false; - for (GT_MetaTileEntity_Hatch_OutputBus i : mOutputBusses) { - if (i instanceof GT_MetaTileEntity_Hatch_OutputBus_ME) { + for (MTEHatchOutputBus i : mOutputBusses) { + if (i instanceof MTEHatchOutputBusME) { ignoreEmptiness = true; break; } @@ -277,7 +277,7 @@ public abstract class KubaTechGTMultiBlockBase<T extends GT_MetaTileEntity_Exten public void createInventorySlots() { final SlotWidget inventorySlot = new SlotWidget(inventoryHandler, 1); - inventorySlot.setBackground(GT_UITextures.SLOT_DARK_GRAY); + inventorySlot.setBackground(GTUITextures.SLOT_DARK_GRAY); slotWidgets.add(inventorySlot); } @@ -294,7 +294,7 @@ public abstract class KubaTechGTMultiBlockBase<T extends GT_MetaTileEntity_Exten @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK) .setPos(4, 4) .setSize(190, 85)); @@ -334,13 +334,13 @@ public abstract class KubaTechGTMultiBlockBase<T extends GT_MetaTileEntity_Exten } protected 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; } protected final Function<Widget, Boolean> isFixed = widget -> getIdealStatus() == getRepairStatus() && mMachine; protected static final Function<Integer, IDrawable> 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<Integer, IDrawable[]> 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_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED - | GT_ModHandler.RecipeBits.DISMANTLEABLE; + protected static final long bitsd = GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED + | GTModHandler.RecipeBits.DISMANTLEABLE; public static void registerMTEs() { if (MobsInfo.isModLoaded() && EnderIO.isModLoaded()) { ExtremeEntityCrusher.set( - new GT_MetaTileEntity_ExtremeEntityCrusher( + new MTEExtremeEntityCrusher( ExtremeEntityCrusherController.ID, "multimachine.entitycrusher", "Extreme Entity Crusher").getStackForm(1)); @@ -112,21 +112,21 @@ public class RecipeLoader { if (Forestry.isModLoaded()) { ExtremeIndustrialApiary.set( - new GT_MetaTileEntity_MegaIndustrialApiary( + new MTEMegaIndustrialApiary( ExtremeIndustrialApiaryController.ID, "multimachine.extremeapiary", "Industrial Apicultural Acclimatiser and Drone Domestication Station").getStackForm(1)); } ExtremeIndustrialGreenhouse.set( - new GT_MetaTileEntity_ExtremeIndustrialGreenhouse( + new MTEExtremeIndustrialGreenhouse( ExtremeIndustrialGreenhouseController.ID, "multimachine.extremegreenhouse", "Extreme Industrial Greenhouse").getStackForm(1)); if (DraconicEvolution.isModLoaded()) { DraconicEvolutionFusionCrafter.set( - new GT_MetaTileEntity_DEFusionCrafter( + new MTEDEFusionCrafter( DraconicEvolutionFusionCrafterController.ID, "multimachine.defusioncrafter", "Draconic Evolution Fusion Crafter").getStackForm(1)); @@ -136,16 +136,16 @@ public class RecipeLoader { public static void addRecipes() { if (MobsInfo.isModLoaded() && EnderIO.isModLoaded()) { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ItemList.ExtremeEntityCrusher.get(1), bitsd, new Object[] { "RCR", "CHC", "VVV", 'R', gregtech.api.enums.ItemList.Robot_Arm_EV, 'C', OrePrefixes.circuit.get(Materials.EV), 'H', gregtech.api.enums.ItemList.Hull_EV, 'V', - GT_ModHandler.getModItem(OpenBlocks.ID, "vacuumhopper", 1, new ItemStack(Blocks.hopper)) }); + GTModHandler.getModItem(OpenBlocks.ID, "vacuumhopper", 1, new ItemStack(Blocks.hopper)) }); } if (Forestry.isModLoaded()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, gregtech.api.enums.ItemList.Machine_IndustrialApiary.get(1)) .metadata(RESEARCH_TIME, 8 * MINUTES + 20 * SECONDS) .itemInputs( @@ -165,21 +165,20 @@ public class RecipeLoader { .duration(5 * MINUTES) .addTo(AssemblyLine); - GT_MetaTileEntity_ExtremeIndustrialGreenhouse - .addFertilizerItem(PluginCore.items.fertilizerCompound.getItemStack(1)); + MTEExtremeIndustrialGreenhouse.addFertilizerItem(PluginCore.items.fertilizerCompound.getItemStack(1)); } - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ExtremeIndustrialGreenhouse.get(1), bitsd, new Object[] { "AZA", "BRB", "AZA", 'B', gregtech.api.enums.ItemList.Casing_CleanStainlessSteel, 'R', - GT_ModHandler.getModItem(EnderIO.ID, "blockFarmStation", 1, new ItemStack(Items.diamond_hoe)), 'A', + GTModHandler.getModItem(EnderIO.ID, "blockFarmStation", 1, new ItemStack(Items.diamond_hoe)), 'A', gregtech.api.enums.ItemList.AcceleratorIV.get(1), 'Z', OrePrefixes.circuit.get(Materials.ZPM) }); // Vanilla should always be loaded - GT_MetaTileEntity_ExtremeIndustrialGreenhouse.addFertilizerItem(new ItemStack(Items.dye, 1, 15)); + MTEExtremeIndustrialGreenhouse.addFertilizerItem(new ItemStack(Items.dye, 1, 15)); // IC2 should always be loaded - GT_MetaTileEntity_ExtremeIndustrialGreenhouse.addFertilizerItem(Ic2Items.fertilizer); + MTEExtremeIndustrialGreenhouse.addFertilizerItem(Ic2Items.fertilizer); if (DraconicEvolution.isModLoaded()) { // Controller recipe added in TecTech @@ -199,21 +198,21 @@ public class RecipeLoader { private static void RegisterTeaLine() { // TEA LINE // if (PamsHarvestCraft.isModLoaded()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(GameRegistry.findItemStack("harvestcraft", "tealeafItem", 1)) .itemOutputs(TeaLeafDehydrated.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(TeaLeafDehydrated.get(1)) .itemOutputs(WhiteTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(TeaLeafDehydrated.get(1)) .itemOutputs(SteamedTeaLeaf.get(1)) .fluidInputs(FluidRegistry.getFluidStack("water", 50)) @@ -221,70 +220,70 @@ public class RecipeLoader { .duration(5 * SECONDS) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(SteamedTeaLeaf.get(1)) .itemOutputs(YellowTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(TeaLeafDehydrated.get(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(TeaLeafDehydrated.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(RolledTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(RolledTeaLeaf.get(1)) .itemOutputs(GreenTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(RolledTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(RolledTeaLeaf.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(OxidizedTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(OxidizedTeaLeaf.get(1)) .itemOutputs(BlackTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(RolledTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(RolledTeaLeaf.get(1), GTUtility.getIntegratedCircuit(2)) .itemOutputs(FermentedTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(10 * SECONDS) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(FermentedTeaLeaf.get(1)) .itemOutputs(PuerhTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(chemicalDehydratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(TeaLeafDehydrated.get(1)) .itemOutputs(BruisedTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(5 * SECONDS) .addTo(cutterRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(BruisedTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(BruisedTeaLeaf.get(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(PartiallyOxidizedTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) .duration(2 * SECONDS + 10 * TICKS) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(PartiallyOxidizedTeaLeaf.get(1)) .itemOutputs(OolongTeaLeaf.get(1)) .eut(TierEU.RECIPE_LV) @@ -294,7 +293,7 @@ public class RecipeLoader { // Tea Assembly GameRegistry.addSmelting(BlackTeaLeaf.get(1), BlackTea.get(1), 10); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(BlackTea.get(1), GameRegistry.findItemStack("harvestcraft", "limejuiceItem", 1)) .itemOutputs(EarlGrayTea.get(1)) .eut(TierEU.RECIPE_LV) @@ -303,7 +302,7 @@ public class RecipeLoader { GameRegistry.addSmelting(GreenTeaLeaf.get(1), GreenTea.get(1), 10); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(BlackTea.get(1)) .itemOutputs(LemonTea.get(1)) .fluidInputs(FluidRegistry.getFluidStack("potion.lemonjuice", 1000)) @@ -311,7 +310,7 @@ public class RecipeLoader { .duration(5 * SECONDS) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(BlackTea.get(1)) .itemOutputs(MilkTea.get(1)) .fluidInputs(FluidRegistry.getFluidStack("milk", 1000)) @@ -321,7 +320,7 @@ public class RecipeLoader { GameRegistry.addSmelting(OolongTeaLeaf.get(1), OolongTea.get(1), 10); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(GameRegistry.findItemStack("harvestcraft", "peppermintItem", 1)) .itemOutputs(PeppermintTea.get(1)) .fluidInputs(FluidRegistry.getFluidStack("water", 1000)) @@ -334,7 +333,7 @@ public class RecipeLoader { GameRegistry.addSmelting(YellowTeaLeaf.get(1), YellowTea.get(1), 10); } if (Avaritia.isModLoaded() && NewHorizonsCoreMod.isModLoaded()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, TeaAcceptorResearchNote.get(1)) .metadata(RESEARCH_TIME, 8 * MINUTES + 20 * SECONDS) .itemInputs( diff --git a/src/main/java/kubatech/loaders/TCLoader.java b/src/main/java/kubatech/loaders/TCLoader.java index f6ff1cac9f..500dab7f3e 100644 --- a/src/main/java/kubatech/loaders/TCLoader.java +++ b/src/main/java/kubatech/loaders/TCLoader.java @@ -36,7 +36,7 @@ import com.kuba6000.mobsinfo.api.utils.ItemID; import cpw.mods.fml.common.registry.GameRegistry; import kubatech.api.enums.ItemList; -import kubatech.loaders.item.items.TeaUltimate; +import kubatech.loaders.item.items.ItemTeaUltimate; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; @@ -135,14 +135,14 @@ public class TCLoader { @Override public String getName() { - return TeaUltimate.getUltimateTeaDisplayName(super.getName()); + return ItemTeaUltimate.getUltimateTeaDisplayName(super.getName()); } }; ultimateTeaResearch.setPages(new ResearchPage("KT.research.ultimatetea") { @Override public String getTranslatedText() { - return TeaUltimate.getUltimateTeaDisplayName(super.getTranslatedText()); + return ItemTeaUltimate.getUltimateTeaDisplayName(super.getTranslatedText()); } }, new ResearchPage(ultimateTeaRecipe)); ultimateTeaResearch.setParents("INFUSION", "DEZILSMARSHMALLOW"); diff --git a/src/main/java/kubatech/loaders/block/defc/DEFCCasingBlock.java b/src/main/java/kubatech/loaders/block/defc/BlockDEFCCasing.java index 5a6b95acfe..6c57cf8821 100644 --- a/src/main/java/kubatech/loaders/block/defc/DEFCCasingBlock.java +++ b/src/main/java/kubatech/loaders/block/defc/BlockDEFCCasing.java @@ -11,28 +11,28 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_Block_Casings_Abstract; +import gregtech.api.util.GTLanguageManager; +import gregtech.common.blocks.BlockCasingsAbstract; import kubatech.Tags; import kubatech.api.enums.ItemList; -public class DEFCCasingBlock extends GT_Block_Casings_Abstract { +public class BlockDEFCCasing extends BlockCasingsAbstract { @SideOnly(Side.CLIENT) private IIcon[] texture; - public DEFCCasingBlock() { - super(DEFCCasingItemBlock.class, "defc.casing", Material.anvil); + public BlockDEFCCasing() { + super(ItemBlockDEFCCasing.class, "defc.casing", Material.anvil); this.setHardness(15.0F); this.setResistance(30.0F); this.setCreativeTab(KT); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Naquadah Alloy Fusion Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Bloody Ichorium Fusion Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Draconium Fusion Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Wyvern Fusion Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Awakened Draconium Fusion Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Chaotic Fusion Casing"); + GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Naquadah Alloy Fusion Casing"); + GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Bloody Ichorium Fusion Casing"); + GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Draconium Fusion Casing"); + GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Wyvern Fusion Casing"); + GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Awakened Draconium Fusion Casing"); + GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Chaotic Fusion Casing"); ItemList.DEFCCasingBase.set(new ItemStack(this, 1, 7)); ItemList.DEFCCasingT1.set(new ItemStack(this, 1, 8)); diff --git a/src/main/java/kubatech/loaders/block/defc/DEFCCasingItemBlock.java b/src/main/java/kubatech/loaders/block/defc/ItemBlockDEFCCasing.java index 669e3a6dc8..125bb7091f 100644 --- a/src/main/java/kubatech/loaders/block/defc/DEFCCasingItemBlock.java +++ b/src/main/java/kubatech/loaders/block/defc/ItemBlockDEFCCasing.java @@ -10,11 +10,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; -import gregtech.common.blocks.GT_Item_Casings_Abstract; +import gregtech.common.blocks.ItemCasingsAbstract; -public class DEFCCasingItemBlock extends GT_Item_Casings_Abstract { +public class ItemBlockDEFCCasing extends ItemCasingsAbstract { - public DEFCCasingItemBlock(Block block) { + public ItemBlockDEFCCasing(Block block) { super(block); this.setMaxDamage(0); this.setHasSubtypes(true); diff --git a/src/main/java/kubatech/loaders/block/kubablock/blocks/TeaAcceptor.java b/src/main/java/kubatech/loaders/block/kubablock/blocks/BlockTeaAcceptor.java index 06ee3490b1..2787a2bbb1 100644 --- a/src/main/java/kubatech/loaders/block/kubablock/blocks/TeaAcceptor.java +++ b/src/main/java/kubatech/loaders/block/kubablock/blocks/BlockTeaAcceptor.java @@ -33,9 +33,9 @@ import kubatech.loaders.block.kubablock.BlockProxy; import kubatech.loaders.block.kubablock.IProxyTileEntityProvider; import kubatech.tileentity.TeaAcceptorTile; -public class TeaAcceptor extends BlockProxy implements IProxyTileEntityProvider { +public class BlockTeaAcceptor extends BlockProxy implements IProxyTileEntityProvider { - public TeaAcceptor() { + public BlockTeaAcceptor() { super("tea_acceptor", "tea_acceptor", "blank"); } diff --git a/src/main/java/kubatech/loaders/block/kubablock/blocks/TeaStorage.java b/src/main/java/kubatech/loaders/block/kubablock/blocks/BlockTeaStorage.java index 436af9a4e2..421ceaa0d2 100644 --- a/src/main/java/kubatech/loaders/block/kubablock/blocks/TeaStorage.java +++ b/src/main/java/kubatech/loaders/block/kubablock/blocks/BlockTeaStorage.java @@ -36,9 +36,9 @@ import kubatech.loaders.block.kubablock.BlockProxy; import kubatech.loaders.block.kubablock.IProxyTileEntityProvider; import kubatech.tileentity.TeaStorageTile; -public class TeaStorage extends BlockProxy implements IProxyTileEntityProvider { +public class BlockTeaStorage extends BlockProxy implements IProxyTileEntityProvider { - public TeaStorage() { + public BlockTeaStorage() { super("tea_storage", "tea_storage"); } diff --git a/src/main/java/kubatech/loaders/item/items/Tea.java b/src/main/java/kubatech/loaders/item/items/ItemTea.java index f1b3ae3d0b..5beb813053 100644 --- a/src/main/java/kubatech/loaders/item/items/Tea.java +++ b/src/main/java/kubatech/loaders/item/items/ItemTea.java @@ -29,12 +29,12 @@ import net.minecraft.world.World; import kubatech.loaders.item.ItemProxy; -public class Tea extends ItemProxy { +public class ItemTea extends ItemProxy { private final int heal; private final float saturation; - public Tea(String unlocalizedName, int heal, float saturation) { + public ItemTea(String unlocalizedName, int heal, float saturation) { super("tea." + unlocalizedName, "tea/" + unlocalizedName); this.heal = heal; this.saturation = saturation; diff --git a/src/main/java/kubatech/loaders/item/items/TeaCollection.java b/src/main/java/kubatech/loaders/item/items/ItemTeaCollection.java index efa390c517..6b18342462 100644 --- a/src/main/java/kubatech/loaders/item/items/TeaCollection.java +++ b/src/main/java/kubatech/loaders/item/items/ItemTeaCollection.java @@ -43,14 +43,14 @@ import kubatech.api.utils.ModUtils; import kubatech.loaders.ItemLoader; import kubatech.loaders.item.ItemProxy; -public class TeaCollection extends ItemProxy { +public class ItemTeaCollection extends ItemProxy { protected static TeaPage teapage; protected static LinkedList<Achievement> achievements; protected Achievement achievement; private final String achievementname; - public TeaCollection(String unlocalizedName) { + public ItemTeaCollection(String unlocalizedName) { super("teacollection." + unlocalizedName, "tea/" + unlocalizedName); achievementname = "teacollection." + unlocalizedName; } diff --git a/src/main/java/kubatech/loaders/item/items/TeaIngredient.java b/src/main/java/kubatech/loaders/item/items/ItemTeaIngredient.java index 4ff248ea37..08dc460d30 100644 --- a/src/main/java/kubatech/loaders/item/items/TeaIngredient.java +++ b/src/main/java/kubatech/loaders/item/items/ItemTeaIngredient.java @@ -28,9 +28,9 @@ import net.minecraft.util.EnumChatFormatting; import kubatech.loaders.item.ItemProxy; -public class TeaIngredient extends ItemProxy { +public class ItemTeaIngredient extends ItemProxy { - public TeaIngredient(String unlocalizedName) { + public ItemTeaIngredient(String unlocalizedName) { super("teaingredient." + unlocalizedName, "teaingredient/" + unlocalizedName); } diff --git a/src/main/java/kubatech/loaders/item/items/TeaUltimate.java b/src/main/java/kubatech/loaders/item/items/ItemTeaUltimate.java index cee7eba132..d6df893cd6 100644 --- a/src/main/java/kubatech/loaders/item/items/TeaUltimate.java +++ b/src/main/java/kubatech/loaders/item/items/ItemTeaUltimate.java @@ -59,9 +59,9 @@ import kubatech.api.utils.ModUtils; import kubatech.api.utils.StringUtils; import kubatech.loaders.item.IItemProxyGUI; -public class TeaUltimate extends TeaCollection implements IItemProxyGUI { +public class ItemTeaUltimate extends ItemTeaCollection implements IItemProxyGUI { - public TeaUltimate() { + public ItemTeaUltimate() { super("ultimate_tea"); } diff --git a/src/main/java/kubatech/nei/NEI_Config.java b/src/main/java/kubatech/nei/NEIConfig.java index 66dadbb08c..2d1927f5c2 100644 --- a/src/main/java/kubatech/nei/NEI_Config.java +++ b/src/main/java/kubatech/nei/NEIConfig.java @@ -38,7 +38,7 @@ import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; import kubatech.Tags; -public class NEI_Config implements IConfigureNEI { +public class NEIConfig implements IConfigureNEI { @Override public void loadConfig() { diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_DEFusionCrafter.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEDEFusionCrafter.java index f0579bf054..9e783049ed 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_DEFusionCrafter.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEDEFusionCrafter.java @@ -4,12 +4,12 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -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.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; +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.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_MAGIC; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE_GLOW; @@ -18,7 +18,7 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE_GLOW; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER_GLOW; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import static kubatech.api.Variables.StructureHologram; import static kubatech.api.Variables.buildAuthorList; @@ -37,7 +37,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -46,16 +46,15 @@ import gregtech.api.recipe.RecipeMap; 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.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; import kubatech.Tags; import kubatech.api.implementations.KubaTechGTMultiBlockBase; import kubatech.loaders.BlockLoader; import kubatech.loaders.DEFCRecipes; -public class GT_MetaTileEntity_DEFusionCrafter extends KubaTechGTMultiBlockBase<GT_MetaTileEntity_DEFusionCrafter> - implements ISurvivalConstructable { +public class MTEDEFusionCrafter extends KubaTechGTMultiBlockBase<MTEDEFusionCrafter> implements ISurvivalConstructable { private static final int CASING_INDEX = (1 << 7) + (15 + 48); private int mTierCasing = 0; @@ -63,30 +62,30 @@ public class GT_MetaTileEntity_DEFusionCrafter extends KubaTechGTMultiBlockBase< private int mCasing = 0; @SuppressWarnings("unused") - public GT_MetaTileEntity_DEFusionCrafter(int aID, String aName, String aNameRegional) { + public MTEDEFusionCrafter(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GT_MetaTileEntity_DEFusionCrafter(String aName) { + public MTEDEFusionCrafter(String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_DEFusionCrafter(mName); + return new MTEDEFusionCrafter(mName); } private static final String STRUCTURE_PIECE_MAIN = "main"; private static final List<Pair<Block, Integer>> fusionCasingTiers = Arrays - .asList(Pair.of(GregTech_API.sBlockCasings4, 6), Pair.of(GregTech_API.sBlockCasings4, 8)); + .asList(Pair.of(GregTechAPI.sBlockCasings4, 6), Pair.of(GregTechAPI.sBlockCasings4, 8)); private static final List<Pair<Block, Integer>> coreTiers = Arrays.asList( Pair.of(BlockLoader.defcCasingBlock, 8), Pair.of(BlockLoader.defcCasingBlock, 9), Pair.of(BlockLoader.defcCasingBlock, 10), Pair.of(BlockLoader.defcCasingBlock, 11), Pair.of(BlockLoader.defcCasingBlock, 12)); - private static final IStructureDefinition<GT_MetaTileEntity_DEFusionCrafter> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_DEFusionCrafter>builder() + private static final IStructureDefinition<MTEDEFusionCrafter> STRUCTURE_DEFINITION = StructureDefinition + .<MTEDEFusionCrafter>builder() .addShape( STRUCTURE_PIECE_MAIN, transpose( @@ -104,15 +103,15 @@ public class GT_MetaTileEntity_DEFusionCrafter extends KubaTechGTMultiBlockBase< })) // spotless:on .addElement( 'N', - buildHatchAdder(GT_MetaTileEntity_DEFusionCrafter.class) + buildHatchAdder(MTEDEFusionCrafter.class) .atLeast(InputBus, InputHatch, OutputBus, OutputHatch, Energy, Maintenance) .casingIndex(CASING_INDEX) .dot(1) .buildAndChain(onElementPass(e -> e.mCasing++, ofBlock(BlockLoader.defcCasingBlock, 7)))) .addElement('n', onElementPass(e -> e.mCasing++, ofBlock(BlockLoader.defcCasingBlock, 7))) - .addElement('f', ofBlock(GregTech_API.sBlockCasings4, 7)) + .addElement('f', ofBlock(GregTechAPI.sBlockCasings4, 7)) .addElement('F', ofBlocksTiered((Block b, int m) -> { - if (b != GregTech_API.sBlockCasings4 || (m != 6 && m != 8)) return -2; + if (b != GregTechAPI.sBlockCasings4 || (m != 6 && m != 8)) return -2; return m == 6 ? 1 : 2; }, fusionCasingTiers, -1, (e, i) -> e.mFusionTierCasing = i, e -> e.mFusionTierCasing)) .addElement('R', ofBlocksTiered((Block b, int m) -> { @@ -122,7 +121,7 @@ public class GT_MetaTileEntity_DEFusionCrafter extends KubaTechGTMultiBlockBase< .build(); @Override - public IStructureDefinition<GT_MetaTileEntity_DEFusionCrafter> getStructureDefinition() { + public IStructureDefinition<MTEDEFusionCrafter> getStructureDefinition() { return STRUCTURE_DEFINITION; } @@ -138,8 +137,8 @@ public class GT_MetaTileEntity_DEFusionCrafter extends KubaTechGTMultiBlockBase< } @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("Fusion Crafter") .addInfo("Controller Block for the Draconic Evolution Fusion Crafter") .addInfo(buildAuthorList("kuba6000", "Prometheus0000")) @@ -224,14 +223,14 @@ public class GT_MetaTileEntity_DEFusionCrafter extends KubaTechGTMultiBlockBase< @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { return recipe.mSpecialValue <= mTierCasing ? CheckRecipeResultRegistry.SUCCESSFUL : CheckRecipeResultRegistry.insufficientMachineTier(recipe.mSpecialValue); } @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return super.createOverclockCalculator(recipe) .setSpeedBoost(1f / (mTierCasing - recipe.mSpecialValue + 1)); } diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeEntityCrusher.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java index e6d7e28b4d..07a3c3deb1 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeEntityCrusher.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java @@ -24,11 +24,11 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.OutputHatch; import static gregtech.api.enums.Mods.BloodMagic; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.InfernalMobs; @@ -37,8 +37,8 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_GLOW; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.ofFrame; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.ofFrame; import static kubatech.api.Variables.Author; import static kubatech.api.Variables.StructureHologram; @@ -75,7 +75,6 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass; import com.google.common.collect.Multimap; import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; @@ -100,27 +99,28 @@ import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import WayofTime.alchemicalWizardry.common.rituals.RitualEffectWellOfSuffering; import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; +import bartworks.API.BorosilicateGlass; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.Mods; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import kubatech.Tags; import kubatech.api.helpers.ReflectionHelper; import kubatech.api.implementations.KubaTechGTMultiBlockBase; @@ -130,8 +130,7 @@ import kubatech.client.effect.EntityRenderer; import kubatech.loaders.MobHandlerLoader; import kubatech.network.CustomTileEntityPacket; -public class GT_MetaTileEntity_ExtremeEntityCrusher - extends KubaTechGTMultiBlockBase<GT_MetaTileEntity_ExtremeEntityCrusher> +public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtremeEntityCrusher> implements CustomTileEntityPacketHandler, ISurvivalConstructable { public static final double DIAMOND_SPIKES_DAMAGE = 9d; @@ -141,12 +140,12 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher private final WeaponCache weaponCache; @SuppressWarnings("unused") - public GT_MetaTileEntity_ExtremeEntityCrusher(int aID, String aName, String aNameRegional) { + public MTEExtremeEntityCrusher(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); weaponCache = new WeaponCache(mInventory); } - public GT_MetaTileEntity_ExtremeEntityCrusher(String aName) { + public MTEExtremeEntityCrusher(String aName) { super(aName); weaponCache = new WeaponCache(mInventory); if (BloodMagic.isModLoaded()) MinecraftForge.EVENT_BUS.register(this); @@ -170,8 +169,8 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher private static final Item poweredSpawnerItem = Item.getItemFromBlock(EnderIO.blockPoweredSpawner); private static final int CASING_INDEX = 16; private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition<GT_MetaTileEntity_ExtremeEntityCrusher> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_ExtremeEntityCrusher>builder() + private static final IStructureDefinition<MTEExtremeEntityCrusher> STRUCTURE_DEFINITION = StructureDefinition + .<MTEExtremeEntityCrusher>builder() .addShape( STRUCTURE_PIECE_MAIN, transpose( @@ -184,14 +183,14 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher { "fgggf", "gsssg", "gsssg", "gsssg", "fgggf" }, { "CC~CC", "CCCCC", "CCCCC", "CCCCC", "CCCCC" }, })) // spotless:on - .addElement('c', onElementPass(t -> t.mCasing++, ofBlock(GregTech_API.sBlockCasings2, 0))) + .addElement('c', onElementPass(t -> t.mCasing++, ofBlock(GregTechAPI.sBlockCasings2, 0))) .addElement( 'C', - buildHatchAdder(GT_MetaTileEntity_ExtremeEntityCrusher.class) + buildHatchAdder(MTEExtremeEntityCrusher.class) .atLeast(InputBus, OutputBus, OutputHatch, Energy, Maintenance) .casingIndex(CASING_INDEX) .dot(1) - .buildAndChain(onElementPass(t -> t.mCasing++, ofBlock(GregTech_API.sBlockCasings2, 0)))) + .buildAndChain(onElementPass(t -> t.mCasing++, ofBlock(GregTechAPI.sBlockCasings2, 0)))) .addElement('g', BorosilicateGlass.ofBoroGlass((byte) 0, (t, v) -> t.mGlassTier = v, t -> t.mGlassTier)) .addElement('f', ofFrame(Materials.Steel)) .addElement( @@ -251,7 +250,7 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher } @Override - public IStructureDefinition<GT_MetaTileEntity_ExtremeEntityCrusher> getStructureDefinition() { + public IStructureDefinition<MTEExtremeEntityCrusher> getStructureDefinition() { return STRUCTURE_DEFINITION; } @@ -261,8 +260,8 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher } @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("Powered Spawner, EEC") .addInfo("Controller block for the Extreme Entity Crusher") .addInfo(Author) @@ -311,7 +310,7 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ExtremeEntityCrusher(this.mName); + return new MTEExtremeEntityCrusher(this.mName); } @Override @@ -394,24 +393,24 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher @Override public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (this.mMaxProgresstime > 0) { - GT_Utility.sendChatToPlayer(aPlayer, "Can't change mode when running !"); + GTUtility.sendChatToPlayer(aPlayer, "Can't change mode when running !"); return; } if (aPlayer.isSneaking()) { if (!InfernalMobs.isModLoaded()) return; mIsProducingInfernalDrops = !mIsProducingInfernalDrops; if (!mIsProducingInfernalDrops) - GT_Utility.sendChatToPlayer(aPlayer, "Mobs will now be prevented from spawning infernal"); - else GT_Utility.sendChatToPlayer(aPlayer, "Mobs can spawn infernal now"); + GTUtility.sendChatToPlayer(aPlayer, "Mobs will now be prevented from spawning infernal"); + else GTUtility.sendChatToPlayer(aPlayer, "Mobs can spawn infernal now"); } else { if (!BloodMagic.isModLoaded()) return; isInRitualMode = !isInRitualMode; if (!isInRitualMode) { - GT_Utility.sendChatToPlayer(aPlayer, "Ritual mode disabled"); + GTUtility.sendChatToPlayer(aPlayer, "Ritual mode disabled"); } else { - GT_Utility.sendChatToPlayer(aPlayer, "Ritual mode enabled"); - if (connectToRitual()) GT_Utility.sendChatToPlayer(aPlayer, "Successfully connected to the ritual"); - else GT_Utility.sendChatToPlayer(aPlayer, "Can't connect to the ritual"); + GTUtility.sendChatToPlayer(aPlayer, "Ritual mode enabled"); + if (connectToRitual()) GTUtility.sendChatToPlayer(aPlayer, "Successfully connected to the ritual"); + else GTUtility.sendChatToPlayer(aPlayer, "Can't connect to the ritual"); } } } @@ -421,7 +420,7 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher float aX, float aY, float aZ) { if (wrenchingSide == getBaseMetaTileEntity().getFrontFacing()) { mAnimationEnabled = !mAnimationEnabled; - GT_Utility.sendChatToPlayer(aPlayer, "Animations are " + (mAnimationEnabled ? "enabled" : "disabled")); + GTUtility.sendChatToPlayer(aPlayer, "Animations are " + (mAnimationEnabled ? "enabled" : "disabled")); return true; } else return super.onSolderingToolRightClick(side, wrenchingSide, aPlayer, aX, aY, aZ); } @@ -561,8 +560,7 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher double attackDamage = DIAMOND_SPIKES_DAMAGE; // damage from spikes weaponCheck: { - GT_MetaTileEntity_Hatch_InputBus inputbus = this.mInputBusses.size() == 0 ? null - : this.mInputBusses.get(0); + MTEHatchInputBus inputbus = this.mInputBusses.size() == 0 ? null : this.mInputBusses.get(0); if (inputbus != null && !inputbus.isValid()) inputbus = null; ItemStack lootingHolder = inputbus == null ? null : inputbus.getStackInSlot(0); if (lootingHolder == null) break weaponCheck; @@ -662,8 +660,7 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher || mEnergyHatches.size() == 0 || !(mInputBusses.size() == 0 || (mInputBusses.size() == 1 && mInputBusses.get(0).mTier == 0))) return false; - if (mGlassTier < 8) - for (GT_MetaTileEntity_Hatch_Energy hatch : mEnergyHatches) if (hatch.mTier > mGlassTier) return false; + if (mGlassTier < 8) for (MTEHatchEnergy hatch : mEnergyHatches) if (hatch.mTier > mGlassTier) return false; if (isInRitualMode) connectToRitual(); return true; } @@ -700,7 +697,7 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher configurationElements.setSynced(true); configurationElements.widget(new CycleButtonWidget().setToggle(() -> isInRitualMode, v -> { if (this.mMaxProgresstime > 0) { - GT_Utility.sendChatToPlayer(buildContext.getPlayer(), "Can't change mode when running !"); + GTUtility.sendChatToPlayer(buildContext.getPlayer(), "Can't change mode when running !"); return; } @@ -708,12 +705,12 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher if (!(buildContext.getPlayer() instanceof EntityPlayerMP)) return; if (!isInRitualMode) { - GT_Utility.sendChatToPlayer(buildContext.getPlayer(), "Ritual mode disabled"); + GTUtility.sendChatToPlayer(buildContext.getPlayer(), "Ritual mode disabled"); } else { - GT_Utility.sendChatToPlayer(buildContext.getPlayer(), "Ritual mode enabled"); + GTUtility.sendChatToPlayer(buildContext.getPlayer(), "Ritual mode enabled"); if (connectToRitual()) - GT_Utility.sendChatToPlayer(buildContext.getPlayer(), "Successfully connected to the ritual"); - else GT_Utility.sendChatToPlayer(buildContext.getPlayer(), "Can't connect to the ritual"); + GTUtility.sendChatToPlayer(buildContext.getPlayer(), "Successfully connected to the ritual"); + else GTUtility.sendChatToPlayer(buildContext.getPlayer(), "Can't connect to the ritual"); } }) .setTextureGetter(toggleButtonTextureGetter) @@ -723,16 +720,16 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher .setTooltipShowUpDelay(TOOLTIP_DELAY)); configurationElements.widget(new CycleButtonWidget().setToggle(() -> mIsProducingInfernalDrops, v -> { if (this.mMaxProgresstime > 0) { - GT_Utility.sendChatToPlayer(buildContext.getPlayer(), "Can't change mode when running !"); + GTUtility.sendChatToPlayer(buildContext.getPlayer(), "Can't change mode when running !"); return; } mIsProducingInfernalDrops = v; if (!(buildContext.getPlayer() instanceof EntityPlayerMP)) return; - if (!mIsProducingInfernalDrops) GT_Utility + if (!mIsProducingInfernalDrops) GTUtility .sendChatToPlayer(buildContext.getPlayer(), "Mobs will now be prevented from spawning infernal"); - else GT_Utility.sendChatToPlayer(buildContext.getPlayer(), "Mobs can spawn infernal now"); + else GTUtility.sendChatToPlayer(buildContext.getPlayer(), "Mobs can spawn infernal now"); }) .setTextureGetter(toggleButtonTextureGetter) .setVariableBackgroundGetter(toggleButtonBackgroundGetter) @@ -742,15 +739,15 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher .setTooltipShowUpDelay(TOOLTIP_DELAY)); configurationElements.widget(new CycleButtonWidget().setToggle(() -> voidAllDamagedAndEnchantedItems, v -> { if (this.mMaxProgresstime > 0) { - GT_Utility.sendChatToPlayer(buildContext.getPlayer(), "Can't change mode when running !"); + GTUtility.sendChatToPlayer(buildContext.getPlayer(), "Can't change mode when running !"); return; } voidAllDamagedAndEnchantedItems = v; if (!(buildContext.getPlayer() instanceof EntityPlayerMP)) return; - if (!voidAllDamagedAndEnchantedItems) GT_Utility.sendChatToPlayer(buildContext.getPlayer(), "Void nothing"); - else GT_Utility.sendChatToPlayer(buildContext.getPlayer(), "Void all damaged and enchanted items"); + if (!voidAllDamagedAndEnchantedItems) GTUtility.sendChatToPlayer(buildContext.getPlayer(), "Void nothing"); + else GTUtility.sendChatToPlayer(buildContext.getPlayer(), "Void all damaged and enchanted items"); }) .setTextureGetter(toggleButtonTextureGetter) .setVariableBackgroundGetter(toggleButtonBackgroundGetter) @@ -766,7 +763,7 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher public void createInventorySlots() { final SlotWidget spawnerSlot = new SlotWidget(inventoryHandler, 1); spawnerSlot.setBackground( - GT_UITextures.SLOT_DARK_GRAY, + GTUITextures.SLOT_DARK_GRAY, UITexture.fullImage(Tags.MODID, "gui/slot/gray_spawner") .withFixedSize(16, 16) .withOffset(1, 1)); @@ -774,7 +771,7 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher slotWidgets.add(spawnerSlot); final SlotWidget weaponSlot = new SlotWidget(weaponCache, 0); weaponSlot.setBackground( - GT_UITextures.SLOT_DARK_GRAY, + GTUITextures.SLOT_DARK_GRAY, UITexture.fullImage(Tags.MODID, "gui/slot/gray_sword") .withFixedSize(16, 16) .withOffset(1, 1)); @@ -783,10 +780,10 @@ public class GT_MetaTileEntity_ExtremeEntityCrusher private static class EECFakePlayer extends FakePlayer { - GT_MetaTileEntity_ExtremeEntityCrusher mte; + MTEExtremeEntityCrusher mte; ItemStack currentWeapon; - public EECFakePlayer(GT_MetaTileEntity_ExtremeEntityCrusher mte) { + public EECFakePlayer(MTEExtremeEntityCrusher mte) { super( (WorldServer) mte.getBaseMetaTileEntity() .getWorld(), diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java index 19a1a28deb..03ddadd269 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java @@ -30,8 +30,8 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_GLOW; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.util.GTStructureUtility.ofHatchAdder; +import static gregtech.api.util.GTUtility.filterValidMTEs; import static kubatech.api.Variables.Author; import static kubatech.api.Variables.StructureHologram; import static kubatech.api.utils.ItemUtils.readItemStackFromNBT; @@ -68,7 +68,6 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass; import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; @@ -91,27 +90,28 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; +import bartworks.API.BorosilicateGlass; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GTVoltageIndex; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.enums.VoltageIndex; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchOutputBus; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.VoidProtectionHelper; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_OutputBus_ME; +import gregtech.common.tileentities.machines.MTEHatchOutputBusME; import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; import kubatech.Tags; @@ -125,8 +125,7 @@ import kubatech.client.effect.CropRenderer; import kubatech.tileentity.gregtech.multiblock.eigbuckets.EIGIC2Bucket; @SuppressWarnings("unused") -public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse - extends KubaTechGTMultiBlockBase<GT_MetaTileEntity_ExtremeIndustrialGreenhouse> { +public class MTEExtremeIndustrialGreenhouse extends KubaTechGTMultiBlockBase<MTEExtremeIndustrialGreenhouse> { /*** * BALANCE OF THE IC2 MODE: @@ -146,8 +145,8 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse * Changing T one number down will buff the EIG twice, as well as changing it up will nerf the EIG twice * (That is because accelerators are imperfectly scaled in game LV = 2x, MV = 4x, ...) */ - public static final int EIG_BALANCE_IC2_ACCELERATOR_TIER = GTVoltageIndex.IV; - public static final int EIG_BALANCE_REGULAR_MODE_MIN_TIER = GTVoltageIndex.EV; + public static final int EIG_BALANCE_IC2_ACCELERATOR_TIER = VoltageIndex.IV; + public static final int EIG_BALANCE_REGULAR_MODE_MIN_TIER = VoltageIndex.EV; public static final int EIG_BALANCE_IC2_MODE_MIN_TIER = EIG_BALANCE_IC2_ACCELERATOR_TIER + 1; public static final double EIG_BALANCE_MAX_FERTILIZER_BOOST = 4.0d; public static final int EIG_BALANCE_WEED_EX_USAGE_BEGINS_AT = 1000; @@ -209,8 +208,8 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse private int mCasing = 0; private static final int CASING_INDEX = 49; private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition<GT_MetaTileEntity_ExtremeIndustrialGreenhouse> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_ExtremeIndustrialGreenhouse>builder() + private static final IStructureDefinition<MTEExtremeIndustrialGreenhouse> STRUCTURE_DEFINITION = StructureDefinition + .<MTEExtremeIndustrialGreenhouse>builder() .addShape( STRUCTURE_PIECE_MAIN, transpose( @@ -225,18 +224,12 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse .addElement( 'c', ofChain( - onElementPass(t -> t.mCasing++, ofBlock(GregTech_API.sBlockCasings4, 1)), - ofHatchAdder( - GT_MetaTileEntity_ExtremeIndustrialGreenhouse::addEnergyInputToMachineList, - CASING_INDEX, - 1), - ofHatchAdder( - GT_MetaTileEntity_ExtremeIndustrialGreenhouse::addMaintenanceToMachineList, - CASING_INDEX, - 1), - ofHatchAdder(GT_MetaTileEntity_ExtremeIndustrialGreenhouse::addInputToMachineList, CASING_INDEX, 1), - ofHatchAdder(GT_MetaTileEntity_ExtremeIndustrialGreenhouse::addOutputToMachineList, CASING_INDEX, 1))) - .addElement('C', onElementPass(t -> t.mCasing++, ofBlock(GregTech_API.sBlockCasings4, 1))) + onElementPass(t -> t.mCasing++, ofBlock(GregTechAPI.sBlockCasings4, 1)), + ofHatchAdder(MTEExtremeIndustrialGreenhouse::addEnergyInputToMachineList, CASING_INDEX, 1), + ofHatchAdder(MTEExtremeIndustrialGreenhouse::addMaintenanceToMachineList, CASING_INDEX, 1), + ofHatchAdder(MTEExtremeIndustrialGreenhouse::addInputToMachineList, CASING_INDEX, 1), + ofHatchAdder(MTEExtremeIndustrialGreenhouse::addOutputToMachineList, CASING_INDEX, 1))) + .addElement('C', onElementPass(t -> t.mCasing++, ofBlock(GregTechAPI.sBlockCasings4, 1))) .addElement( 'l', ProjectRedIllumination.isModLoaded() @@ -260,7 +253,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse .build(); @Override - public IStructureDefinition<GT_MetaTileEntity_ExtremeIndustrialGreenhouse> getStructureDefinition() { + public IStructureDefinition<MTEExtremeIndustrialGreenhouse> getStructureDefinition() { return STRUCTURE_DEFINITION; } @@ -273,8 +266,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse if (!checkPiece(STRUCTURE_PIECE_MAIN, 2, 5, 0)) return false; if (this.glassTier < 8 && !this.mEnergyHatches.isEmpty()) - for (GT_MetaTileEntity_Hatch_Energy hatchEnergy : this.mEnergyHatches) - if (this.glassTier < hatchEnergy.mTier) return false; + for (MTEHatchEnergy hatchEnergy : this.mEnergyHatches) if (this.glassTier < hatchEnergy.mTier) return false; boolean valid = this.mMaintenanceHatches.size() == 1 && !this.mEnergyHatches.isEmpty() && this.mCasing >= 70; @@ -298,8 +290,8 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse // region tooltip @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); String fertilizerBoostMax = String.format("%.0f", EIG_BALANCE_MAX_FERTILIZER_BOOST * 100); tt.addMachineType("Crop Farm") .addInfo("Controller block for the Extreme Industrial Greenhouse") @@ -354,17 +346,17 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse // region (de)constructor - public GT_MetaTileEntity_ExtremeIndustrialGreenhouse(int aID, String aName, String aNameRegional) { + public MTEExtremeIndustrialGreenhouse(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GT_MetaTileEntity_ExtremeIndustrialGreenhouse(String aName) { + public MTEExtremeIndustrialGreenhouse(String aName) { super(aName); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { - return new GT_MetaTileEntity_ExtremeIndustrialGreenhouse(this.mName); + return new MTEExtremeIndustrialGreenhouse(this.mName); } @Override @@ -463,7 +455,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse private void tryChangeSetupPhase(EntityPlayer aPlayer) { // TODO: Create l10n entries for the setup phase change messages. if (this.mMaxProgresstime > 0) { - GT_Utility.sendChatToPlayer(aPlayer, "You can't enable/disable setup if the machine is working!"); + GTUtility.sendChatToPlayer(aPlayer, "You can't enable/disable setup if the machine is working!"); return; } this.setupPhase++; @@ -484,7 +476,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse break; } this.updateSeedLimits(); - GT_Utility.sendChatToPlayer(aPlayer, phaseChangeMessage); + GTUtility.sendChatToPlayer(aPlayer, phaseChangeMessage); } /** @@ -495,16 +487,16 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse private void tryChangeMode(EntityPlayer aPlayer) { // TODO: Create l10n entries for the mode change messages. if (this.mMaxProgresstime > 0) { - GT_Utility.sendChatToPlayer(aPlayer, "You can't change mode if the machine is working!"); + GTUtility.sendChatToPlayer(aPlayer, "You can't change mode if the machine is working!"); return; } if (!this.buckets.isEmpty()) { - GT_Utility.sendChatToPlayer(aPlayer, "You can't change mode if there are seeds inside!"); + GTUtility.sendChatToPlayer(aPlayer, "You can't change mode if there are seeds inside!"); return; } this.mode = EIGModes.getNextMode(this.mode); this.updateSeedLimits(); - GT_Utility.sendChatToPlayer(aPlayer, "Changed mode to: " + this.mode.getName()); + GTUtility.sendChatToPlayer(aPlayer, "Changed mode to: " + this.mode.getName()); } /** @@ -516,9 +508,9 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse // TODO: Create l10n entries for the humidity status interactions. this.useNoHumidity = !this.useNoHumidity; if (this.useNoHumidity) { - GT_Utility.sendChatToPlayer(aPlayer, "No Humidity mode enabled."); + GTUtility.sendChatToPlayer(aPlayer, "No Humidity mode enabled."); } else { - GT_Utility.sendChatToPlayer(aPlayer, "No Humidity mode disabled."); + GTUtility.sendChatToPlayer(aPlayer, "No Humidity mode disabled."); } } @@ -691,7 +683,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse public static boolean isFertilizer(ItemStack item) { if (item == null || item.stackSize <= 0) return false; for (ItemStack fert : FERTILIZER_ITEM_LIST) { - if (GT_Utility.areStacksEqual(item, fert)) return true; + if (GTUtility.areStacksEqual(item, fert)) return true; } return false; } @@ -701,10 +693,10 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse if (bucket.getSeedCount() <= 0) return true; // check if we have an ME output bus to output to. - for (GT_MetaTileEntity_Hatch_OutputBus tHatch : filterValidMTEs(mOutputBusses)) { - if (!(tHatch instanceof GT_MetaTileEntity_Hatch_OutputBus_ME)) continue; + for (MTEHatchOutputBus tHatch : filterValidMTEs(mOutputBusses)) { + if (!(tHatch instanceof MTEHatchOutputBusME)) continue; for (ItemStack stack : bucket.tryRemoveSeed(bucket.getSeedCount(), false)) { - ((GT_MetaTileEntity_Hatch_OutputBus_ME) tHatch).store(stack); + ((MTEHatchOutputBusME) tHatch).store(stack); } return true; } @@ -717,7 +709,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse .build(); if (helper.getMaxParallel() > 0) { for (ItemStack toOutput : bucket.tryRemoveSeed(helper.getMaxParallel(), false)) { - for (GT_MetaTileEntity_Hatch_OutputBus tHatch : filterValidMTEs(mOutputBusses)) { + for (MTEHatchOutputBus tHatch : filterValidMTEs(mOutputBusses)) { if (tHatch.storeAll(toOutput)) break; } } @@ -859,7 +851,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse this.mOutputItems = this.dropTracker.getDrops(); // consume power - this.lEUt = -(long) ((double) GT_Values.V[tier] * 0.99d); + this.lEUt = -(long) ((double) GTValues.V[tier] * 0.99d); this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; this.updateSlots(); @@ -926,10 +918,10 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse private static class KT_ModulaUIContainer_ExtremeIndustrialGreenhouse extends ModularUIContainer { - final WeakReference<GT_MetaTileEntity_ExtremeIndustrialGreenhouse> parent; + final WeakReference<MTEExtremeIndustrialGreenhouse> parent; public KT_ModulaUIContainer_ExtremeIndustrialGreenhouse(ModularUIContext context, ModularWindow mainWindow, - GT_MetaTileEntity_ExtremeIndustrialGreenhouse mte) { + MTEExtremeIndustrialGreenhouse mte) { super(context, mainWindow); parent = new WeakReference<>(mte); } @@ -942,11 +934,11 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse if (aSlotIndex >= 36) return super.transferStackInSlot(aPlayer, aSlotIndex); final ItemStack aStack = s.getStack(); if (aStack == null) return super.transferStackInSlot(aPlayer, aSlotIndex); - GT_MetaTileEntity_ExtremeIndustrialGreenhouse mte = parent.get(); + MTEExtremeIndustrialGreenhouse mte = parent.get(); if (mte == null) return super.transferStackInSlot(aPlayer, aSlotIndex); // if (mte.buckets.size() >= mte.maxSeedTypes) return super.transferStackInSlot(aPlayer, aSlotIndex); if (mte.mMaxProgresstime > 0) { - GT_Utility.sendChatToPlayer(aPlayer, EnumChatFormatting.RED + "Can't insert while running !"); + GTUtility.sendChatToPlayer(aPlayer, EnumChatFormatting.RED + "Can't insert while running !"); return super.transferStackInSlot(aPlayer, aSlotIndex); } @@ -968,7 +960,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse if (!widget.isClient()) widget.getContext() .openSyncedWindow(CONFIGURATION_WINDOW_ID); }) - .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_CYCLIC) + .setBackground(GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_CYCLIC) .addTooltip("Configuration") .setSize(16, 16)); } @@ -1012,7 +1004,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { isInInventory = !getBaseMetaTileEntity().isActive(); builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK) .setPos(4, 4) .setSize(190, 85) .setEnabled(w -> !isInInventory)); @@ -1024,7 +1016,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse builder.widget( new CycleButtonWidget().setToggle(() -> isInInventory, i -> isInInventory = i) .setTextureGetter(i -> i == 0 ? new Text("Inventory") : new Text("Status")) - .setBackground(GT_UITextures.BUTTON_STANDARD) + .setBackground(GTUITextures.BUTTON_STANDARD) .setPos(140, 4) .setSize(55, 16)); @@ -1052,7 +1044,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse ModularWindow.Builder builder = ModularWindow.builder(200, 100); builder.setBackground(ModularUITextures.VANILLA_BACKGROUND); builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC) + new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_CYCLIC) .setPos(5, 5) .setSize(16, 16)) .widget(new TextWidget("Configuration").setPos(25, 9)) @@ -1079,7 +1071,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse .withFixedSize(70 - 18, 18, 15, 0)) .setBackground( ModularUITextures.VANILLA_BACKGROUND, - GT_UITextures.OVERLAY_BUTTON_CYCLIC.withFixedSize(18, 18)) + GTUITextures.OVERLAY_BUTTON_CYCLIC.withFixedSize(18, 18)) .setSize(70, 18) .addTooltip("Setup mode")) .widget( @@ -1098,7 +1090,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse .withFixedSize(70 - 18, 18, 15, 0)) .setBackground( ModularUITextures.VANILLA_BACKGROUND, - GT_UITextures.OVERLAY_BUTTON_CYCLIC.withFixedSize(18, 18)) + GTUITextures.OVERLAY_BUTTON_CYCLIC.withFixedSize(18, 18)) .setSize(70, 18) .addTooltip("IC2 mode")) .widget( @@ -1117,7 +1109,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse .withFixedSize(70 - 18, 18, 15, 0)) .setBackground( ModularUITextures.VANILLA_BACKGROUND, - GT_UITextures.OVERLAY_BUTTON_CYCLIC.withFixedSize(18, 18)) + GTUITextures.OVERLAY_BUTTON_CYCLIC.withFixedSize(18, 18)) .setSize(70, 18) .addTooltip("No Humidity mode")) .setEnabled(widget -> !getBaseMetaTileEntity().isActive()) @@ -1129,7 +1121,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse .setEnabled(widget -> !getBaseMetaTileEntity().isActive()) .setPos(80, 30)) .widget( - new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CROSS) + new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_CROSS) .setSize(18, 18) .setPos(10, 30) .addTooltip(new Text("Can't change configuration when running !").color(Color.RED.dark(3))) diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java index aecebe8da9..0ea03b9407 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java @@ -27,15 +27,15 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static forestry.api.apiculture.BeeManager.beeRoot; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.OutputBus; +import static gregtech.api.enums.HatchElement.Energy; +import static gregtech.api.enums.HatchElement.InputBus; +import static gregtech.api.enums.HatchElement.Maintenance; +import static gregtech.api.enums.HatchElement.OutputBus; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE_GLOW; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_GLOW; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import static kubatech.api.Variables.StructureHologram; import static kubatech.api.Variables.buildAuthorList; import static kubatech.api.utils.ItemUtils.readItemStackFromNBT; @@ -66,7 +66,6 @@ import net.minecraftforge.common.util.ForgeDirection; import org.jetbrains.annotations.NotNull; -import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass; import com.gtnewhorizon.structurelib.StructureLibAPI; import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; @@ -95,6 +94,7 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; import com.kuba6000.mobsinfo.api.utils.ItemID; +import bartworks.API.BorosilicateGlass; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.EnumBeeType; @@ -108,20 +108,20 @@ import forestry.apiculture.blocks.BlockAlveary; import forestry.apiculture.blocks.BlockApicultureType; import forestry.apiculture.genetics.Bee; import forestry.plugins.PluginApiculture; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import ic2.core.init.BlocksItems; import ic2.core.init.InternalName; import kubatech.Tags; @@ -129,8 +129,8 @@ import kubatech.api.DynamicInventory; import kubatech.api.implementations.KubaTechGTMultiBlockBase; import kubatech.client.effect.MegaApiaryBeesRenderer; -public class GT_MetaTileEntity_MegaIndustrialApiary - extends KubaTechGTMultiBlockBase<GT_MetaTileEntity_MegaIndustrialApiary> implements ISurvivalConstructable { +public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaIndustrialApiary> + implements ISurvivalConstructable { private byte mGlassTier = 0; private int mCasing = 0; @@ -167,8 +167,8 @@ public class GT_MetaTileEntity_MegaIndustrialApiary {" "," "," "," "," "," "," GGG "," GHG "," GGG "," "," "," "," "," "," "} }); // spotless:on - private static final IStructureDefinition<GT_MetaTileEntity_MegaIndustrialApiary> STRUCTURE_DEFINITION = StructureDefinition - .<GT_MetaTileEntity_MegaIndustrialApiary>builder() + private static final IStructureDefinition<MTEMegaIndustrialApiary> STRUCTURE_DEFINITION = StructureDefinition + .<MTEMegaIndustrialApiary>builder() .addShape(STRUCTURE_PIECE_MAIN, struct) .addShape( STRUCTURE_PIECE_MAIN_SURVIVAL, @@ -184,11 +184,10 @@ public class GT_MetaTileEntity_MegaIndustrialApiary .addElement('B', ofChain(ofBlockAnyMeta(Blocks.dirt, 0), ofBlock(Blocks.grass, 0))) .addElement( 'G', - buildHatchAdder(GT_MetaTileEntity_MegaIndustrialApiary.class) - .atLeast(InputBus, OutputBus, Energy, Maintenance) + buildHatchAdder(MTEMegaIndustrialApiary.class).atLeast(InputBus, OutputBus, Energy, Maintenance) .casingIndex(CASING_INDEX) .dot(1) - .buildAndChain(onElementPass(t -> t.mCasing++, ofBlock(GregTech_API.sBlockCasings1, 10)))) + .buildAndChain(onElementPass(t -> t.mCasing++, ofBlock(GregTechAPI.sBlockCasings1, 10)))) .addElement( 'H', ofBlocksMap( @@ -218,17 +217,16 @@ public class GT_MetaTileEntity_MegaIndustrialApiary .addElement( 'W', ofChain(ofBlock(Blocks.water, 0), ofBlock(BlocksItems.getFluidBlock(InternalName.fluidDistilledWater), 0))) - .addElement('F', new IStructureElementNoPlacement<GT_MetaTileEntity_MegaIndustrialApiary>() { + .addElement('F', new IStructureElementNoPlacement<MTEMegaIndustrialApiary>() { @Override - public boolean check(GT_MetaTileEntity_MegaIndustrialApiary mte, World world, int x, int y, int z) { + public boolean check(MTEMegaIndustrialApiary mte, World world, int x, int y, int z) { mte.flowerCheck(world, x, y, z); return true; } @Override - public boolean spawnHint(GT_MetaTileEntity_MegaIndustrialApiary mte, World world, int x, int y, int z, - ItemStack trigger) { + public boolean spawnHint(MTEMegaIndustrialApiary mte, World world, int x, int y, int z, ItemStack trigger) { StructureLibAPI.hintParticle(world, x, y, z, StructureLibAPI.getBlockHint(), 2 - 1); return true; } @@ -236,11 +234,11 @@ public class GT_MetaTileEntity_MegaIndustrialApiary .build(); @SuppressWarnings("unused") - public GT_MetaTileEntity_MegaIndustrialApiary(int aID, String aName, String aNameRegional) { + public MTEMegaIndustrialApiary(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GT_MetaTileEntity_MegaIndustrialApiary(String aName) { + public MTEMegaIndustrialApiary(String aName) { super(aName); } @@ -272,7 +270,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) { int built = survivialBuildPiece(STRUCTURE_PIECE_MAIN_SURVIVAL, stackSize, 7, 8, 0, elementBudget, env, true); if (built == -1) { - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( env.getActor(), EnumChatFormatting.GREEN + "Auto placing done ! Now go place the water and flowers yourself !"); return 0; @@ -281,7 +279,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary } @Override - public IStructureDefinition<GT_MetaTileEntity_MegaIndustrialApiary> getStructureDefinition() { + public IStructureDefinition<MTEMegaIndustrialApiary> getStructureDefinition() { return STRUCTURE_DEFINITION; } @@ -291,8 +289,8 @@ public class GT_MetaTileEntity_MegaIndustrialApiary } @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("Mega Apiary") .addInfo("Controller block for Industrial Apicultural Acclimatiser and Drone Domestication Station") .addInfo(buildAuthorList("kuba6000", "Runakai")) @@ -375,7 +373,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary @Override public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (this.mMaxProgresstime > 0) { - GT_Utility.sendChatToPlayer(aPlayer, "Can't change mode when running !"); + GTUtility.sendChatToPlayer(aPlayer, "Can't change mode when running !"); return; } if (!aPlayer.isSneaking()) { @@ -383,28 +381,28 @@ public class GT_MetaTileEntity_MegaIndustrialApiary if (mPrimaryMode == 3) mPrimaryMode = 0; switch (mPrimaryMode) { case 0: - GT_Utility.sendChatToPlayer(aPlayer, "Changed primary mode to: Input mode"); + GTUtility.sendChatToPlayer(aPlayer, "Changed primary mode to: Input mode"); break; case 1: - GT_Utility.sendChatToPlayer(aPlayer, "Changed primary mode to: Output mode"); + GTUtility.sendChatToPlayer(aPlayer, "Changed primary mode to: Output mode"); break; case 2: - GT_Utility.sendChatToPlayer(aPlayer, "Changed primary mode to: Operating mode"); + GTUtility.sendChatToPlayer(aPlayer, "Changed primary mode to: Operating mode"); break; } } else { if (!mStorage.isEmpty()) { - GT_Utility.sendChatToPlayer(aPlayer, "Can't change operating mode when the multi is not empty !"); + GTUtility.sendChatToPlayer(aPlayer, "Can't change operating mode when the multi is not empty !"); return; } mSecondaryMode++; if (mSecondaryMode == 2) mSecondaryMode = 0; switch (mSecondaryMode) { case 0: - GT_Utility.sendChatToPlayer(aPlayer, "Changed secondary mode to: Normal mode"); + GTUtility.sendChatToPlayer(aPlayer, "Changed secondary mode to: Normal mode"); break; case 1: - GT_Utility.sendChatToPlayer(aPlayer, "Changed secondary mode to: Swarmer mode"); + GTUtility.sendChatToPlayer(aPlayer, "Changed secondary mode to: Swarmer mode"); break; } } @@ -413,8 +411,8 @@ public class GT_MetaTileEntity_MegaIndustrialApiary private void updateMaxSlots() { int mOld = mMaxSlots; long v = this.getMaxInputEu(); - if (v < GT_Values.V[6]) mMaxSlots = 0; - else if (mSecondaryMode == 0) mMaxSlots = (int) (v / GT_Values.V[6]); + if (v < GTValues.V[6]) mMaxSlots = 0; + else if (mSecondaryMode == 0) mMaxSlots = (int) (v / GTValues.V[6]); else mMaxSlots = 1; if (mOld != 0 && mOld != mMaxSlots) { needsTVarUpdate = true; @@ -521,7 +519,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary stacks.addAll(beeSimulator.getDrops(this, 64_00d * boosted)); } - this.lEUt = -(int) ((double) GT_Values.V[6] * (double) mMaxSlots * 0.99d); + this.lEUt = -(int) ((double) GTValues.V[6] * (double) mMaxSlots * 0.99d); this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; this.mMaxProgresstime = 100; @@ -532,7 +530,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary this.updateSlots(); return CheckRecipeResultRegistry.NO_RECIPE; } - calculateOverclock(GT_Values.V[5] - 2L, 1200); + calculateOverclock(GTValues.V[5] - 2L, 1200); if (this.lEUt > 0) this.lEUt = -this.lEUt; this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; @@ -592,7 +590,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary flowersCheck.addAll(flowersCache.keySet()); if (!checkPiece(STRUCTURE_PIECE_MAIN, 7, 8, 0)) return false; if (this.mGlassTier < 10 && !this.mEnergyHatches.isEmpty()) - for (GT_MetaTileEntity_Hatch_Energy hatchEnergy : this.mEnergyHatches) + for (MTEHatchEnergy hatchEnergy : this.mEnergyHatches) if (this.mGlassTier < hatchEnergy.mTier) return false; boolean valid = this.mMaintenanceHatches.size() == 1 && this.mEnergyHatches.size() >= 1 && this.mCasing >= 190; flowersError = valid && !this.flowersCheck.isEmpty(); @@ -602,7 +600,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_MegaIndustrialApiary(this.mName); + return new MTEMegaIndustrialApiary(this.mName); } @Override @@ -649,10 +647,10 @@ public class GT_MetaTileEntity_MegaIndustrialApiary private static class KT_ModulaUIContainer_MegaIndustrialApiary extends ModularUIContainer { - final WeakReference<GT_MetaTileEntity_MegaIndustrialApiary> parent; + final WeakReference<MTEMegaIndustrialApiary> parent; public KT_ModulaUIContainer_MegaIndustrialApiary(ModularUIContext context, ModularWindow mainWindow, - GT_MetaTileEntity_MegaIndustrialApiary mte) { + MTEMegaIndustrialApiary mte) { super(context, mainWindow); parent = new WeakReference<>(mte); } @@ -665,12 +663,12 @@ public class GT_MetaTileEntity_MegaIndustrialApiary if (aSlotIndex >= 36) return super.transferStackInSlot(aPlayer, aSlotIndex); final ItemStack aStack = s.getStack(); if (aStack == null) return super.transferStackInSlot(aPlayer, aSlotIndex); - GT_MetaTileEntity_MegaIndustrialApiary mte = parent.get(); + MTEMegaIndustrialApiary mte = parent.get(); if (mte == null) return super.transferStackInSlot(aPlayer, aSlotIndex); if (mte.mStorage.size() >= mte.mMaxSlots) return super.transferStackInSlot(aPlayer, aSlotIndex); if (beeRoot.getType(aStack) == EnumBeeType.QUEEN) { if (mte.mMaxProgresstime > 0) { - GT_Utility.sendChatToPlayer(aPlayer, EnumChatFormatting.RED + "Can't insert while running !"); + GTUtility.sendChatToPlayer(aPlayer, EnumChatFormatting.RED + "Can't insert while running !"); return super.transferStackInSlot(aPlayer, aSlotIndex); } World w = mte.getBaseMetaTileEntity() @@ -730,7 +728,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { isInInventory = !getBaseMetaTileEntity().isActive(); builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK) .setPos(4, 4) .setSize(190, 85) .setEnabled(w -> !isInInventory)); @@ -742,7 +740,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary builder.widget( new CycleButtonWidget().setToggle(() -> isInInventory, i -> isInInventory = i) .setTextureGetter(i -> i == 0 ? new Text("Inventory") : new Text("Status")) - .setBackground(GT_UITextures.BUTTON_STANDARD) + .setBackground(GTUITextures.BUTTON_STANDARD) .setPos(140, 4) .setSize(55, 16)); @@ -776,7 +774,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary if (!widget.isClient()) widget.getContext() .openSyncedWindow(CONFIGURATION_WINDOW_ID); }) - .setBackground(GT_UITextures.BUTTON_STANDARD, GT_UITextures.OVERLAY_BUTTON_CYCLIC) + .setBackground(GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_CYCLIC) .addTooltip("Configuration") .setSize(16, 16)); } @@ -785,7 +783,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary ModularWindow.Builder builder = ModularWindow.builder(200, 100); builder.setBackground(ModularUITextures.VANILLA_BACKGROUND); builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC) + new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_CYCLIC) .setPos(5, 5) .setSize(16, 16)) .widget(new TextWidget("Configuration").setPos(25, 9)) @@ -798,7 +796,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary .setGetter(() -> mPrimaryMode) .setSetter(val -> { if (this.mMaxProgresstime > 0) { - GT_Utility.sendChatToPlayer(player, "Can't change mode when running !"); + GTUtility.sendChatToPlayer(player, "Can't change mode when running !"); return; } mPrimaryMode = val; @@ -806,13 +804,13 @@ public class GT_MetaTileEntity_MegaIndustrialApiary if (!(player instanceof EntityPlayerMP)) return; switch (mPrimaryMode) { case 0: - GT_Utility.sendChatToPlayer(player, "Changed primary mode to: Input mode"); + GTUtility.sendChatToPlayer(player, "Changed primary mode to: Input mode"); break; case 1: - GT_Utility.sendChatToPlayer(player, "Changed primary mode to: Output mode"); + GTUtility.sendChatToPlayer(player, "Changed primary mode to: Output mode"); break; case 2: - GT_Utility.sendChatToPlayer(player, "Changed primary mode to: Operating mode"); + GTUtility.sendChatToPlayer(player, "Changed primary mode to: Operating mode"); break; } }) @@ -828,7 +826,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary .withFixedSize(70 - 18, 18, 15, 0)) .setBackground( ModularUITextures.VANILLA_BACKGROUND, - GT_UITextures.OVERLAY_BUTTON_CYCLIC.withFixedSize(18, 18)) + GTUITextures.OVERLAY_BUTTON_CYCLIC.withFixedSize(18, 18)) .setSize(70, 18) .addTooltip("Primary mode")) .widget( @@ -836,7 +834,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary .setGetter(() -> mSecondaryMode) .setSetter(val -> { if (this.mMaxProgresstime > 0) { - GT_Utility.sendChatToPlayer(player, "Can't change mode when running !"); + GTUtility.sendChatToPlayer(player, "Can't change mode when running !"); return; } @@ -845,10 +843,10 @@ public class GT_MetaTileEntity_MegaIndustrialApiary if (!(player instanceof EntityPlayerMP)) return; switch (mSecondaryMode) { case 0: - GT_Utility.sendChatToPlayer(player, "Changed secondary mode to: Normal mode"); + GTUtility.sendChatToPlayer(player, "Changed secondary mode to: Normal mode"); break; case 1: - GT_Utility.sendChatToPlayer(player, "Changed secondary mode to: Swarmer mode"); + GTUtility.sendChatToPlayer(player, "Changed secondary mode to: Swarmer mode"); break; } }) @@ -861,7 +859,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary .withFixedSize(70 - 18, 18, 15, 0)) .setBackground( ModularUITextures.VANILLA_BACKGROUND, - GT_UITextures.OVERLAY_BUTTON_CYCLIC.withFixedSize(18, 18)) + GTUITextures.OVERLAY_BUTTON_CYCLIC.withFixedSize(18, 18)) .setSize(70, 18) .addTooltip("Secondary mode")) .setEnabled(widget -> !getBaseMetaTileEntity().isActive()) @@ -872,7 +870,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary .setEnabled(widget -> !getBaseMetaTileEntity().isActive()) .setPos(80, 30)) .widget( - new DrawableWidget().setDrawable(GT_UITextures.OVERLAY_BUTTON_CROSS) + new DrawableWidget().setDrawable(GTUITextures.OVERLAY_BUTTON_CROSS) .setSize(18, 18) .setPos(10, 30) .addTooltip(new Text("Can't change configuration when running !").color(Color.RED.dark(3))) @@ -1062,7 +1060,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary static final Map<ItemID, ItemStack> dropstacks = new HashMap<>(); - public List<ItemStack> getDrops(final GT_MetaTileEntity_MegaIndustrialApiary MTE, final double timePassed) { + public List<ItemStack> getDrops(final MTEMegaIndustrialApiary MTE, final double timePassed) { drops.forEach(d -> { MTE.dropProgress.merge(d.id, d.getAmount(timePassed / 550d), Double::sum); if (!dropstacks.containsKey(d.id)) dropstacks.put(d.id, d.stack); diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGFlowerBucket.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGFlowerBucket.java index 1c5588c335..9b96317f00 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGFlowerBucket.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGFlowerBucket.java @@ -11,7 +11,7 @@ import net.minecraft.nbt.NBTTagCompound; import kubatech.api.eig.EIGBucket; import kubatech.api.eig.EIGDropTable; import kubatech.api.eig.IEIGBucketFactory; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; public class EIGFlowerBucket extends EIGBucket { @@ -27,7 +27,7 @@ public class EIGFlowerBucket extends EIGBucket { } @Override - public EIGBucket tryCreateBucket(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse, ItemStack input) { + public EIGBucket tryCreateBucket(MTEExtremeIndustrialGreenhouse greenhouse, ItemStack input) { // Check if input is a flower, reed or cacti. They all drop their source item multiplied by their seed count Item item = input.getItem(); Block block = Block.getBlockFromItem(item); @@ -67,7 +67,7 @@ public class EIGFlowerBucket extends EIGBucket { } @Override - public boolean revalidate(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse) { + public boolean revalidate(MTEExtremeIndustrialGreenhouse greenhouse) { return this.isValid(); } } diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGIC2Bucket.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGIC2Bucket.java index 7daa524d5d..8c58f911c5 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGIC2Bucket.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGIC2Bucket.java @@ -17,11 +17,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.ItemList; -import gregtech.common.blocks.GT_Block_Ores_Abstract; -import gregtech.common.blocks.GT_Item_Ores; -import gregtech.common.blocks.GT_TileEntity_Ores; +import gregtech.common.blocks.BlockOresAbstract; +import gregtech.common.blocks.ItemOres; +import gregtech.common.blocks.TileEntityOres; import ic2.api.crops.CropCard; import ic2.api.crops.Crops; import ic2.core.Ic2Items; @@ -31,7 +31,7 @@ import ic2.core.crop.TileEntityCrop; import kubatech.api.eig.EIGBucket; import kubatech.api.eig.EIGDropTable; import kubatech.api.eig.IEIGBucketFactory; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; public class EIGIC2Bucket extends EIGBucket { @@ -85,7 +85,7 @@ public class EIGIC2Bucket extends EIGBucket { } @Override - public EIGBucket tryCreateBucket(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse, ItemStack input) { + public EIGBucket tryCreateBucket(MTEExtremeIndustrialGreenhouse greenhouse, ItemStack input) { // Check if input is a seed. if (!ItemList.IC2_Crop_Seeds.isStackEqual(input, true, true)) return null; if (!input.hasTagCompound()) return null; @@ -130,7 +130,7 @@ public class EIGIC2Bucket extends EIGBucket { this.isValid = false; } - private EIGIC2Bucket(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse, ItemStack seed) { + private EIGIC2Bucket(MTEExtremeIndustrialGreenhouse greenhouse, ItemStack seed) { super(seed, 1, null); this.useNoHumidity = greenhouse.isInNoHumidityMode(); this.recalculateDrops(greenhouse); @@ -184,7 +184,7 @@ public class EIGIC2Bucket extends EIGBucket { } @Override - public boolean revalidate(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse) { + public boolean revalidate(MTEExtremeIndustrialGreenhouse greenhouse) { this.recalculateDrops(greenhouse); return this.isValid(); } @@ -197,9 +197,9 @@ public class EIGIC2Bucket extends EIGBucket { /** * (Re-)calculates the pre-generated drop table for this bucket. * - * @param greenhouse The {@link GT_MetaTileEntity_ExtremeIndustrialGreenhouse} that contains this bucket. + * @param greenhouse The {@link MTEExtremeIndustrialGreenhouse} that contains this bucket. */ - public void recalculateDrops(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse) { + public void recalculateDrops(MTEExtremeIndustrialGreenhouse greenhouse) { this.isValid = false; World world = greenhouse.getBaseMetaTileEntity() .getWorld(); @@ -216,7 +216,7 @@ public class EIGIC2Bucket extends EIGBucket { boolean cheating = false; FakeTileEntityCrop crop; try { - if (world.getBlock(xyz[0], xyz[1] - 2, xyz[2]) != GregTech_API.sBlockCasings4 + if (world.getBlock(xyz[0], xyz[1] - 2, xyz[2]) != GregTechAPI.sBlockCasings4 || world.getBlockMetadata(xyz[0], xyz[1] - 2, xyz[2]) != 1) { // no cheating = true; @@ -376,7 +376,7 @@ public class EIGIC2Bucket extends EIGBucket { e.printStackTrace(System.err); } finally { // always reset the world to it's original state - if (!cheating) world.setBlock(xyz[0], xyz[1] - 2, xyz[2], GregTech_API.sBlockCasings4, 1, 0); + if (!cheating) world.setBlock(xyz[0], xyz[1] - 2, xyz[2], GregTechAPI.sBlockCasings4, 1, 0); // world.setBlockToAir(xyz[0], xyz[1], xyz[2]); } } @@ -396,19 +396,18 @@ public class EIGIC2Bucket extends EIGBucket { Block b = Block.getBlockFromItem(item); if (b == Blocks.air || !(item instanceof ItemBlock)) return false; short tDamage = (short) item.getDamage(stack); - if (item instanceof GT_Item_Ores && tDamage > 0) { + if (item instanceof ItemOres && tDamage > 0) { if (!world.setBlock( x, y, z, b, - GT_TileEntity_Ores.getHarvestData( - tDamage, - ((GT_Block_Ores_Abstract) b).getBaseBlockHarvestLevel(tDamage % 16000 / 1000)), + TileEntityOres + .getHarvestData(tDamage, ((BlockOresAbstract) b).getBaseBlockHarvestLevel(tDamage % 16000 / 1000)), 0)) { return false; } - GT_TileEntity_Ores tTileEntity = (GT_TileEntity_Ores) world.getTileEntity(x, y, z); + TileEntityOres tTileEntity = (TileEntityOres) world.getTileEntity(x, y, z); tTileEntity.mMetaData = tDamage; tTileEntity.mNatural = false; } else world.setBlock(x, y, z, b, tDamage, 0); @@ -716,10 +715,10 @@ public class EIGIC2Bucket extends EIGBucket { * @see EIGIC2Bucket#IS_ON_WET_FARMLAND * @see EIGIC2Bucket#WATER_STORAGE_VALUE * @see TileEntityCrop#updateHumidity() - * @param greenhouse The {@link GT_MetaTileEntity_ExtremeIndustrialGreenhouse} that holds the seed. + * @param greenhouse The {@link MTEExtremeIndustrialGreenhouse} that holds the seed. * @return The humidity environmental value at the controller's location. */ - public static byte getHumidity(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse, boolean useNoHumidity) { + public static byte getHumidity(MTEExtremeIndustrialGreenhouse greenhouse, boolean useNoHumidity) { if (useNoHumidity) return 0; int value = Crops.instance.getHumidityBiomeBonus( greenhouse.getBaseMetaTileEntity() @@ -738,10 +737,10 @@ public class EIGIC2Bucket extends EIGBucket { * @see EIGIC2Bucket#NUMBER_OF_DIRT_BLOCKS_UNDER * @see EIGIC2Bucket#FERTILIZER_STORAGE_VALUE * @see TileEntityCrop#updateNutrients() - * @param greenhouse The {@link GT_MetaTileEntity_ExtremeIndustrialGreenhouse} that holds the seed. + * @param greenhouse The {@link MTEExtremeIndustrialGreenhouse} that holds the seed. * @return The nutrient environmental value at the controller's location. */ - public static byte getNutrients(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse) { + public static byte getNutrients(MTEExtremeIndustrialGreenhouse greenhouse) { int value = Crops.instance.getNutrientBiomeBonus( greenhouse.getBaseMetaTileEntity() .getBiome()); @@ -756,10 +755,10 @@ public class EIGIC2Bucket extends EIGBucket { * @see EIGIC2Bucket#CROP_OBSTRUCTION_VALUE * @see EIGIC2Bucket#CROP_CAN_SEE_SKY * @see TileEntityCrop#updateAirQuality() - * @param greenhouse The {@link GT_MetaTileEntity_ExtremeIndustrialGreenhouse} that holds the seed. + * @param greenhouse The {@link MTEExtremeIndustrialGreenhouse} that holds the seed. * @return The air quality environmental value at the controller's location. */ - public static byte getAirQuality(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse) { + public static byte getAirQuality(MTEExtremeIndustrialGreenhouse greenhouse) { // clamp height bonus to 0-4, use the height of the crop itself // TODO: check if we want to add the extra +2 for the actual height of the crop stick in the EIG. int value = Math.max( @@ -784,8 +783,7 @@ public class EIGIC2Bucket extends EIGBucket { public Set<String> reqBlockOreDict = new HashSet<>(); private int lightLevel = 15; - public FakeTileEntityCrop(EIGIC2Bucket bucket, GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse, - int[] xyz) { + public FakeTileEntityCrop(EIGIC2Bucket bucket, MTEExtremeIndustrialGreenhouse greenhouse, int[] xyz) { super(); this.isValid = false; this.ticker = 1; diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGRainbowCactusBucket.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGRainbowCactusBucket.java index 6342080722..b3ad861551 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGRainbowCactusBucket.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGRainbowCactusBucket.java @@ -10,7 +10,7 @@ import net.minecraft.nbt.NBTTagCompound; import kubatech.api.eig.EIGBucket; import kubatech.api.eig.EIGDropTable; import kubatech.api.eig.IEIGBucketFactory; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; import tb.common.block.BlockRainbowCactus; import tb.init.TBBlocks; @@ -30,7 +30,7 @@ public class EIGRainbowCactusBucket extends EIGBucket { } @Override - public EIGBucket tryCreateBucket(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse, ItemStack input) { + public EIGBucket tryCreateBucket(MTEExtremeIndustrialGreenhouse greenhouse, ItemStack input) { // check if input is rainbow cacti; if (!(Block.getBlockFromItem(input.getItem()) instanceof BlockRainbowCactus)) return null; return new EIGRainbowCactusBucket(input, 1); @@ -54,7 +54,7 @@ public class EIGRainbowCactusBucket extends EIGBucket { } @Override - public boolean revalidate(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse) { + public boolean revalidate(MTEExtremeIndustrialGreenhouse greenhouse) { return this.isValid(); } diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGSeedBucket.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGSeedBucket.java index 51b4a7162a..831569a4ae 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGSeedBucket.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGSeedBucket.java @@ -20,12 +20,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_DummyWorld; +import gregtech.api.util.GTUtility; +import gregtech.common.GTDummyWorld; import kubatech.api.eig.EIGBucket; import kubatech.api.eig.EIGDropTable; import kubatech.api.eig.IEIGBucketFactory; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; public class EIGSeedBucket extends EIGBucket { @@ -44,7 +44,7 @@ public class EIGSeedBucket extends EIGBucket { } @Override - public EIGBucket tryCreateBucket(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse, ItemStack input) { + public EIGBucket tryCreateBucket(MTEExtremeIndustrialGreenhouse greenhouse, ItemStack input) { return new EIGSeedBucket(greenhouse, input); } @@ -58,7 +58,7 @@ public class EIGSeedBucket extends EIGBucket { private boolean isValid = false; private EIGDropTable drops = new EIGDropTable(); - private EIGSeedBucket(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse, ItemStack seed) { + private EIGSeedBucket(MTEExtremeIndustrialGreenhouse greenhouse, ItemStack seed) { super(seed, 1, null); this.recalculateDrops(greenhouse); } @@ -94,12 +94,12 @@ public class EIGSeedBucket extends EIGBucket { } @Override - public boolean revalidate(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse) { + public boolean revalidate(MTEExtremeIndustrialGreenhouse greenhouse) { this.recalculateDrops(greenhouse); return this.isValid(); } - public void recalculateDrops(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse) { + public void recalculateDrops(MTEExtremeIndustrialGreenhouse greenhouse) { this.isValid = false; int optimalGrowthMetadata = 7; // Get the relevant item and block for this item. @@ -164,7 +164,7 @@ public class EIGSeedBucket extends EIGBucket { IRecipe[] validRecipes = CraftingManager.getInstance() .getRecipeList() .parallelStream() - .filter(recipe -> GT_Utility.areStacksEqual(recipe.getRecipeOutput(), seed)) + .filter(recipe -> GTUtility.areStacksEqual(recipe.getRecipeOutput(), seed)) .toArray(IRecipe[]::new); // if no recipes outputs the input seed, abort. @@ -233,7 +233,7 @@ public class EIGSeedBucket extends EIGBucket { public void setInventorySlotContents(int par1, ItemStack par2ItemStack) {} } - private static class GreenHouseWorld extends GT_DummyWorld { + private static class GreenHouseWorld extends GTDummyWorld { public int x, y, z, meta = 0; public Block block; diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGStemBucket.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGStemBucket.java index e0ebcf8652..b132243a66 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGStemBucket.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGStemBucket.java @@ -14,7 +14,7 @@ import kubatech.api.IBlockStemAccesor; import kubatech.api.eig.EIGBucket; import kubatech.api.eig.EIGDropTable; import kubatech.api.eig.IEIGBucketFactory; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; public class EIGStemBucket extends EIGBucket { @@ -31,7 +31,7 @@ public class EIGStemBucket extends EIGBucket { } @Override - public EIGBucket tryCreateBucket(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse, ItemStack input) { + public EIGBucket tryCreateBucket(MTEExtremeIndustrialGreenhouse greenhouse, ItemStack input) { // Check if input is a flower, reed or cacti. They all drop their source item multiplied by their seed count Item item = input.getItem(); if (!(item instanceof IPlantable)) return null; @@ -54,7 +54,7 @@ public class EIGStemBucket extends EIGBucket { private boolean isValid = false; private EIGDropTable drops = new EIGDropTable(); - private EIGStemBucket(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse, ItemStack input) { + private EIGStemBucket(MTEExtremeIndustrialGreenhouse greenhouse, ItemStack input) { super(input, 1, null); recalculateDrops(greenhouse); } @@ -92,7 +92,7 @@ public class EIGStemBucket extends EIGBucket { } @Override - public boolean revalidate(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse) { + public boolean revalidate(MTEExtremeIndustrialGreenhouse greenhouse) { recalculateDrops(greenhouse); return this.isValid(); } @@ -102,7 +102,7 @@ public class EIGStemBucket extends EIGBucket { * * @param greenhouse The greenhouse that houses this bucket. */ - public void recalculateDrops(GT_MetaTileEntity_ExtremeIndustrialGreenhouse greenhouse) { + public void recalculateDrops(MTEExtremeIndustrialGreenhouse greenhouse) { this.isValid = false; Item item = this.seed.getItem(); if (!(item instanceof IPlantable)) return; diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGIC2Mode.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGIC2Mode.java index 6c12373779..1d10a2aa92 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGIC2Mode.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGIC2Mode.java @@ -1,11 +1,11 @@ package kubatech.tileentity.gregtech.multiblock.eigmodes; import static kubatech.api.utils.StringUtils.voltageTooltipFormatted; -import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse.EIG_BALANCE_IC2_ACCELERATOR_TIER; +import static kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse.EIG_BALANCE_IC2_ACCELERATOR_TIER; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.MultiblockTooltipBuilder; import kubatech.api.eig.EIGMode; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; public class EIGIC2Mode extends EIGMode { @@ -23,12 +23,12 @@ public class EIGIC2Mode extends EIGMode { @Override public int getMinVoltageTier() { - return GT_MetaTileEntity_ExtremeIndustrialGreenhouse.EIG_BALANCE_IC2_MODE_MIN_TIER; + return MTEExtremeIndustrialGreenhouse.EIG_BALANCE_IC2_MODE_MIN_TIER; } @Override public int getMinGlassTier() { - return GT_MetaTileEntity_ExtremeIndustrialGreenhouse.EIG_BALANCE_IC2_MODE_MIN_TIER; + return MTEExtremeIndustrialGreenhouse.EIG_BALANCE_IC2_MODE_MIN_TIER; } @Override @@ -62,7 +62,7 @@ public class EIGIC2Mode extends EIGMode { } @Override - public GT_Multiblock_Tooltip_Builder addTooltipInfo(GT_Multiblock_Tooltip_Builder builder) { + public MultiblockTooltipBuilder addTooltipInfo(MultiblockTooltipBuilder builder) { String minVoltageTier = voltageTooltipFormatted(this.getMinVoltageTier()); String minGlassTier = voltageTooltipFormatted(this.getMinGlassTier()); diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGNormalMode.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGNormalMode.java index a1c5fcf393..c639b9750d 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGNormalMode.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigmodes/EIGNormalMode.java @@ -2,9 +2,9 @@ package kubatech.tileentity.gregtech.multiblock.eigmodes; import static kubatech.api.utils.StringUtils.voltageTooltipFormatted; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.MultiblockTooltipBuilder; import kubatech.api.eig.EIGMode; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; +import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse; public class EIGNormalMode extends EIGMode { @@ -22,7 +22,7 @@ public class EIGNormalMode extends EIGMode { @Override public int getMinVoltageTier() { - return GT_MetaTileEntity_ExtremeIndustrialGreenhouse.EIG_BALANCE_REGULAR_MODE_MIN_TIER; + return MTEExtremeIndustrialGreenhouse.EIG_BALANCE_REGULAR_MODE_MIN_TIER; } @Override @@ -61,7 +61,7 @@ public class EIGNormalMode extends EIGMode { } @Override - public GT_Multiblock_Tooltip_Builder addTooltipInfo(GT_Multiblock_Tooltip_Builder builder) { + public MultiblockTooltipBuilder addTooltipInfo(MultiblockTooltipBuilder builder) { String minVoltageTier = voltageTooltipFormatted(this.getMinVoltageTier()); String minVoltageTierMinus1 = voltageTooltipFormatted(this.getMinVoltageTier() - 1); |