From 45888e30fe3c0f24a4f584bcddbd1b88cf009462 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Fri, 30 May 2025 15:13:22 -0400 Subject: [PATCH] Use improved switch blocks and remove extra textures not relevant to the blocks. --- .../common/block/BlockAltar.java | 13 +++---- .../common/block/BlockConduit.java | 13 +++---- .../common/block/BlockCrucible.java | 19 +++-------- .../common/block/BlockCrystal.java | 19 +++-------- .../common/block/BlockEnchantmentGlyph.java | 16 +++------ .../common/block/BlockHomHeart.java | 13 +++---- .../common/block/BlockPedestal.java | 27 +-------------- .../common/block/BlockPlinth.java | 27 +-------------- .../common/block/BlockSchematicSaver.java | 4 +-- .../common/block/BlockSocket.java | 27 +-------------- .../common/block/BlockStabilityGlyph.java | 18 +--------- .../common/block/BlockTeleposer.java | 13 +++---- .../common/block/BlockWritingTable.java | 27 +-------------- .../common/block/BloodRune.java | 34 +++++-------------- .../common/items/EnergyBlast.java | 14 +++----- .../items/energy/ItemAttunedCrystal.java | 12 +++---- .../items/energy/ItemTankSegmenter.java | 12 +++---- 17 files changed, 64 insertions(+), 244 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java index a410121f..29ea6821 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java @@ -54,14 +54,11 @@ public class BlockAltar extends BlockContainer { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - switch (side) { - case 0: - return bottomIcon; - case 1: - return topIcon; - default: - return sideIcon2; - } + return switch (side) { + case 0 -> bottomIcon; + case 1 -> topIcon; + default -> sideIcon2; + }; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockConduit.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockConduit.java index f28b1f6d..9e97155b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockConduit.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockConduit.java @@ -41,14 +41,11 @@ public class BlockConduit extends BlockOrientable { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - switch (side) { - case 0: - return bottomIcon; - case 1: - return topIcon; - default: - return sideIcon2; - } + return switch (side) { + case 0 -> bottomIcon; + case 1 -> topIcon; + default -> sideIcon2; + }; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrucible.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrucible.java index 88367e59..59a142db 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrucible.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrucible.java @@ -78,22 +78,13 @@ public class BlockCrucible extends BlockContainer { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - switch (side) { - case 0: - return bottomIcon; - case 1: - return topIcon; - default: - return sideIcon; - } + return switch (side) { + case 0 -> bottomIcon; + case 1 -> topIcon; + default -> sideIcon; + }; } - // @Override - // public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) - // { - // return null; - // } - @Override public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { this.setBlockBounds(0.3125F, 0.0F, 0.3125F, 0.6875F, 0.625F, 0.6875F); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrystal.java index 466b996a..d22bafa0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrystal.java @@ -17,10 +17,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockCrystal extends Block { - // private Icon bloodRuneIcon; - @SideOnly(Side.CLIENT) - private IIcon fullIcon; - @SideOnly(Side.CLIENT) private IIcon brickIcon; @@ -35,8 +31,7 @@ public class BlockCrystal extends Block { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:BlankRune"); - this.fullIcon = iconRegister.registerIcon("AlchemicalWizardry:ShardCluster"); + this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:ShardCluster"); this.brickIcon = iconRegister.registerIcon("AlchemicalWizardry:ShardClusterBrick"); } @@ -57,16 +52,10 @@ public class BlockCrystal extends Block { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - switch (meta) { - case 0: - return fullIcon; - - case 1: - return brickIcon; - - default: - return blockIcon; + if (meta == 1) { + return brickIcon; } + return blockIcon; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEnchantmentGlyph.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEnchantmentGlyph.java index aba92c92..f5da0e5e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEnchantmentGlyph.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEnchantmentGlyph.java @@ -18,9 +18,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockEnchantmentGlyph extends Block implements IEnchantmentGlyph { - @SideOnly(Side.CLIENT) - private IIcon enchantability; - @SideOnly(Side.CLIENT) private IIcon enchantmentLevel; @@ -35,22 +32,17 @@ public class BlockEnchantmentGlyph extends Block implements IEnchantmentGlyph { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:LargeBloodStoneBrick"); - this.enchantability = iconRegister.registerIcon("AlchemicalWizardry:GlyphEnchantability"); + this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:GlyphEnchantability"); this.enchantmentLevel = iconRegister.registerIcon("AlchemicalWizardry:GlyphEnchantmentLevel"); } @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - switch (meta) { - case 0: - return enchantability; - case 1: - return enchantmentLevel; - default: - return this.blockIcon; + if (meta == 1) { + return enchantmentLevel; } + return this.blockIcon; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockHomHeart.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockHomHeart.java index 7e807383..784ef8d2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockHomHeart.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockHomHeart.java @@ -46,14 +46,11 @@ public class BlockHomHeart extends BlockContainer { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - switch (side) { - case 0: - return bottomIcon; - case 1: - return topIcon; - default: - return sideIcon; - } + return switch (side) { + case 0 -> bottomIcon; + case 1 -> topIcon; + default -> sideIcon; + }; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPedestal.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPedestal.java index b7f85139..c0549eb1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPedestal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPedestal.java @@ -12,7 +12,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; @@ -22,15 +21,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockPedestal extends BlockContainer { - @SideOnly(Side.CLIENT) - private IIcon topIcon; - - @SideOnly(Side.CLIENT) - private IIcon sideIcon2; - - @SideOnly(Side.CLIENT) - private IIcon bottomIcon; - public BlockPedestal() { super(Material.rock); setHardness(2.0F); @@ -44,22 +34,7 @@ public class BlockPedestal extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:ArcanePedestal"); - this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); - this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - switch (side) { - case 0: - return bottomIcon; - case 1: - return topIcon; - default: - return sideIcon2; - } + this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:ArcanePedestal"); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPlinth.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPlinth.java index 8e00ef68..033ffd0e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPlinth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPlinth.java @@ -12,7 +12,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; @@ -22,15 +21,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockPlinth extends BlockContainer { - @SideOnly(Side.CLIENT) - private IIcon topIcon; - - @SideOnly(Side.CLIENT) - private IIcon sideIcon2; - - @SideOnly(Side.CLIENT) - private IIcon bottomIcon; - public BlockPlinth() { super(Material.rock); setHardness(2.0F); @@ -44,22 +34,7 @@ public class BlockPlinth extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:ArcanePlinth"); - this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); - this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - switch (side) { - case 0: - return bottomIcon; - case 1: - return topIcon; - default: - return sideIcon2; - } + this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:ArcanePlinth"); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSchematicSaver.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSchematicSaver.java index 8e8f57e5..ed281409 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSchematicSaver.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSchematicSaver.java @@ -1,7 +1,5 @@ package WayofTime.alchemicalWizardry.common.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,6 +8,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.common.tileEntity.TESchematicSaver; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockSchematicSaver extends BlockContainer { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSocket.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSocket.java index 587df7d8..656467de 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSocket.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSocket.java @@ -12,7 +12,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; @@ -23,15 +22,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockSocket extends BlockContainer { - @SideOnly(Side.CLIENT) - private IIcon topIcon; - - @SideOnly(Side.CLIENT) - private IIcon sideIcon2; - - @SideOnly(Side.CLIENT) - private IIcon bottomIcon; - public BlockSocket() { super(Material.rock); setHardness(2.0F); @@ -44,22 +34,7 @@ public class BlockSocket extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); - this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); - this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - switch (side) { - case 0: - return bottomIcon; - case 1: - return topIcon; - default: - return sideIcon2; - } + this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket"); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockStabilityGlyph.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockStabilityGlyph.java index 5073f8e0..12c3ec71 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockStabilityGlyph.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockStabilityGlyph.java @@ -8,7 +8,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; @@ -18,9 +17,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockStabilityGlyph extends Block implements IStabilityGlyph { - @SideOnly(Side.CLIENT) - private IIcon stability1; - public BlockStabilityGlyph() { super(Material.iron); setHardness(2.0F); @@ -32,19 +28,7 @@ public class BlockStabilityGlyph extends Block implements IStabilityGlyph { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:LargeBloodStoneBrick"); - this.stability1 = iconRegister.registerIcon("AlchemicalWizardry:GlyphStability1"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - switch (meta) { - case 0: - return stability1; - default: - return this.blockIcon; - } + this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:GlyphStability1"); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java index 8d8ecdeb..5c3e57f2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java @@ -61,14 +61,11 @@ public class BlockTeleposer extends BlockContainer { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - switch (side) { - case 0: - return bottomIcon; - case 1: - return topIcon; - default: - return sideIcon2; - } + return switch (side) { + case 0 -> bottomIcon; + case 1 -> topIcon; + default -> sideIcon2; + }; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockWritingTable.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockWritingTable.java index 47d4b9c4..89f62745 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockWritingTable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockWritingTable.java @@ -15,7 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; @@ -25,15 +24,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockWritingTable extends BlockContainer { - @SideOnly(Side.CLIENT) - private IIcon topIcon; - - @SideOnly(Side.CLIENT) - private IIcon sideIcon2; - - @SideOnly(Side.CLIENT) - private IIcon bottomIcon; - public BlockWritingTable() { super(Material.wood); setHardness(2.0F); @@ -45,22 +35,7 @@ public class BlockWritingTable extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:AlchemicChemistrySet"); - this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType2"); - this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_Bottom"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - switch (side) { - case 0: - return bottomIcon; - case 1: - return topIcon; - default: - return sideIcon2; - } + this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:AlchemicChemistrySet"); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BloodRune.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BloodRune.java index 255c94d1..f2db6743 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BloodRune.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BloodRune.java @@ -105,31 +105,15 @@ public class BloodRune extends Block { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - switch (meta) { - case 0: - return blockIcon; - - case 1: - return altarCapacityRuneIcon; - - case 2: - return dislocationRuneIcon; - - case 3: - return this.orbCapacityRuneIcon; - - case 4: - return this.betterCapacityRuneIcon; - - case 5: - return this.accelerationRuneIcon; - - case 6: - return this.quicknessRuneIcon; - - default: - return blockIcon; - } + return switch (meta) { + case 1 -> altarCapacityRuneIcon; + case 2 -> dislocationRuneIcon; + case 3 -> this.orbCapacityRuneIcon; + case 4 -> this.betterCapacityRuneIcon; + case 5 -> this.accelerationRuneIcon; + case 6 -> this.quicknessRuneIcon; + default -> blockIcon; + }; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java index 6af1c15f..f33b31f8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java @@ -71,15 +71,11 @@ public class EnergyBlast extends EnergyItems { @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { if (IBindable.isActive(stack)) { - switch (this.tier) { - case 1: - return this.activeIcon; - case 2: - return this.activeIconTier2; - case 3: - return this.activeIconTier3; - } - return this.activeIcon; + return switch (this.tier) { + case 2 -> this.activeIconTier2; + case 3 -> this.activeIconTier3; + default -> this.activeIcon; + }; } else { return this.passiveIcon; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemAttunedCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemAttunedCrystal.java index 5890a466..05bec574 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemAttunedCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemAttunedCrystal.java @@ -124,13 +124,11 @@ public class ItemAttunedCrystal extends Item implements IReagentManipulator { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass) { - switch (pass) { - case 0: - return this.crystalBody; - case 1: - return this.crystalLabel; - } - return this.itemIcon; + return switch (pass) { + case 0 -> this.crystalBody; + case 1 -> this.crystalLabel; + default -> this.itemIcon; + }; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemTankSegmenter.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemTankSegmenter.java index 47b58cc6..88c81296 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemTankSegmenter.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/energy/ItemTankSegmenter.java @@ -104,13 +104,11 @@ public class ItemTankSegmenter extends Item implements IReagentManipulator { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int pass) { - switch (pass) { - case 0: - return this.crystalBody; - case 1: - return this.crystalLabel; - } - return this.itemIcon; + return switch (pass) { + case 0 -> this.crystalBody; + case 1 -> this.crystalLabel; + default -> this.itemIcon; + }; } @Override