diff --git a/dependencies.gradle b/dependencies.gradle index b10f8f2..897cc31 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,5 +1,5 @@ dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.97:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.56:dev') api('com.github.GTNewHorizons:NotEnoughItems:2.6.14-GTNH:dev') compileOnly('com.github.GTNewHorizons:MyTown2:0.5.4-GTNH:dev') } diff --git a/src/main/java/com/sinthoras/hydroenergy/HE.java b/src/main/java/com/sinthoras/hydroenergy/HE.java index 10b4743..dcc7f97 100644 --- a/src/main/java/com/sinthoras/hydroenergy/HE.java +++ b/src/main/java/com/sinthoras/hydroenergy/HE.java @@ -14,7 +14,7 @@ import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; public class HE { @@ -48,8 +48,8 @@ public class HE { public static final HEWaterStill[] waterBlocks = new HEWaterStill[HEConfig.maxDams]; public static final int[] waterBlockIds = new int[HEConfig.maxDams]; public static ItemStack hydroDamControllerBlock; - public static ItemStack[] hydroPumpBlocks = new ItemStack[GT_Values.VN.length - 1]; - public static ItemStack[] hydroTurbineBlocks = new ItemStack[GT_Values.VN.length - 1]; + public static ItemStack[] hydroPumpBlocks = new ItemStack[GTValues.VN.length - 1]; + public static ItemStack[] hydroTurbineBlocks = new ItemStack[GTValues.VN.length - 1]; public static boolean DEBUGslowFill = false; public static final IGuiHandler guiHandler = new HEGuiHandler(); diff --git a/src/main/java/com/sinthoras/hydroenergy/HEUtil.java b/src/main/java/com/sinthoras/hydroenergy/HEUtil.java index 3c1d5d2..25229f2 100644 --- a/src/main/java/com/sinthoras/hydroenergy/HEUtil.java +++ b/src/main/java/com/sinthoras/hydroenergy/HEUtil.java @@ -1,6 +1,6 @@ package com.sinthoras.hydroenergy; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; public class HEUtil { @@ -41,8 +41,8 @@ public static short chunkYToFlag(int chunkY) { } public static int voltageNameToTierId(String voltageName) { - for (int tierId = 0; tierId < GT_Values.VN.length - 1; tierId++) { - if (GT_Values.VN[tierId].equalsIgnoreCase(voltageName)) { + for (int tierId = 0; tierId < GTValues.VN.length - 1; tierId++) { + if (GTValues.VN[tierId].equalsIgnoreCase(voltageName)) { return tierId; } } diff --git a/src/main/java/com/sinthoras/hydroenergy/blocks/HEBlockRecipes.java b/src/main/java/com/sinthoras/hydroenergy/blocks/HEBlockRecipes.java index 37235f4..6011ecd 100644 --- a/src/main/java/com/sinthoras/hydroenergy/blocks/HEBlockRecipes.java +++ b/src/main/java/com/sinthoras/hydroenergy/blocks/HEBlockRecipes.java @@ -1,31 +1,31 @@ package com.sinthoras.hydroenergy.blocks; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; -import com.github.technus.tectech.thing.CustomItemList; import com.sinthoras.hydroenergy.HE; import com.sinthoras.hydroenergy.config.HEConfig; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.enums.TierEU; import gregtech.api.interfaces.IItemContainer; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import tectech.thing.CustomItemList; public class HEBlockRecipes { // TODO: Fill up recipe components as needed private static boolean isSolderingMaterial(Materials material) { return material.mStandardMoltenFluid != null && material.contains(SubTag.SOLDERING_MATERIAL) - && !(GregTech_API.mUseOnlyGoodSolderingMaterials && !material.contains(SubTag.SOLDERING_MATERIAL_GOOD)); + && !(GregTechAPI.mUseOnlyGoodSolderingMaterials && !material.contains(SubTag.SOLDERING_MATERIAL_GOOD)); } public static void registerRecipes() { @@ -94,13 +94,13 @@ public static void registerRecipes() { int multiplier = material.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : material.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Casing_SolidSteel.get(1L), - new ItemStack(GregTech_API.sBlockConcretes, 2, 8), + new ItemStack(GregTechAPI.sBlockConcretes, 2, 8), ItemList.Cover_Screen.get(1L), ItemList.FluidRegulator_MV.get(2L), - GT_Utility.getIntegratedCircuit(1)) + GTUtility.getIntegratedCircuit(1)) .itemOutputs(HE.hydroDamControllerBlock).fluidInputs(material.getMolten(144L * multiplier / 2L)) .duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -109,28 +109,28 @@ public static void registerRecipes() { continue; } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( hulls[tierId].get(1L), - GT_OreDictUnificator.get(OrePrefixes.rotor, rotorMaterialsPerVoltage[tierId], 2L), + GTOreDictUnificator.get(OrePrefixes.rotor, rotorMaterialsPerVoltage[tierId], 2L), motors[tierId].get(1L), pumps[tierId].get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, cableMaterialsPerVoltage[tierId], 2L), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.cableGt01, cableMaterialsPerVoltage[tierId], 2L), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(HE.hydroPumpBlocks[tierId]).fluidInputs(material.getMolten(144L * multiplier / 2L)) - .duration(10 * SECONDS).eut(GT_Values.V[tierId - 1]).addTo(assemblerRecipes); + .duration(10 * SECONDS).eut(GTValues.V[tierId - 1]).addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( hulls[tierId].get(1L), - GT_OreDictUnificator.get(OrePrefixes.rotor, rotorMaterialsPerVoltage[tierId], 2L), + GTOreDictUnificator.get(OrePrefixes.rotor, rotorMaterialsPerVoltage[tierId], 2L), motors[tierId].get(1L), pumps[tierId].get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, cableMaterialsPerVoltage[tierId], 2L), - GT_Utility.getIntegratedCircuit(2)) + GTOreDictUnificator.get(OrePrefixes.cableGt01, cableMaterialsPerVoltage[tierId], 2L), + GTUtility.getIntegratedCircuit(2)) .itemOutputs(HE.hydroTurbineBlocks[tierId]) .fluidInputs(material.getMolten(144L * multiplier / 2L)).duration(10 * SECONDS) - .eut(GT_Values.V[tierId - 1]).addTo(assemblerRecipes); + .eut(GTValues.V[tierId - 1]).addTo(assemblerRecipes); } diff --git a/src/main/java/com/sinthoras/hydroenergy/blocks/HEHydroDamTileEntity.java b/src/main/java/com/sinthoras/hydroenergy/blocks/HEHydroDamTileEntity.java index eefd915..b21141a 100644 --- a/src/main/java/com/sinthoras/hydroenergy/blocks/HEHydroDamTileEntity.java +++ b/src/main/java/com/sinthoras/hydroenergy/blocks/HEHydroDamTileEntity.java @@ -1,8 +1,8 @@ package com.sinthoras.hydroenergy.blocks; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -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 net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -13,8 +13,6 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; @@ -35,16 +33,18 @@ import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -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.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.util.GTUtility; +import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; +import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; -public class HEHydroDamTileEntity extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { +public class HEHydroDamTileEntity extends TTMultiblockBase implements IConstructable { private static Textures.BlockIcons.CustomIcon Screen; private static final int steelTextureIndex = 16; @@ -74,10 +74,10 @@ public class HEHydroDamTileEntity extends GT_MetaTileEntity_MultiblockBase_EM im ofHatchAdder( HEHydroDamTileEntity::addClassicToMachineList, steelTextureIndex, - GregTech_API.sBlockConcretes, + GregTechAPI.sBlockConcretes, concreteBlockMeta), - ofBlockAnyMeta(GregTech_API.sBlockConcretes, concreteBlockMeta))) - .addElement('C', ofBlockAnyMeta(GregTech_API.sBlockConcretes, concreteBlockMeta)).build(); + ofBlockAnyMeta(GregTechAPI.sBlockConcretes, concreteBlockMeta))) + .addElement('C', ofBlockAnyMeta(GregTechAPI.sBlockConcretes, concreteBlockMeta)).build(); public HEHydroDamTileEntity(String name) { super(name); @@ -127,8 +127,8 @@ private float getMaxGuiPressure() { private int getVoltageTier() { boolean configCircuitIsPresent = mInventory != null && mInventory[1] != null - && mInventory[1].getItem() == GT_Utility.getIntegratedCircuit(0).getItem(); - return configCircuitIsPresent ? HEUtil.clamp(mInventory[1].getItemDamage(), 1, GT_Values.V.length - 1) : 1; + && mInventory[1].getItem() == GTUtility.getIntegratedCircuit(0).getItem(); + return configCircuitIsPresent ? HEUtil.clamp(mInventory[1].getItemDamage(), 1, GTValues.V.length - 1) : 1; } @Override @@ -181,7 +181,7 @@ public boolean onRunningTick(ItemStack stack) { private int distributeFluid(FluidStack fluidStack) { final int availableFluid = fluidStack.amount; - for (GT_MetaTileEntity_Hatch_Output hatch : filterValidMTEs(mOutputHatches)) { + for (MTEHatchOutput hatch : filterValidMTEs(mOutputHatches)) { if (!hatch.outputsLiquids()) { continue; } @@ -233,7 +233,7 @@ public ITexture[] getTexture(IGregTechTileEntity baseMetaTileEntity, ForgeDirect int colorIndex, boolean isActive, boolean hasRedstoneSignal) { if (side == facing) { return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(steelTextureIndex), - new TT_RenderedExtendedFacingTexture(Screen) }; + new TTRenderedExtendedFacingTexture(Screen) }; } else { return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(steelTextureIndex) }; } @@ -362,10 +362,10 @@ public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildCont builder.widget(new FakeSyncWidget.IntegerSyncer(() -> waterId, val -> waterId = val)) .widget( - TextWidget.dynamicString(() -> "Hydro Dam (" + GT_Values.VN[getVoltageTier()] + ")") + TextWidget.dynamicString(() -> "Hydro Dam (" + GTValues.VN[getVoltageTier()] + ")") .setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 8)) .widget( - new TextWidget(GT_Utility.trans("142", "Running perfectly.")) + new TextWidget(GTUtility.trans("142", "Running perfectly.")) .setDefaultColor(COLOR_TEXT_WHITE.get()).setPos(7, 16)) .widget(TextWidget.dynamicString(() -> { if (getFillMultiplier() > 1.0f) { diff --git a/src/main/java/com/sinthoras/hydroenergy/blocks/HEHydroPumpTileEntity.java b/src/main/java/com/sinthoras/hydroenergy/blocks/HEHydroPumpTileEntity.java index 405d236..421cb09 100644 --- a/src/main/java/com/sinthoras/hydroenergy/blocks/HEHydroPumpTileEntity.java +++ b/src/main/java/com/sinthoras/hydroenergy/blocks/HEHydroPumpTileEntity.java @@ -6,17 +6,17 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture; import com.sinthoras.hydroenergy.HE; import com.sinthoras.hydroenergy.config.HEConfig; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; public abstract class HEHydroPumpTileEntity extends HETieredTileEntity { @@ -349,19 +349,19 @@ public IMetaTileEntity newMetaEntity(IGregTechTileEntity tileEntity) { private final int blockTextureIndex = getCasingTextureId(); public HEHydroPumpTileEntity(int tierId) { - super("he_pump_" + GT_Values.VN[tierId].toLowerCase()); + super("he_pump_" + GTValues.VN[tierId].toLowerCase()); } public HEHydroPumpTileEntity(int blockId, int tierId) { super( blockId + tierId, - "he_pump_" + GT_Values.VN[tierId].toLowerCase(), - "Hydro Pump (" + GT_Values.VN[tierId] + ")"); + "he_pump_" + GTValues.VN[tierId].toLowerCase(), + "Hydro Pump (" + GTValues.VN[tierId] + ")"); } @Override public void onTick() { - int requiredWater = (int) (GT_Values.V[getTier()] * HEConfig.milliBucketPerEU); + int requiredWater = (int) (GTValues.V[getTier()] * HEConfig.milliBucketPerEU); for (FluidStack fluidStack : getStoredFluids()) { if (fluidStack.getFluid().getID() == FluidRegistry.WATER.getID()) { final int consumedWater = Math.min(fluidStack.amount, requiredWater); @@ -396,12 +396,12 @@ public ITexture[] getTexture(IGregTechTileEntity baseMetaTileEntity, ForgeDirect if (isActive) { return new ITexture[] { Textures.BlockIcons.casingTexturePages[blockTextureIndex >> 6][blockTextureIndex & 0x3f], - new TT_RenderedExtendedFacingTexture(textureScreenPumpON), - new TT_RenderedExtendedFacingTexture(textureScreenArrowUpAnimated) }; + new TTRenderedExtendedFacingTexture(textureScreenPumpON), + new TTRenderedExtendedFacingTexture(textureScreenArrowUpAnimated) }; } else { return new ITexture[] { Textures.BlockIcons.casingTexturePages[blockTextureIndex >> 6][blockTextureIndex & 0x3f], - new TT_RenderedExtendedFacingTexture(textureScreenPumpOFF) }; + new TTRenderedExtendedFacingTexture(textureScreenPumpOFF) }; } } else { return new ITexture[] { diff --git a/src/main/java/com/sinthoras/hydroenergy/blocks/HEHydroTurbineTileEntity.java b/src/main/java/com/sinthoras/hydroenergy/blocks/HEHydroTurbineTileEntity.java index e2ce80f..7663991 100644 --- a/src/main/java/com/sinthoras/hydroenergy/blocks/HEHydroTurbineTileEntity.java +++ b/src/main/java/com/sinthoras/hydroenergy/blocks/HEHydroTurbineTileEntity.java @@ -6,17 +6,17 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture; import com.sinthoras.hydroenergy.HE; import com.sinthoras.hydroenergy.config.HEConfig; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; public abstract class HEHydroTurbineTileEntity extends HETieredTileEntity { @@ -349,14 +349,14 @@ public IMetaTileEntity newMetaEntity(IGregTechTileEntity tileEntity) { private final int blockTextureIndex = getCasingTextureId(); public HEHydroTurbineTileEntity(int tierId) { - super("he_turbine_" + GT_Values.VN[tierId].toLowerCase()); + super("he_turbine_" + GTValues.VN[tierId].toLowerCase()); } public HEHydroTurbineTileEntity(int blockId, int tierId) { super( blockId + tierId, - "he_turbine_" + GT_Values.VN[tierId].toLowerCase(), - "Hydro Turbine (" + GT_Values.VN[tierId] + ")"); + "he_turbine_" + GTValues.VN[tierId].toLowerCase(), + "Hydro Turbine (" + GTValues.VN[tierId] + ")"); } @Override @@ -394,12 +394,12 @@ public ITexture[] getTexture(IGregTechTileEntity baseMetaTileEntity, ForgeDirect if (isActive) { return new ITexture[] { Textures.BlockIcons.casingTexturePages[blockTextureIndex >> 6][blockTextureIndex & 0x3f], - new TT_RenderedExtendedFacingTexture(textureScreenTurbineON), - new TT_RenderedExtendedFacingTexture(textureScreenArrowDownAnimated) }; + new TTRenderedExtendedFacingTexture(textureScreenTurbineON), + new TTRenderedExtendedFacingTexture(textureScreenArrowDownAnimated) }; } else { return new ITexture[] { Textures.BlockIcons.casingTexturePages[blockTextureIndex >> 6][blockTextureIndex & 0x3f], - new TT_RenderedExtendedFacingTexture(textureScreenTurbineOFF) }; + new TTRenderedExtendedFacingTexture(textureScreenTurbineOFF) }; } } else { return new ITexture[] { diff --git a/src/main/java/com/sinthoras/hydroenergy/blocks/HETieredTileEntity.java b/src/main/java/com/sinthoras/hydroenergy/blocks/HETieredTileEntity.java index c78b42c..ad2e14e 100644 --- a/src/main/java/com/sinthoras/hydroenergy/blocks/HETieredTileEntity.java +++ b/src/main/java/com/sinthoras/hydroenergy/blocks/HETieredTileEntity.java @@ -1,24 +1,24 @@ package com.sinthoras.hydroenergy.blocks; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; +import static gregtech.api.util.GTStructureUtility.ofHatchAdder; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import com.sinthoras.hydroenergy.HETags; import com.sinthoras.hydroenergy.config.HEConfig; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; +import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; -public abstract class HETieredTileEntity extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { +public abstract class HETieredTileEntity extends TTMultiblockBase implements IConstructable { private int countOfHatches = 0; private IStructureDefinition multiblockDefinition = null; @@ -39,17 +39,17 @@ protected Block getCasingBlock() { default: case 1: case 2: - return GregTech_API.sBlockCasings2; + return GregTechAPI.sBlockCasings2; case 3: case 4: case 5: case 8: - return GregTech_API.sBlockCasings4; + return GregTechAPI.sBlockCasings4; case 6: case 7: case 9: case 11: - return GregTech_API.sBlockCasings8; + return GregTechAPI.sBlockCasings8; } } @@ -80,37 +80,37 @@ protected int getCasingMeta() { protected int getCasingTextureId() { final Block casingBlock = getCasingBlock(); final int metaId = getCasingMeta(); - if (casingBlock == GregTech_API.sBlockCasings1) { + if (casingBlock == GregTechAPI.sBlockCasings1) { return metaId; } - if (casingBlock == GregTech_API.sBlockCasings2) { + if (casingBlock == GregTechAPI.sBlockCasings2) { return 16 + metaId; } - if (casingBlock == GregTech_API.sBlockCasings3) { + if (casingBlock == GregTechAPI.sBlockCasings3) { return 2 * 16 + metaId; } - if (casingBlock == GregTech_API.sBlockCasings4) { + if (casingBlock == GregTechAPI.sBlockCasings4) { return 3 * 16 + metaId; } - if (casingBlock == GregTech_API.sBlockCasings5) { + if (casingBlock == GregTechAPI.sBlockCasings5) { return 4 * 16 + metaId; } - if (casingBlock == GregTech_API.sBlockCasings6) { + if (casingBlock == GregTechAPI.sBlockCasings6) { return 5 * 16 + metaId; } - if (casingBlock == GregTech_API.sBlockCasings8) { + if (casingBlock == GregTechAPI.sBlockCasings8) { return 7 * 16 + metaId; } return 0; } protected String getCasingName() { - return GT_LanguageManager + return GTLanguageManager .getTranslation(getCasingBlock().getUnlocalizedName() + "." + getCasingMeta() + ".name"); } protected long getVoltage() { - return GT_Values.V[getTier()]; + return GTValues.V[getTier()]; } protected float getPressure() { diff --git a/src/main/java/com/sinthoras/hydroenergy/config/HEConfig.java b/src/main/java/com/sinthoras/hydroenergy/config/HEConfig.java index 9e7f849..1e29dab 100644 --- a/src/main/java/com/sinthoras/hydroenergy/config/HEConfig.java +++ b/src/main/java/com/sinthoras/hydroenergy/config/HEConfig.java @@ -9,7 +9,7 @@ import com.sinthoras.hydroenergy.HEUtil; import cpw.mods.fml.common.Loader; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; public class HEConfig { @@ -64,7 +64,7 @@ private static class Categories { public static float pressureIncreasePerTier = Defaults.pressureIncreasePerTier; public static float milliBucketPerEU = Defaults.milliBucketPerEU; public static float euPerMilliBucket = 1.0f / Defaults.milliBucketPerEU; - public static boolean[] enabledTiers = new boolean[GT_Values.VN.length - 1]; + public static boolean[] enabledTiers = new boolean[GTValues.VN.length - 1]; public static boolean useLimitedRendering = Defaults.useLimitedRendering; public static boolean forceOpenGL = Defaults.forceOpenGL; diff --git a/src/main/java/com/sinthoras/hydroenergy/mixins/gregtech/GT_PollutionRendererMixin.java b/src/main/java/com/sinthoras/hydroenergy/mixins/gregtech/GT_PollutionRendererMixin.java index 124f79f..860c98c 100644 --- a/src/main/java/com/sinthoras/hydroenergy/mixins/gregtech/GT_PollutionRendererMixin.java +++ b/src/main/java/com/sinthoras/hydroenergy/mixins/gregtech/GT_PollutionRendererMixin.java @@ -12,9 +12,9 @@ import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import gregtech.common.render.GT_PollutionRenderer; +import gregtech.common.render.PollutionRenderer; -@Mixin(value = GT_PollutionRenderer.class) +@Mixin(value = PollutionRenderer.class) public class GT_PollutionRendererMixin { private EntityViewRenderEvent.FogColors event;