From 6d3c7e7612be9565f8e3d647745ac59bd331d50e Mon Sep 17 00:00:00 2001 From: Roadhog360 Date: Sat, 16 Sep 2023 22:56:38 -0500 Subject: [PATCH] Rename GUIsID to GUIIDs Also add in meta sensitivity to getFinalCopperMeta --- .../etfuturum/blocks/BlockBarrel.java | 4 +- .../etfuturum/blocks/BlockBlastFurnace.java | 4 +- .../etfuturum/blocks/BlockCutCopperSlab.java | 3 +- .../blocks/BlockCutCopperStairs.java | 3 +- .../etfuturum/blocks/BlockNewAnvil.java | 4 +- .../blocks/BlockNewBrewingStand.java | 4 +- .../blocks/BlockNewEnchantmentTable.java | 4 +- .../etfuturum/blocks/BlockShulkerBox.java | 4 +- .../etfuturum/blocks/BlockSmithingTable.java | 4 +- .../etfuturum/blocks/BlockSmoker.java | 4 +- .../etfuturum/blocks/IDegradable.java | 19 ++++++--- .../etfuturum/core/proxy/CommonProxy.java | 40 +++++++++---------- .../lib/{GUIsID.java => GUIIDs.java} | 2 +- 13 files changed, 55 insertions(+), 44 deletions(-) rename src/main/java/ganymedes01/etfuturum/lib/{GUIsID.java => GUIIDs.java} (94%) diff --git a/src/main/java/ganymedes01/etfuturum/blocks/BlockBarrel.java b/src/main/java/ganymedes01/etfuturum/blocks/BlockBarrel.java index 15356a830..3475a3b4e 100644 --- a/src/main/java/ganymedes01/etfuturum/blocks/BlockBarrel.java +++ b/src/main/java/ganymedes01/etfuturum/blocks/BlockBarrel.java @@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ganymedes01.etfuturum.EtFuturum; import ganymedes01.etfuturum.core.utils.Utils; -import ganymedes01.etfuturum.lib.GUIsID; +import ganymedes01.etfuturum.lib.GUIIDs; import ganymedes01.etfuturum.lib.RenderIDs; import ganymedes01.etfuturum.tileentities.TileEntityBarrel; import net.minecraft.block.Block; @@ -80,7 +80,7 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p if (world.isRemote) { return true; } - player.openGui(EtFuturum.instance, GUIsID.BARREL, world, x, y, z); + player.openGui(EtFuturum.instance, GUIIDs.BARREL, world, x, y, z); return true; } diff --git a/src/main/java/ganymedes01/etfuturum/blocks/BlockBlastFurnace.java b/src/main/java/ganymedes01/etfuturum/blocks/BlockBlastFurnace.java index 007d69569..8e4835ae8 100644 --- a/src/main/java/ganymedes01/etfuturum/blocks/BlockBlastFurnace.java +++ b/src/main/java/ganymedes01/etfuturum/blocks/BlockBlastFurnace.java @@ -7,7 +7,7 @@ import ganymedes01.etfuturum.client.InterpolatedIcon; import ganymedes01.etfuturum.configuration.configs.ConfigSounds; import ganymedes01.etfuturum.core.utils.Utils; -import ganymedes01.etfuturum.lib.GUIsID; +import ganymedes01.etfuturum.lib.GUIIDs; import ganymedes01.etfuturum.lib.Reference; import ganymedes01.etfuturum.tileentities.TileEntityBlastFurnace; import net.minecraft.block.Block; @@ -172,7 +172,7 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p if (world.isRemote) { return true; } - player.openGui(EtFuturum.instance, GUIsID.BLAST_FURNACE, world, x, y, z); + player.openGui(EtFuturum.instance, GUIIDs.BLAST_FURNACE, world, x, y, z); return true; } diff --git a/src/main/java/ganymedes01/etfuturum/blocks/BlockCutCopperSlab.java b/src/main/java/ganymedes01/etfuturum/blocks/BlockCutCopperSlab.java index e02942ca7..f387742c3 100644 --- a/src/main/java/ganymedes01/etfuturum/blocks/BlockCutCopperSlab.java +++ b/src/main/java/ganymedes01/etfuturum/blocks/BlockCutCopperSlab.java @@ -9,6 +9,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.Random; @@ -47,7 +48,7 @@ public void registerBlockIcons(IIconRegister reg) { } @Override - public int getFinalCopperMeta(int copperMeta, int worldMeta) { + public int getFinalCopperMeta(IBlockAccess world, int x, int y, int z, int copperMeta, int worldMeta) { return (copperMeta - (copperMeta > 11 ? 8 : 4)) + (worldMeta > 7 ? 8 : 0); } diff --git a/src/main/java/ganymedes01/etfuturum/blocks/BlockCutCopperStairs.java b/src/main/java/ganymedes01/etfuturum/blocks/BlockCutCopperStairs.java index de13b0d5d..9e0968f83 100644 --- a/src/main/java/ganymedes01/etfuturum/blocks/BlockCutCopperStairs.java +++ b/src/main/java/ganymedes01/etfuturum/blocks/BlockCutCopperStairs.java @@ -3,6 +3,7 @@ import ganymedes01.etfuturum.ModBlocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.Random; @@ -88,7 +89,7 @@ public Block getCopperBlockFromMeta(int i) { } @Override - public int getFinalCopperMeta(int meta, int worldMeta) { + public int getFinalCopperMeta(IBlockAccess world, int x, int y, int z, int meta, int worldMeta) { return worldMeta; } } diff --git a/src/main/java/ganymedes01/etfuturum/blocks/BlockNewAnvil.java b/src/main/java/ganymedes01/etfuturum/blocks/BlockNewAnvil.java index b44713509..292f7e92a 100644 --- a/src/main/java/ganymedes01/etfuturum/blocks/BlockNewAnvil.java +++ b/src/main/java/ganymedes01/etfuturum/blocks/BlockNewAnvil.java @@ -5,7 +5,7 @@ import ganymedes01.etfuturum.EtFuturum; import ganymedes01.etfuturum.ModBlocks; import ganymedes01.etfuturum.configuration.configs.ConfigWorld; -import ganymedes01.etfuturum.lib.GUIsID; +import ganymedes01.etfuturum.lib.GUIIDs; import net.minecraft.block.BlockAnvil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -43,7 +43,7 @@ public Item getItem(World world, int x, int y, int z) { public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (world.isRemote) return true; - player.openGui(EtFuturum.instance, GUIsID.ANVIL, world, x, y, z); + player.openGui(EtFuturum.instance, GUIIDs.ANVIL, world, x, y, z); return true; } diff --git a/src/main/java/ganymedes01/etfuturum/blocks/BlockNewBrewingStand.java b/src/main/java/ganymedes01/etfuturum/blocks/BlockNewBrewingStand.java index 0ef052638..b6b0c74ce 100644 --- a/src/main/java/ganymedes01/etfuturum/blocks/BlockNewBrewingStand.java +++ b/src/main/java/ganymedes01/etfuturum/blocks/BlockNewBrewingStand.java @@ -5,7 +5,7 @@ import ganymedes01.etfuturum.EtFuturum; import ganymedes01.etfuturum.ModBlocks; import ganymedes01.etfuturum.configuration.configs.ConfigWorld; -import ganymedes01.etfuturum.lib.GUIsID; +import ganymedes01.etfuturum.lib.GUIIDs; import ganymedes01.etfuturum.tileentities.TileEntityNewBrewingStand; import net.minecraft.block.BlockBrewingStand; import net.minecraft.entity.player.EntityPlayer; @@ -38,7 +38,7 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p TileEntityBrewingStand tile = (TileEntityBrewingStand) world.getTileEntity(x, y, z); if (tile != null) - player.openGui(EtFuturum.instance, GUIsID.BREWING_STAND, world, x, y, z); + player.openGui(EtFuturum.instance, GUIIDs.BREWING_STAND, world, x, y, z); return true; } diff --git a/src/main/java/ganymedes01/etfuturum/blocks/BlockNewEnchantmentTable.java b/src/main/java/ganymedes01/etfuturum/blocks/BlockNewEnchantmentTable.java index f34244ef9..826c3f24f 100644 --- a/src/main/java/ganymedes01/etfuturum/blocks/BlockNewEnchantmentTable.java +++ b/src/main/java/ganymedes01/etfuturum/blocks/BlockNewEnchantmentTable.java @@ -5,7 +5,7 @@ import ganymedes01.etfuturum.EtFuturum; import ganymedes01.etfuturum.ModBlocks; import ganymedes01.etfuturum.configuration.configs.ConfigWorld; -import ganymedes01.etfuturum.lib.GUIsID; +import ganymedes01.etfuturum.lib.GUIIDs; import net.minecraft.block.BlockEnchantmentTable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -43,7 +43,7 @@ public Item getItem(World world, int x, int y, int z) { public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (world.isRemote) return true; - player.openGui(EtFuturum.instance, GUIsID.ENCHANTING_TABLE, world, x, y, z); + player.openGui(EtFuturum.instance, GUIIDs.ENCHANTING_TABLE, world, x, y, z); return true; } } \ No newline at end of file diff --git a/src/main/java/ganymedes01/etfuturum/blocks/BlockShulkerBox.java b/src/main/java/ganymedes01/etfuturum/blocks/BlockShulkerBox.java index 982bf98d6..ee8be8cf5 100644 --- a/src/main/java/ganymedes01/etfuturum/blocks/BlockShulkerBox.java +++ b/src/main/java/ganymedes01/etfuturum/blocks/BlockShulkerBox.java @@ -8,7 +8,7 @@ import ganymedes01.etfuturum.configuration.configs.ConfigModCompat; import ganymedes01.etfuturum.core.utils.Utils; import ganymedes01.etfuturum.items.BaseSubtypesItem; -import ganymedes01.etfuturum.lib.GUIsID; +import ganymedes01.etfuturum.lib.GUIIDs; import ganymedes01.etfuturum.tileentities.TileEntityShulkerBox; import ganymedes01.etfuturum.tileentities.TileEntityShulkerBox.ShulkerBoxType; import net.minecraft.block.Block; @@ -158,7 +158,7 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p } if (flag) { - player.openGui(EtFuturum.instance, GUIsID.SHULKER_BOX, world, x, y, z); + player.openGui(EtFuturum.instance, GUIIDs.SHULKER_BOX, world, x, y, z); } return true; diff --git a/src/main/java/ganymedes01/etfuturum/blocks/BlockSmithingTable.java b/src/main/java/ganymedes01/etfuturum/blocks/BlockSmithingTable.java index 140c4b615..8166133e2 100644 --- a/src/main/java/ganymedes01/etfuturum/blocks/BlockSmithingTable.java +++ b/src/main/java/ganymedes01/etfuturum/blocks/BlockSmithingTable.java @@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ganymedes01.etfuturum.EtFuturum; import ganymedes01.etfuturum.core.utils.Utils; -import ganymedes01.etfuturum.lib.GUIsID; +import ganymedes01.etfuturum.lib.GUIIDs; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -48,7 +48,7 @@ public void registerBlockIcons(IIconRegister p_149651_1_) { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ) { if (!world.isRemote) - player.openGui(EtFuturum.instance, GUIsID.SMITHING_TABLE, world, x, y, z); + player.openGui(EtFuturum.instance, GUIIDs.SMITHING_TABLE, world, x, y, z); return true; } } diff --git a/src/main/java/ganymedes01/etfuturum/blocks/BlockSmoker.java b/src/main/java/ganymedes01/etfuturum/blocks/BlockSmoker.java index 52ed57f8e..9938214cb 100644 --- a/src/main/java/ganymedes01/etfuturum/blocks/BlockSmoker.java +++ b/src/main/java/ganymedes01/etfuturum/blocks/BlockSmoker.java @@ -6,7 +6,7 @@ import ganymedes01.etfuturum.ModBlocks; import ganymedes01.etfuturum.configuration.configs.ConfigSounds; import ganymedes01.etfuturum.core.utils.Utils; -import ganymedes01.etfuturum.lib.GUIsID; +import ganymedes01.etfuturum.lib.GUIIDs; import ganymedes01.etfuturum.lib.Reference; import ganymedes01.etfuturum.tileentities.TileEntitySmoker; import net.minecraft.block.Block; @@ -155,7 +155,7 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p if (world.isRemote) { return true; } - player.openGui(EtFuturum.instance, GUIsID.SMOKER, world, x, y, z); + player.openGui(EtFuturum.instance, GUIIDs.SMOKER, world, x, y, z); return true; } diff --git a/src/main/java/ganymedes01/etfuturum/blocks/IDegradable.java b/src/main/java/ganymedes01/etfuturum/blocks/IDegradable.java index 96a486675..1ff30355f 100644 --- a/src/main/java/ganymedes01/etfuturum/blocks/IDegradable.java +++ b/src/main/java/ganymedes01/etfuturum/blocks/IDegradable.java @@ -57,6 +57,15 @@ default int getCopperMeta(IBlockAccess world, int x, int y, int z, int meta) { return getCopperMeta(meta); } + /** + * Deprecated, use getFinalCopperMeta(IBlockAccess world, int x, int y, int z, int meta, int worldMeta) + */ + @Deprecated + default int getFinalCopperMeta(int meta, int worldMeta) { + return getCopperMeta(meta); + } + + /** * A getCopperMeta copy that takes the actual meta value of the block into account. * Used by slabs to wrap the meta data from 0-7 or 8-15. @@ -65,8 +74,8 @@ default int getCopperMeta(IBlockAccess world, int x, int y, int z, int meta) { * @param worldMeta World meta (Is always the meta value from before the copper changed and is the actual block meta, not the copper ID) * @return A copper value from getCopperMeta. */ - default int getFinalCopperMeta(int meta, int worldMeta) { - return getCopperMeta(meta); + default int getFinalCopperMeta(IBlockAccess world, int x, int y, int z, int meta, int worldMeta) { + return getCopperMeta(world, x, y, z, meta); } @@ -126,7 +135,7 @@ default void tryDegrade(World world, int x, int y, int z, Random random) { float f = (float) (k + 1) / (float) (k + j + 1); float g = f * f * (i % 4 == 0 ? 0.75F : 1F); if (random.nextFloat() < g) { - setCopperBlock(getCopperBlockFromMeta(i + 1), getFinalCopperMeta(i + 1, world.getBlockMetadata(x, y, z)), world, x, y, z); + setCopperBlock(getCopperBlockFromMeta(i + 1), getFinalCopperMeta(world, x, y, z, i + 1, world.getBlockMetadata(x, y, z)), world, x, y, z); } } } @@ -180,11 +189,11 @@ default boolean tryWaxOnWaxOff(World world, int x, int y, int z, EntityPlayer en if (flag && !flag2) { waxMeta = meta > 7 ? meta % 8 : (meta % 8 + 8); block = getCopperBlockFromMeta(waxMeta); - setCopperBlock(block, getFinalCopperMeta(waxMeta, world.getBlockMetadata(x, y, z)), world, x, y, z); + setCopperBlock(block, getFinalCopperMeta(world, x, y, z, waxMeta, world.getBlockMetadata(x, y, z)), world, x, y, z); spawnParticles(world, x, y, z, meta < 8 ? 0 : 1); } else if (!flag && flag2) { block = getCopperBlockFromMeta(meta - 1); - setCopperBlock(block, getFinalCopperMeta(meta - 1, world.getBlockMetadata(x, y, z)), world, x, y, z); + setCopperBlock(block, getFinalCopperMeta(world, x, y, z, meta - 1, world.getBlockMetadata(x, y, z)), world, x, y, z); spawnParticles(world, x, y, z, 2); } } diff --git a/src/main/java/ganymedes01/etfuturum/core/proxy/CommonProxy.java b/src/main/java/ganymedes01/etfuturum/core/proxy/CommonProxy.java index 21cb713a6..76d7fdadd 100644 --- a/src/main/java/ganymedes01/etfuturum/core/proxy/CommonProxy.java +++ b/src/main/java/ganymedes01/etfuturum/core/proxy/CommonProxy.java @@ -18,7 +18,7 @@ import ganymedes01.etfuturum.core.utils.Utils; import ganymedes01.etfuturum.entities.*; import ganymedes01.etfuturum.inventory.*; -import ganymedes01.etfuturum.lib.GUIsID; +import ganymedes01.etfuturum.lib.GUIIDs; import ganymedes01.etfuturum.spectator.SpectatorMode; import ganymedes01.etfuturum.tileentities.*; import net.minecraft.client.gui.inventory.GuiChest; @@ -176,27 +176,24 @@ public void registerEntities() { EntityRegistry.addSpawn(EntityMagmaCube.class, 2, 4, 4, EnumCreatureType.monster, BiomeGenBase.hell); } - public void registerRenderers() { - } - @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { switch (ID) { - case GUIsID.ENCHANTING_TABLE: + case GUIIDs.ENCHANTING_TABLE: return new ContainerEnchantment(player.inventory, world, x, y, z); - case GUIsID.ANVIL: + case GUIIDs.ANVIL: return new ContainerAnvil(player, world, x, y, z); - case GUIsID.BREWING_STAND: + case GUIIDs.BREWING_STAND: return new ContainerNewBrewingStand(player.inventory, (TileEntityNewBrewingStand) world.getTileEntity(x, y, z)); - case GUIsID.BARREL: + case GUIIDs.BARREL: return new ContainerChest(player.inventory, (TileEntityBarrel) world.getTileEntity(x, y, z)); - case GUIsID.SMOKER: + case GUIIDs.SMOKER: return new ContainerSmoker(player.inventory, (TileEntitySmoker) world.getTileEntity(x, y, z)); - case GUIsID.BLAST_FURNACE: + case GUIIDs.BLAST_FURNACE: return new ContainerBlastFurnace(player.inventory, (TileEntityBlastFurnace) world.getTileEntity(x, y, z)); - case GUIsID.SHULKER_BOX: + case GUIIDs.SHULKER_BOX: return new ContainerChestGeneric(player.inventory, (TileEntityShulkerBox) world.getTileEntity(x, y, z), ((TileEntityShulkerBox) world.getTileEntity(x, y, z)).getRowSize(), ((TileEntityShulkerBox) world.getTileEntity(x, y, z)).getSizeInventory() != 27); - case GUIsID.SMITHING_TABLE: + case GUIIDs.SMITHING_TABLE: return new ContainerSmithingTable(player.inventory, world); default: return null; @@ -206,24 +203,27 @@ public Object getServerGuiElement(int ID, EntityPlayer player, World world, int @Override public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { switch (ID) { - case GUIsID.ENCHANTING_TABLE: + case GUIIDs.ENCHANTING_TABLE: return new GuiEnchantment(player.inventory, world, null); - case GUIsID.ANVIL: + case GUIIDs.ANVIL: return new GuiAnvil(player, world, x, y, z); - case GUIsID.BREWING_STAND: + case GUIIDs.BREWING_STAND: return new GuiNewBrewingStand(player.inventory, (TileEntityNewBrewingStand) world.getTileEntity(x, y, z)); - case GUIsID.BARREL: + case GUIIDs.BARREL: return new GuiChest(player.inventory, (TileEntityBarrel) world.getTileEntity(x, y, z)); - case GUIsID.SMOKER: + case GUIIDs.SMOKER: return new GuiSmoker(player.inventory, (TileEntitySmoker) world.getTileEntity(x, y, z)); - case GUIsID.BLAST_FURNACE: + case GUIIDs.BLAST_FURNACE: return new GuiBlastFurnace(player.inventory, (TileEntityBlastFurnace) world.getTileEntity(x, y, z)); - case GUIsID.SHULKER_BOX: + case GUIIDs.SHULKER_BOX: return new GuiShulkerBox(player.inventory, (TileEntityShulkerBox) world.getTileEntity(x, y, z)); - case GUIsID.SMITHING_TABLE: + case GUIIDs.SMITHING_TABLE: return new GuiSmithingTable(new ContainerSmithingTable(player.inventory, world)); default: return null; } } + + public void registerRenderers() { + } } \ No newline at end of file diff --git a/src/main/java/ganymedes01/etfuturum/lib/GUIsID.java b/src/main/java/ganymedes01/etfuturum/lib/GUIIDs.java similarity index 94% rename from src/main/java/ganymedes01/etfuturum/lib/GUIsID.java rename to src/main/java/ganymedes01/etfuturum/lib/GUIIDs.java index bbc9e9ce0..c2ca87ef4 100644 --- a/src/main/java/ganymedes01/etfuturum/lib/GUIsID.java +++ b/src/main/java/ganymedes01/etfuturum/lib/GUIIDs.java @@ -1,6 +1,6 @@ package ganymedes01.etfuturum.lib; -public class GUIsID { +public class GUIIDs { public static final int ENCHANTING_TABLE = 0; public static final int ANVIL = 1;