diff options
| author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-09-02 23:17:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-02 23:17:17 +0200 |
| commit | 1b820de08a05070909a267e17f033fcf58ac8710 (patch) | |
| tree | 02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/kubatech/tileentity | |
| parent | afd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff) | |
| download | GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2 GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip | |
The Great Renaming (#3014)
* move kekztech to a single root dir
* move detrav to a single root dir
* move gtnh-lanthanides to a single root dir
* move tectech and delete some gross reflection in gt++
* remove more reflection inside gt5u
* delete more reflection in gt++
* fix imports
* move bartworks and bwcrossmod
* fix proxies
* move galactigreg and ggfab
* move gtneioreplugin
* try to fix gt++ bee loader
* apply the rename rules to BW
* apply rename rules to bwcrossmod
* apply rename rules to detrav scanner mod
* apply rename rules to galacticgreg
* apply rename rules to ggfab
* apply rename rules to goodgenerator
* apply rename rules to gtnh-lanthanides
* apply rename rules to gt++
* apply rename rules to kekztech
* apply rename rules to kubatech
* apply rename rules to tectech
* apply rename rules to gt
apply the rename rules to gt
* fix tt import
* fix mui hopefully
* fix coremod except intergalactic
* rename assline recipe class
* fix a class name i stumbled on
* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib
* temporary rename of GTTooltipDataCache to old name
* fix gt client/server proxy names
Diffstat (limited to 'src/main/java/kubatech/tileentity')
11 files changed, 244 insertions, 260 deletions
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" |
