From a5bec6c22bf99042f5dc14d3696fb0836223de23 Mon Sep 17 00:00:00 2001 From: Lyfts <127234178+Lyfts@users.noreply.github.com> Date: Wed, 15 May 2024 12:50:14 +0200 Subject: [PATCH] cleanup after enabling modern & generic. Primarily changing raw lists to their correct type, changing to pattern variable & enhanced switch and removing unused/unreachable code + ancient comments. --- src/main/java/tconstruct/TConstruct.java | 7 +- .../tconstruct/armor/blocks/DryingRack.java | 2 +- src/main/java/tconstruct/blocks/SlabBase.java | 6 +- .../tconstruct/blocks/TConstructBlock.java | 2 +- .../tconstruct/blocks/slime/SlimeFluid.java | 3 +- .../tconstruct/blocks/slime/SlimeGel.java | 2 +- .../tconstruct/blocks/slime/SlimeGrass.java | 2 +- .../tconstruct/blocks/slime/SlimeLeaves.java | 2 +- .../tconstruct/blocks/slime/SlimeSapling.java | 2 +- .../blocks/slime/SlimeTallGrass.java | 2 +- .../tconstruct/blocks/traps/Landmine.java | 2 +- .../library/tools/AbilityHelper.java | 8 +- .../util/BehaviorProjectileBaseDispense.java | 3 +- .../mechworks/blocks/BlockLandmine.java | 80 ++++-------- .../smeltery/SmelteryDamageSource.java | 22 ++-- .../smeltery/blocks/CastingChannelBlock.java | 2 +- .../blocks/GlassBlockConnectedMeta.java | 2 +- .../smeltery/blocks/GlassPaneConnected.java | 2 +- .../smeltery/blocks/LavaTankBlock.java | 2 +- .../tconstruct/smeltery/blocks/MetalOre.java | 2 +- .../tconstruct/smeltery/blocks/PaneBase.java | 2 +- .../smeltery/blocks/SearedBlock.java | 43 +++---- .../smeltery/blocks/SearedSlab.java | 2 +- .../smeltery/blocks/SmelteryBlock.java | 2 +- .../smeltery/blocks/SpeedBlock.java | 2 +- .../tconstruct/smeltery/blocks/SpeedSlab.java | 2 +- .../tools/blocks/BattlesignBlock.java | 24 ++-- .../tconstruct/tools/blocks/CraftingSlab.java | 79 +++++------- .../tools/blocks/CraftingStationBlock.java | 2 +- .../tconstruct/tools/blocks/EquipBlock.java | 28 ++--- .../tconstruct/tools/blocks/MultiBrick.java | 110 ++++++----------- .../tools/blocks/MultiBrickFancy.java | 114 ++++++------------ .../tools/blocks/ToolForgeBlock.java | 21 ++-- .../tools/blocks/ToolStationBlock.java | 37 ++---- .../java/tconstruct/tools/gui/ChestSlot.java | 6 +- .../tools/gui/CraftingStationGui.java | 16 +-- .../tools/gui/ToolStationGuiHelper.java | 9 +- .../tools/inventory/FrypanContainer.java | 3 +- .../tools/inventory/FurnaceContainer.java | 3 +- .../tools/itemblocks/MultiBrickFancyItem.java | 2 +- .../tools/itemblocks/MultiBrickItem.java | 2 +- .../tools/items/CreativeModifier.java | 2 +- .../java/tconstruct/tools/items/Manual.java | 21 ++-- .../tconstruct/tools/items/MaterialItem.java | 2 +- .../java/tconstruct/tools/items/Pattern.java | 2 +- .../tconstruct/tools/items/TitleIcon.java | 4 +- .../tools/logic/CraftingStationLogic.java | 12 +- .../tconstruct/util/CraftingRecipeHelper.java | 8 +- .../tconstruct/world/blocks/GravelOre.java | 2 +- .../world/blocks/SlimeExplosive.java | 5 +- .../tconstruct/world/blocks/SoilSlab.java | 18 ++- .../tconstruct/world/entity/CartEntity.java | 22 ++-- 52 files changed, 273 insertions(+), 489 deletions(-) diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 25cad19c..31f41539 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -219,10 +219,6 @@ public class TConstruct { @EventHandler public void init(FMLInitializationEvent event) { packetPipeline.initalise(); - // if (event.getSide() == Side.CLIENT) { - // MinecraftForge.EVENT_BUS.register(new EventCloakRender()); - // } - DimensionBlacklist.getBadBimensions(); GameRegistry.registerWorldGenerator(new SlimeIslandGen(TinkerWorld.slimePool, 2), 2); @@ -291,8 +287,7 @@ public class TConstruct { @SubscribeEvent public void onEntitySpawn(EntityJoinWorldEvent event) { - if (event.entity instanceof EntityItem) { - EntityItem ourGuy = (EntityItem) event.entity; + if (event.entity instanceof EntityItem ourGuy) { if (ourGuy.lifespan == 6000) { ourGuy.lifespan = PHConstruct.globalDespawn; } diff --git a/src/main/java/tconstruct/armor/blocks/DryingRack.java b/src/main/java/tconstruct/armor/blocks/DryingRack.java index 2fe714af..8e7d5097 100644 --- a/src/main/java/tconstruct/armor/blocks/DryingRack.java +++ b/src/main/java/tconstruct/armor/blocks/DryingRack.java @@ -182,7 +182,7 @@ public class DryingRack extends InventoryBlock { } @Override - public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aabb, List list, + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) { this.setBlockBoundsBasedOnState(world, x, y, z); super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity); diff --git a/src/main/java/tconstruct/blocks/SlabBase.java b/src/main/java/tconstruct/blocks/SlabBase.java index ee4524f7..62a6b399 100644 --- a/src/main/java/tconstruct/blocks/SlabBase.java +++ b/src/main/java/tconstruct/blocks/SlabBase.java @@ -39,8 +39,8 @@ public class SlabBase extends MantleBlock { } @Override - public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, - Entity entity) { + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB axisalignedbb, + List arraylist, Entity entity) { setBlockBoundsBasedOnState(world, x, y, z); super.addCollisionBoxesToList(world, x, y, z, axisalignedbb, arraylist, entity); } @@ -84,7 +84,7 @@ public class SlabBase extends MantleBlock { } @Override - public void getSubBlocks(Item id, CreativeTabs tab, List list) { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { for (int iter = 0; iter < totalSize; iter++) { list.add(new ItemStack(id, 1, iter)); } diff --git a/src/main/java/tconstruct/blocks/TConstructBlock.java b/src/main/java/tconstruct/blocks/TConstructBlock.java index f7e3e8df..93c2a988 100644 --- a/src/main/java/tconstruct/blocks/TConstructBlock.java +++ b/src/main/java/tconstruct/blocks/TConstructBlock.java @@ -57,7 +57,7 @@ public class TConstructBlock extends MantleBlock { // TODO getSubBlocks @Override - public void getSubBlocks(Item block, CreativeTabs tab, List list) { + public void getSubBlocks(Item block, CreativeTabs tab, List list) { for (int iter = 0; iter < icons.length; iter++) { list.add(new ItemStack(block, 1, iter)); } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java index a2996bcd..032896ca 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java @@ -6,6 +6,7 @@ import java.util.Random; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -58,5 +59,5 @@ public class SlimeFluid extends BlockFluidClassic { } } - public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) {} + public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) {} } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGel.java b/src/main/java/tconstruct/blocks/slime/SlimeGel.java index 4d129fbc..34b22d08 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGel.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGel.java @@ -70,7 +70,7 @@ public class SlimeGel extends TConstructBlock { /** * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks) */ - public void getSubBlocks(Block b, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Block b, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(b, 1, 0)); par3List.add(new ItemStack(b, 1, 1)); // par3List.add(new ItemStack(par1, 1, 2)); diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index d384130c..ec8f111b 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -72,7 +72,7 @@ public class SlimeGrass extends MantleBlock { } @Override - public void getSubBlocks(Item b, CreativeTabs tab, List list) { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 1; iter++) { list.add(new ItemStack(b, 1, iter)); } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java index 3a45bcec..e1f53993 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java @@ -76,7 +76,7 @@ public class SlimeLeaves extends BlockLeaves { } @Override - public void getSubBlocks(Item id, CreativeTabs tab, List list) { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { for (int iter = 0; iter < leaves[0].length; iter++) { list.add(new ItemStack(id, 1, iter)); } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index 3602bdea..7cf7ba00 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -105,7 +105,7 @@ public class SlimeSapling extends BlockSapling { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for (int i = 0; i < 1; i++) par3List.add(new ItemStack(par1, 1, i)); } } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java index a73458fc..5f88fa77 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java @@ -72,7 +72,7 @@ public class SlimeTallGrass extends BlockBush implements IShearable { /** * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks) */ - public void getSubBlocks(Block b, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Block b, CreativeTabs par2CreativeTabs, List par3List) { for (int j = 0; j < 1; ++j) { par3List.add(new ItemStack(b, 1, j)); } diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java index 9a787b09..370b2bd4 100644 --- a/src/main/java/tconstruct/blocks/traps/Landmine.java +++ b/src/main/java/tconstruct/blocks/traps/Landmine.java @@ -147,7 +147,7 @@ public class Landmine extends MantleBlock { boolean var5 = world.getBlockMetadata(posX, posY, posZ) == 1; boolean var6 = false; float var7 = 0.125F; - List var8 = null; + List var8 = null; if (this.triggerMobType == EnumCreatureType.creature) { var8 = world.getEntitiesWithinAABBExcludingEntity( diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index 537a6933..31b65d99 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -306,8 +306,7 @@ public class AbilityHelper { static void alertPlayerWolves(EntityPlayer player, EntityLivingBase living, boolean par2) { if (!(living instanceof EntityCreeper) && !(living instanceof EntityGhast)) { - if (living instanceof EntityWolf) { - EntityWolf var3 = (EntityWolf) living; + if (living instanceof EntityWolf var3) { if (var3.isTamed() && player.getDisplayName().equals(var3.func_152113_b())) { return; @@ -381,18 +380,13 @@ public class AbilityHelper { int maxDamage = tags.getCompoundTag("InfiTool").getInteger("TotalDurability"); if (damageTrue <= 0) { tags.getCompoundTag("InfiTool").setInteger("Damage", 0); - // stack.setItemDamage(0); tags.getCompoundTag("InfiTool").setBoolean("Broken", false); } else if (damageTrue > maxDamage) { breakTool(stack, tags, entity); - // stack.setItemDamage(0); } else { tags.getCompoundTag("InfiTool").setInteger("Damage", damage + dam); int toolDamage = (damage * 100 / maxDamage) + 1; int stackDamage = stack.getItemDamage(); - // if (toolDamage != stackDamage) { - // // stack.setItemDamage((damage * 100 / maxDamage) + 1); - // } } } } diff --git a/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java b/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java index 16002321..63f4ea4e 100644 --- a/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java +++ b/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java @@ -24,8 +24,7 @@ public abstract class BehaviorProjectileBaseDispense extends BehaviorDefaultDisp ItemStack reference; - if (stack.getItem() instanceof IAmmo) { - IAmmo ammo = (IAmmo) stack.getItem(); + if (stack.getItem() instanceof IAmmo ammo) { // needs ammo to shoot if (ammo.getAmmoCount(stack) <= 0) return stack; ammo.consumeAmmo(1, stack); diff --git a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java index bbb1fb69..652689f2 100644 --- a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java @@ -183,7 +183,7 @@ public class BlockLandmine extends BlockContainer { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(par1, 1, 0)); par3List.add(new ItemStack(par1, 1, 1)); par3List.add(new ItemStack(par1, 1, 2)); @@ -279,22 +279,15 @@ public class BlockLandmine extends BlockContainer { } public static int invertMetadata(int par0) { - switch (par0) { - case 0: - return 0; - case 1: - return 5; - case 2: - return 4; - case 3: - return 3; - case 4: - return 2; - case 5: - return 1; - default: - return -1; - } + return switch (par0) { + case 0 -> 0; + case 1 -> 5; + case 2 -> 4; + case 3 -> 3; + case 4 -> 2; + case 5 -> 1; + default -> -1; + }; } @Override @@ -407,30 +400,19 @@ public class BlockLandmine extends BlockContainer { TileEntity tileEntity = par1World.getTileEntity(par2, par3, par4); // Change to return 1 if you want the landmine to blow up when the block // holding it is broken - if (!(tileEntity instanceof TileEntityLandmine)) { + if (!(tileEntity instanceof TileEntityLandmine te)) { return 0; } - TileEntityLandmine te = (TileEntityLandmine) tileEntity; - Sensitivity triggerType; - - switch (te.triggerType) { - case 0: - triggerType = Sensitivity.everything; - break; - case 1: - triggerType = Sensitivity.mobs; - break; - case 2: - triggerType = Sensitivity.players; - break; - default: - triggerType = null; - break; - } + Sensitivity triggerType = switch (te.triggerType) { + case 0 -> Sensitivity.everything; + case 1 -> Sensitivity.mobs; + case 2 -> Sensitivity.players; + default -> null; + }; if (triggerType != null) { - List list = null; + List list = null; if (triggerType == Sensitivity.everything) { list = par1World @@ -461,10 +443,6 @@ public class BlockLandmine extends BlockContainer { protected AxisAlignedBB getSensitiveAABB(World par1World, int par2, int par3, int par4) { float f = 0.125F; - // return AxisAlignedBB.getBoundingBox((double)((float)par1 + f), - // (double)par2, (double)((float)par3 + f), (double)((float)(par1 + 1) - - // f), (double)par2 + 0.25D, (double)((float)(par3 + 1) - f)); - int l = par1World.getBlockMetadata(par2, par3, par4); int i1 = l & 7; boolean flag = (l & 8) > 0; @@ -502,23 +480,15 @@ public class BlockLandmine extends BlockContainer { if (te == null) { return null; } - switch (te.triggerType) { - case 0: - triggerType = Sensitivity.everything; - break; - case 1: - triggerType = Sensitivity.mobs; - break; - case 2: - triggerType = Sensitivity.players; - break; - default: - triggerType = null; - break; - } + triggerType = switch (te.triggerType) { + case 0 -> Sensitivity.everything; + case 1 -> Sensitivity.mobs; + case 2 -> Sensitivity.players; + default -> null; + }; if (triggerType != null) { - List list = null; + List list = null; if (triggerType == Sensitivity.everything) { list = par1World.getEntitiesWithinAABBExcludingEntity( diff --git a/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java b/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java index c2285959..c6b05c0c 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java +++ b/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java @@ -16,21 +16,13 @@ public class SmelteryDamageSource extends DamageSource { @Override public IChatComponent func_151519_b(EntityLivingBase par1EntityLiving) { - String type = ""; - switch (AbilityHelper.random.nextInt(4)) { - case 0: - type = "one."; - break; - case 1: - type = "two."; - break; - case 2: - type = "three."; - break; - case 3: - type = "four."; - break; - } + String type = switch (AbilityHelper.random.nextInt(4)) { + case 0 -> "one."; + case 1 -> "two."; + case 2 -> "three."; + case 3 -> "four."; + default -> ""; + }; EntityLivingBase entityliving1 = par1EntityLiving.func_94060_bK(); String s = "death." + type + this.damageType; String s1 = s + ".player"; diff --git a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java index 6cdec530..8b3c0a10 100644 --- a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java @@ -103,7 +103,7 @@ public class CastingChannelBlock extends BlockContainer { } @Override - public void getSubBlocks(Item id, CreativeTabs tab, List list) { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { list.add(new ItemStack(id, 1, 0)); list.add(new ItemStack(id, 1, 1)); } diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java index 6366e78a..8684ea4c 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java @@ -56,7 +56,7 @@ public class GlassBlockConnectedMeta extends GlassBlockConnected { } @Override - public void getSubBlocks(Item b, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item b, CreativeTabs par2CreativeTabs, List par3List) { for (int i = 0; i < textures.length; i++) { par3List.add(new ItemStack(b, 1, i)); } diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java index d90ea062..119d9d1e 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java @@ -502,7 +502,7 @@ public class GlassPaneConnected extends GlassBlockConnected { @Override public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, - List par6List, Entity par7Entity) { + List par6List, Entity par7Entity) { boolean flag = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.NORTH); boolean flag1 = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.SOUTH); boolean flag2 = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.WEST); diff --git a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java index e5de5c3b..86602bc7 100644 --- a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java @@ -231,7 +231,7 @@ public class LavaTankBlock extends BlockContainer { } @Override - public void getSubBlocks(Item id, CreativeTabs tab, List list) { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { for (int iter = 0; iter < 3; iter++) { list.add(new ItemStack(id, 1, iter)); } diff --git a/src/main/java/tconstruct/smeltery/blocks/MetalOre.java b/src/main/java/tconstruct/smeltery/blocks/MetalOre.java index e13fdf9f..a3df8f0f 100644 --- a/src/main/java/tconstruct/smeltery/blocks/MetalOre.java +++ b/src/main/java/tconstruct/smeltery/blocks/MetalOre.java @@ -25,7 +25,7 @@ public class MetalOre extends TConstructBlock { } @Override - public void getSubBlocks(Item b, CreativeTabs tab, List list) { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { for (int iter = 1; iter < 6; iter++) { list.add(new ItemStack(b, 1, iter)); } diff --git a/src/main/java/tconstruct/smeltery/blocks/PaneBase.java b/src/main/java/tconstruct/smeltery/blocks/PaneBase.java index 9293bdcb..47a676e9 100644 --- a/src/main/java/tconstruct/smeltery/blocks/PaneBase.java +++ b/src/main/java/tconstruct/smeltery/blocks/PaneBase.java @@ -58,7 +58,7 @@ public class PaneBase extends BlockStainedGlassPane { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item b, CreativeTabs tab, List list) { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < textureNames.length; iter++) { list.add(new ItemStack(b, 1, iter)); } diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java index de1ec22d..8f1e8e56 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java @@ -42,16 +42,12 @@ public class SearedBlock extends InventoryBlock { @Override public TileEntity createTileEntity(World world, int metadata) { - switch (metadata) { - case 0: - return new CastingTableLogic(); - case 1: - return new FaucetLogic(); - case 2: - return new CastingBasinLogic(); - default: - return null; - } + return switch (metadata) { + case 0 -> new CastingTableLogic(); + case 1 -> new FaucetLogic(); + case 2 -> new CastingBasinLogic(); + default -> null; + }; } @Override @@ -155,7 +151,7 @@ public class SearedBlock extends InventoryBlock { } @Override - public void getSubBlocks(Item id, CreativeTabs tab, List list) { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { for (int iter = 0; iter < 3; iter++) { list.add(new ItemStack(id, 1, iter)); } @@ -173,8 +169,7 @@ public class SearedBlock extends InventoryBlock { float zMin = 0.25F; float zMax = 0.75F; - if (te instanceof FaucetLogic) { - FaucetLogic logic = (FaucetLogic) te; + if (te instanceof FaucetLogic logic) { switch (logic.getRenderDirection()) { case 2: zMin = 0.625F; @@ -206,8 +201,7 @@ public class SearedBlock extends InventoryBlock { return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); } else { TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof FaucetLogic) { - FaucetLogic logic = (FaucetLogic) tile; + if (tile instanceof FaucetLogic logic) { float xMin = 0.25F; float xMax = 0.75F; float zMin = 0.25F; @@ -256,8 +250,7 @@ public class SearedBlock extends InventoryBlock { if (world.getBlockMetadata(x, y, z) == 1) { boolean isPowered = world.isBlockIndirectlyGettingPowered(x, y, z); TileEntity te = world.getTileEntity(x, y, z); - if (!(te instanceof FaucetLogic)) return; - FaucetLogic logic = (FaucetLogic) te; + if (!(te instanceof FaucetLogic logic)) return; // was it a low->high pulse if (!logic.hasRedstonePower && isPowered) { logic.hasRedstonePower = true; @@ -271,15 +264,11 @@ public class SearedBlock extends InventoryBlock { @Override public TileEntity createNewTileEntity(World world, int metadata) { - switch (metadata) { - case 0: - return new CastingTableLogic(); - case 1: - return new FaucetLogic(); - case 2: - return new CastingBasinLogic(); - default: - return null; - } + return switch (metadata) { + case 0 -> new CastingTableLogic(); + case 1 -> new FaucetLogic(); + case 2 -> new CastingBasinLogic(); + default -> null; + }; } } diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java b/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java index 41ae0756..b8222b6a 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java @@ -38,7 +38,7 @@ public class SearedSlab extends SlabBase { } @Override - public void getSubBlocks(Item id, CreativeTabs tab, List list) { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { for (int iter = 0; iter < 8; iter++) { list.add(new ItemStack(id, 1, iter)); } diff --git a/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java index 6a00af1d..71fc5054 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java @@ -223,7 +223,7 @@ public class SmelteryBlock extends InventoryBlock { */ @Override - public void getSubBlocks(Item id, CreativeTabs tab, List list) { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { for (int iter = 0; iter < 12; iter++) { if (iter != 3) list.add(new ItemStack(id, 1, iter)); } diff --git a/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java index e8c708f1..d6a4899c 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java @@ -47,7 +47,7 @@ public class SpeedBlock extends TConstructBlock { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item b, CreativeTabs tab, List list) { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < textureNames.length; iter++) { list.add(new ItemStack(b, 1, iter)); } diff --git a/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java b/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java index 76151fc7..4938d66c 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java +++ b/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java @@ -37,7 +37,7 @@ public class SpeedSlab extends SlabBase { } @Override - public void getSubBlocks(Item b, CreativeTabs tab, List list) { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 7; iter++) { list.add(new ItemStack(b, 1, iter)); } diff --git a/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java b/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java index 28360b18..c62c5d8c 100644 --- a/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java +++ b/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java @@ -54,22 +54,14 @@ public class BattlesignBlock extends EquipBlock { super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack); int i3 = MathHelper.floor_double((par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - int newMeta = 0; + int newMeta = switch (i3) { + case 3 -> 0; + case 0 -> 3; + case 1 -> 1; + case 2 -> 2; + default -> 0; + }; - switch (i3) { - case 3: - newMeta = 0; - break; - case 0: - newMeta = 3; - break; - case 1: - newMeta = 1; - break; - case 2: - newMeta = 2; - break; - } par1World.setBlockMetadataWithNotify(par2, par3, par4, newMeta, 2); } @@ -92,7 +84,7 @@ public class BattlesignBlock extends EquipBlock { } @Override - public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aabb, List list, + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) { setBlockBoundsBasedOnState(world, x, y, z); diff --git a/src/main/java/tconstruct/tools/blocks/CraftingSlab.java b/src/main/java/tconstruct/tools/blocks/CraftingSlab.java index ac08655b..fa3d1d6c 100644 --- a/src/main/java/tconstruct/tools/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/tools/blocks/CraftingSlab.java @@ -89,43 +89,30 @@ public class CraftingSlab extends InventorySlab { @Override public TileEntity createTileEntity(World world, int metadata) { - switch (metadata % 8) { - case 0: - return new CraftingStationLogic(); - case 1: - return new ToolStationLogic(); - case 2: - return new PartBuilderLogic(); - case 3: - return new StencilTableLogic(); - case 4: - return new PatternChestLogic(); - case 5: - return new ToolForgeLogic(); - default: - return null; - } + return switch (metadata % 8) { + case 0 -> new CraftingStationLogic(); + case 1 -> new ToolStationLogic(); + case 2 -> new PartBuilderLogic(); + case 3 -> new StencilTableLogic(); + case 4 -> new PatternChestLogic(); + case 5 -> new ToolForgeLogic(); + default -> null; + }; } @Override public Integer getGui(World world, int x, int y, int z, EntityPlayer entityplayer) { int meta = world.getBlockMetadata(x, y, z) % 8; - switch (meta) { - case 0: - return ToolProxyCommon.craftingStationID; - case 1: - return ToolProxyCommon.toolStationID; - case 2: - return ToolProxyCommon.partBuilderID; - case 3: - return ToolProxyCommon.stencilTableID; - case 4: - return ToolProxyCommon.patternChestID; - case 5: - return ToolProxyCommon.toolForgeID; - } + return switch (meta) { + case 0 -> ToolProxyCommon.craftingStationID; + case 1 -> ToolProxyCommon.toolStationID; + case 2 -> ToolProxyCommon.partBuilderID; + case 3 -> ToolProxyCommon.stencilTableID; + case 4 -> ToolProxyCommon.patternChestID; + case 5 -> ToolProxyCommon.toolForgeID; + default -> -1; + }; - return -1; } @Override @@ -134,7 +121,7 @@ public class CraftingSlab extends InventorySlab { } @Override - public void getSubBlocks(Item b, CreativeTabs tab, List list) { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 6; iter++) { list.add(new ItemStack(b, 1, iter)); } @@ -146,8 +133,7 @@ public class CraftingSlab extends InventorySlab { if (stack.hasTagCompound()) { NBTTagCompound inventory = stack.getTagCompound().getCompoundTag("Inventory"); TileEntity te = world.getTileEntity(x, y, z); - if (inventory != null && te instanceof PatternChestLogic) { - PatternChestLogic logic = (PatternChestLogic) te; + if (inventory != null && te instanceof PatternChestLogic logic) { logic.readInventoryFromNBT(inventory); logic.xCoord = x; logic.yCoord = y; @@ -170,22 +156,15 @@ public class CraftingSlab extends InventorySlab { @Override public TileEntity createNewTileEntity(World var1, int metadata) { - switch (metadata % 8) { - case 0: - return new CraftingStationLogic(); - case 1: - return new ToolStationLogic(); - case 2: - return new PartBuilderLogic(); - case 3: - return new StencilTableLogic(); - case 4: - return new PatternChestLogic(); - case 5: - return new ToolForgeLogic(); - default: - return null; - } + return switch (metadata % 8) { + case 0 -> new CraftingStationLogic(); + case 1 -> new ToolStationLogic(); + case 2 -> new PartBuilderLogic(); + case 3 -> new StencilTableLogic(); + case 4 -> new PatternChestLogic(); + case 5 -> new ToolForgeLogic(); + default -> null; + }; } /* Keep pattern chest inventory */ diff --git a/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java index 9278dd38..478ba5de 100644 --- a/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java @@ -88,7 +88,7 @@ public class CraftingStationBlock extends InventoryBlock { } @Override - public void getSubBlocks(Item id, CreativeTabs tab, List list) { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { for (int iter = 0; iter < 1; iter++) { list.add(new ItemStack(id, 1, iter)); } diff --git a/src/main/java/tconstruct/tools/blocks/EquipBlock.java b/src/main/java/tconstruct/tools/blocks/EquipBlock.java index d6603d7b..024184ae 100644 --- a/src/main/java/tconstruct/tools/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/tools/blocks/EquipBlock.java @@ -103,22 +103,14 @@ public class EquipBlock extends InventoryBlock { super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack); int i3 = MathHelper.floor_double((par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - int newMeta = 0; + int newMeta = switch (i3) { + case 3 -> 0; + case 0 -> 3; + case 1 -> 1; + case 2 -> 2; + default -> 0; + }; - switch (i3) { - case 3: - newMeta = 0; - break; - case 0: - newMeta = 3; - break; - case 1: - newMeta = 1; - break; - case 2: - newMeta = 2; - break; - } par1World.setBlockMetadataWithNotify(par2, par3, par4, newMeta, 2); } @@ -126,8 +118,7 @@ public class EquipBlock extends InventoryBlock { public void breakBlock(World par1World, int x, int y, int z, Block par5, int meta) { TileEntity te = par1World.getTileEntity(x, y, z); - if (te instanceof EquipLogic) { - EquipLogic logic = (EquipLogic) te; + if (te instanceof EquipLogic logic) { for (int iter = 0; iter < logic.getSizeInventory(); ++iter) { ItemStack stack = iter == 0 ? logic.getEquipmentItem() : logic.getStackInSlot(iter); @@ -188,8 +179,7 @@ public class EquipBlock extends InventoryBlock { public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z) { TileEntity te = blockAccess.getTileEntity(x, y, z); - if (te instanceof EquipLogic) { - EquipLogic logic = (EquipLogic) te; + if (te instanceof EquipLogic logic) { ItemStack stack = logic.getEquipmentItem(); if (stack != null && stack.hasTagCompound() && stack.getTagCompound().hasKey("InfiTool")) { NBTTagCompound tag = stack.getTagCompound().getCompoundTag("InfiTool"); diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrick.java b/src/main/java/tconstruct/tools/blocks/MultiBrick.java index fe209711..7dba7204 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrick.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrick.java @@ -26,82 +26,52 @@ public class MultiBrick extends TConstructBlock { @Override public float getBlockHardness(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - switch (meta) { - case 0: - case 13: - return Blocks.obsidian.getBlockHardness(world, x, y, z); - case 1: - return Blocks.sandstone.getBlockHardness(world, x, y, z); - case 2: - return Blocks.netherrack.getBlockHardness(world, x, y, z); - case 3: - return Blocks.stone.getBlockHardness(world, x, y, z); - case 4: - return Blocks.iron_block.getBlockHardness(world, x, y, z); - case 5: - return Blocks.gold_block.getBlockHardness(world, x, y, z); - case 6: - return Blocks.lapis_block.getBlockHardness(world, x, y, z); - case 7: - return Blocks.diamond_block.getBlockHardness(world, x, y, z); - case 8: - return Blocks.redstone_block.getBlockHardness(world, x, y, z); - case 9: - return 1.0F; - case 10: - case 11: - return 1.5F; - case 12: - return Blocks.end_stone.getBlockHardness(world, x, y, z); - default: - return blockHardness; - } + return switch (meta) { + case 0, 13 -> Blocks.obsidian.getBlockHardness(world, x, y, z); + case 1 -> Blocks.sandstone.getBlockHardness(world, x, y, z); + case 2 -> Blocks.netherrack.getBlockHardness(world, x, y, z); + case 3 -> Blocks.stone.getBlockHardness(world, x, y, z); + case 4 -> Blocks.iron_block.getBlockHardness(world, x, y, z); + case 5 -> Blocks.gold_block.getBlockHardness(world, x, y, z); + case 6 -> Blocks.lapis_block.getBlockHardness(world, x, y, z); + case 7 -> Blocks.diamond_block.getBlockHardness(world, x, y, z); + case 8 -> Blocks.redstone_block.getBlockHardness(world, x, y, z); + case 9 -> 1.0F; + case 10, 11 -> 1.5F; + case 12 -> Blocks.end_stone.getBlockHardness(world, x, y, z); + default -> blockHardness; + }; } @Override public float getExplosionResistance(Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { int meta = world.getBlockMetadata(x, y, z); - switch (meta) { - case 0: - case 13: - return Blocks.obsidian - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 1: - return Blocks.sandstone - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 2: - return Blocks.netherrack - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 3: - return Blocks.stone - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 4: - return Blocks.iron_block - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 5: - return Blocks.gold_block - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 6: - return Blocks.lapis_block - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 7: - return Blocks.diamond_block - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 8: - return Blocks.redstone_block - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 9: - return 1.0F; - case 10: - case 11: - return 1.5F; - case 12: - return Blocks.end_stone - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - default: - return getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - } + return switch (meta) { + case 0, 13 -> Blocks.obsidian + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 1 -> Blocks.sandstone + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 2 -> Blocks.netherrack + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 3 -> Blocks.stone + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 4 -> Blocks.iron_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 5 -> Blocks.gold_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 6 -> Blocks.lapis_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 7 -> Blocks.diamond_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 8 -> Blocks.redstone_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 9 -> 1.0F; + case 10, 11 -> 1.5F; + case 12 -> Blocks.end_stone + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + default -> getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + }; } @Override diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java index 6098ebbb..5f1f19ed 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java @@ -28,86 +28,52 @@ public class MultiBrickFancy extends TConstructBlock { @Override public float getBlockHardness(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - switch (meta) { - case 0: - case 13: - return Blocks.obsidian.getBlockHardness(world, x, y, z); - case 1: - return Blocks.sandstone.getBlockHardness(world, x, y, z); - case 2: - return Blocks.netherrack.getBlockHardness(world, x, y, z); - case 4: - return Blocks.iron_block.getBlockHardness(world, x, y, z); - case 5: - return Blocks.gold_block.getBlockHardness(world, x, y, z); - case 6: - return Blocks.lapis_block.getBlockHardness(world, x, y, z); - case 7: - return Blocks.diamond_block.getBlockHardness(world, x, y, z); - case 8: - return Blocks.redstone_block.getBlockHardness(world, x, y, z); - case 9: - return 1.0F; - case 10: - case 11: - return 1.5F; - case 12: - return Blocks.end_stone.getBlockHardness(world, x, y, z); - case 3: - case 14: - case 15: - return Blocks.stone.getBlockHardness(world, x, y, z); - default: - return blockHardness; - } + return switch (meta) { + case 0, 13 -> Blocks.obsidian.getBlockHardness(world, x, y, z); + case 1 -> Blocks.sandstone.getBlockHardness(world, x, y, z); + case 2 -> Blocks.netherrack.getBlockHardness(world, x, y, z); + case 4 -> Blocks.iron_block.getBlockHardness(world, x, y, z); + case 5 -> Blocks.gold_block.getBlockHardness(world, x, y, z); + case 6 -> Blocks.lapis_block.getBlockHardness(world, x, y, z); + case 7 -> Blocks.diamond_block.getBlockHardness(world, x, y, z); + case 8 -> Blocks.redstone_block.getBlockHardness(world, x, y, z); + case 9 -> 1.0F; + case 10, 11 -> 1.5F; + case 12 -> Blocks.end_stone.getBlockHardness(world, x, y, z); + case 3, 14, 15 -> Blocks.stone.getBlockHardness(world, x, y, z); + default -> blockHardness; + }; } @Override public float getExplosionResistance(Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { int meta = world.getBlockMetadata(x, y, z); - switch (meta) { - case 0: - case 13: - return Blocks.obsidian - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 1: - return Blocks.sandstone - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 2: - return Blocks.netherrack - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 4: - return Blocks.iron_block - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 5: - return Blocks.gold_block - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 6: - return Blocks.lapis_block - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 7: - return Blocks.diamond_block - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 8: - return Blocks.redstone_block - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 9: - return 1.0F; - case 10: - case 11: - return 1.5F; - case 12: - return Blocks.end_stone - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - case 3: - case 14: - case 15: - return Blocks.stone - .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - default: - return getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); - } + return switch (meta) { + case 0, 13 -> Blocks.obsidian + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 1 -> Blocks.sandstone + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 2 -> Blocks.netherrack + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 4 -> Blocks.iron_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 5 -> Blocks.gold_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 6 -> Blocks.lapis_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 7 -> Blocks.diamond_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 8 -> Blocks.redstone_block + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 9 -> 1.0F; + case 10, 11 -> 1.5F; + case 12 -> Blocks.end_stone + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + case 3, 14, 15 -> Blocks.stone + .getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + default -> getExplosionResistance(entity, world, meta, meta, meta, explosionZ, explosionZ, explosionZ); + }; } // TODO onEntityCollidedWithBlock diff --git a/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java index a4423059..74f0705b 100644 --- a/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java +++ b/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java @@ -65,18 +65,13 @@ public class ToolForgeBlock extends InventoryBlock { return textureTop; } if (side == 0) { - switch (meta) { - case 0: - return Blocks.iron_block.getIcon(side, 0); - case 1: - return Blocks.gold_block.getIcon(side, 0); - case 2: - return Blocks.diamond_block.getIcon(side, 0); - case 3: - return Blocks.emerald_block.getIcon(side, 0); - default: - return TinkerWorld.metalBlock.getIcon(side, meta - 4); - } + return switch (meta) { + case 0 -> Blocks.iron_block.getIcon(side, 0); + case 1 -> Blocks.gold_block.getIcon(side, 0); + case 2 -> Blocks.diamond_block.getIcon(side, 0); + case 3 -> Blocks.emerald_block.getIcon(side, 0); + default -> TinkerWorld.metalBlock.getIcon(side, meta - 4); + }; } return this.icons[meta]; @@ -123,7 +118,7 @@ public class ToolForgeBlock extends InventoryBlock { } @Override - public void getSubBlocks(Item b, CreativeTabs tab, List list) { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < textureNames.length; iter++) { list.add(new ItemStack(b, 1, iter)); } diff --git a/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java b/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java index fd52b655..89321b3a 100644 --- a/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java @@ -121,31 +121,13 @@ public class ToolStationBlock extends InventoryBlock { @Override public TileEntity createNewTileEntity(World world, int metadata) { - switch (metadata) { - case 0: - return new ToolStationLogic(); - case 1: - case 3: - case 2: - case 4: - return new PartBuilderLogic(); - case 5: - case 9: - case 8: - case 7: - case 6: - return new PatternChestLogic(); - case 10: - case 13: - case 12: - case 11: - return new StencilTableLogic(); - /* - * case 14: return new CastingTableLogic(); - */ - default: - return null; - } + return switch (metadata) { + case 0 -> new ToolStationLogic(); + case 1, 3, 2, 4 -> new PartBuilderLogic(); + case 5, 9, 8, 7, 6 -> new PatternChestLogic(); + case 10, 13, 12, 11 -> new StencilTableLogic(); + default -> null; + }; } @Override @@ -165,7 +147,7 @@ public class ToolStationBlock extends InventoryBlock { } @Override - public void getSubBlocks(Item id, CreativeTabs tab, List list) { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { for (int iter = 0; iter < 6; iter++) { list.add(new ItemStack(id, 1, iter)); } @@ -241,8 +223,7 @@ public class ToolStationBlock extends InventoryBlock { if (stack.hasTagCompound()) { NBTTagCompound inventory = stack.getTagCompound().getCompoundTag("Inventory"); TileEntity te = world.getTileEntity(x, y, z); - if (inventory != null && te instanceof PatternChestLogic) { - PatternChestLogic logic = (PatternChestLogic) te; + if (inventory != null && te instanceof PatternChestLogic logic) { logic.readInventoryFromNBT(inventory); logic.xCoord = x; logic.yCoord = y; diff --git a/src/main/java/tconstruct/tools/gui/ChestSlot.java b/src/main/java/tconstruct/tools/gui/ChestSlot.java index 78788be9..fe63944a 100644 --- a/src/main/java/tconstruct/tools/gui/ChestSlot.java +++ b/src/main/java/tconstruct/tools/gui/ChestSlot.java @@ -44,8 +44,7 @@ public class ChestSlot extends Slot { @Override public boolean isItemValid(ItemStack itemStack) { - if (inventory instanceof ISidedInventory) { - ISidedInventory sided = (ISidedInventory) inventory; + if (inventory instanceof ISidedInventory sided) { return sided.canInsertItem(this.getSlotIndex(), itemStack, accessSide); } return inventory.isItemValidForSlot(this.getSlotIndex(), itemStack); @@ -53,8 +52,7 @@ public class ChestSlot extends Slot { @Override public boolean canTakeStack(EntityPlayer player) { - if (inventory instanceof ISidedInventory) { - ISidedInventory sided = (ISidedInventory) inventory; + if (inventory instanceof ISidedInventory sided) { return sided.canExtractItem(this.getSlotIndex(), this.getStack(), accessSide); } return super.canTakeStack(player); diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java index be6ac3c5..8a750ec1 100644 --- a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java @@ -126,9 +126,8 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { if (logic.chest != null) { - if (logic.chest.get() instanceof TileEntity) { - TileEntity te = (TileEntity) logic.chest.get(); - if (te == null || te.getWorldObj().getTileEntity(te.xCoord, te.yCoord, te.zCoord) == null + if (logic.chest.get() instanceof TileEntity te) { + if (te.getWorldObj().getTileEntity(te.xCoord, te.yCoord, te.zCoord) == null && te.getWorldObj().isRemote) { mc.thePlayer.closeScreen(); return; @@ -344,8 +343,8 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { } public boolean isMouseOverFullSlot(int mouseX, int mouseY) { - for (final Object slot : inventorySlots.inventorySlots) { - if (isMouseOverSlot((Slot) slot, mouseX, mouseY) && ((Slot) slot).getHasStack()) { + for (final Slot slot : inventorySlots.inventorySlots) { + if (isMouseOverSlot(slot, mouseX, mouseY) && slot.getHasStack()) { return true; } } @@ -365,8 +364,7 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { } public boolean shouldDrawSlot(Slot slot) { - if (!(slot instanceof ChestSlot)) return true; - ChestSlot chestSlot = (ChestSlot) slot; + if (!(slot instanceof ChestSlot chestSlot)) return true; // all visible if (!slider.isEnabled()) return true; @@ -481,9 +479,7 @@ public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { lastSlotId = Math.min(chestSlotCount, firstSlotId + getDisplayedRows() * logic.invColumns); for (Object o : inventorySlots.inventorySlots) { - if (!(o instanceof ChestSlot)) continue; - - final ChestSlot slot = (ChestSlot) o; + if (!(o instanceof ChestSlot slot)) continue; if (shouldDrawSlot(slot)) { slot.enable(); diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java b/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java index 97d8d99a..c978cef3 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGuiHelper.java @@ -70,8 +70,7 @@ public final class ToolStationGuiHelper { else if (item instanceof ToolCore || item instanceof ArmorCore) drawDurability(tags); // tools - if (item instanceof ToolCore) { - ToolCore tool = (ToolCore) item; + if (item instanceof ToolCore tool) { // DualHarvest tool? if (categories.contains("dualharvest")) drawDualHarvestStats(tool, tags); // or regular Harvest tool? @@ -88,13 +87,11 @@ public final class ToolStationGuiHelper { if (categories.contains("projectile")) drawProjectileStats(tags); } // armor - if (item instanceof ArmorCore) { - ArmorCore armor = (ArmorCore) item; + if (item instanceof ArmorCore armor) { drawArmorStats(armor, tags, stack); } // Accessory - if (item instanceof AccessoryCore) { - AccessoryCore accessory = (AccessoryCore) item; + if (item instanceof AccessoryCore accessory) { drawAccessoryStats(accessory, tags); } diff --git a/src/main/java/tconstruct/tools/inventory/FrypanContainer.java b/src/main/java/tconstruct/tools/inventory/FrypanContainer.java index c68a7145..f08ae9e2 100644 --- a/src/main/java/tconstruct/tools/inventory/FrypanContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FrypanContainer.java @@ -41,8 +41,7 @@ public class FrypanContainer extends Container { @Override public void detectAndSendChanges() { super.detectAndSendChanges(); - for (Object crafter : crafters) { - ICrafting icrafting = (ICrafting) crafter; + for (ICrafting icrafting : crafters) { if (progress != logic.progress) { icrafting.sendProgressBarUpdate(this, 0, logic.progress); } diff --git a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java index cb9b6f89..c4f5e910 100644 --- a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java @@ -54,8 +54,7 @@ public class FurnaceContainer extends Container { public void detectAndSendChanges() { super.detectAndSendChanges(); - for (Object crafter : this.crafters) { - ICrafting icrafting = (ICrafting) crafter; + for (ICrafting icrafting : this.crafters) { if (this.lastCookTime != this.furnace.progress) { icrafting.sendProgressBarUpdate(this, 0, this.furnace.progress); diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java index 3f75fd7a..e5f792b2 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java @@ -24,7 +24,7 @@ public class MultiBrickFancyItem extends MultiItemBlock { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { switch (stack.getItemDamage()) { case 5: case 6: diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java index 02932e10..09921085 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java @@ -25,7 +25,7 @@ public class MultiBrickItem extends MultiItemBlock { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { switch (stack.getItemDamage()) { case 5: case 6: diff --git a/src/main/java/tconstruct/tools/items/CreativeModifier.java b/src/main/java/tconstruct/tools/items/CreativeModifier.java index 00d8adcc..35384a9b 100644 --- a/src/main/java/tconstruct/tools/items/CreativeModifier.java +++ b/src/main/java/tconstruct/tools/items/CreativeModifier.java @@ -29,7 +29,7 @@ public class CreativeModifier extends Item { * returns a list of items with the same ID, but different meta (eg: dye returns 16 items) */ @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(par1, 1, 0)); for (ToolRecipe recipe : ToolBuilder.instance.combos) { diff --git a/src/main/java/tconstruct/tools/items/Manual.java b/src/main/java/tconstruct/tools/items/Manual.java index 323d8313..8edbbe4e 100644 --- a/src/main/java/tconstruct/tools/items/Manual.java +++ b/src/main/java/tconstruct/tools/items/Manual.java @@ -50,23 +50,18 @@ public class Manual extends CraftingItem { } private static String getBookName(int bookItemDamage) { - switch (bookItemDamage) { - case 0: - return "tconstruct.manual.beginner"; - case 1: - return "tconstruct.manual.toolstation"; - case 2: - return "tconstruct.manual.smeltery"; - case 4: - return "tconstruct.manual.weaponry"; - default: - return "tconstruct.manual.diary"; - } + return switch (bookItemDamage) { + case 0 -> "tconstruct.manual.beginner"; + case 1 -> "tconstruct.manual.toolstation"; + case 2 -> "tconstruct.manual.smeltery"; + case 4 -> "tconstruct.manual.weaponry"; + default -> "tconstruct.manual.diary"; + }; } @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { switch (stack.getItemDamage()) { case 0: list.add("\u00a7o" + StatCollector.translateToLocal("manual1.tooltip")); diff --git a/src/main/java/tconstruct/tools/items/MaterialItem.java b/src/main/java/tconstruct/tools/items/MaterialItem.java index 15feacc0..05dc2163 100644 --- a/src/main/java/tconstruct/tools/items/MaterialItem.java +++ b/src/main/java/tconstruct/tools/items/MaterialItem.java @@ -46,7 +46,7 @@ public class MaterialItem extends CraftingItem { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { switch (stack.getItemDamage()) { case 6: list.add( diff --git a/src/main/java/tconstruct/tools/items/Pattern.java b/src/main/java/tconstruct/tools/items/Pattern.java index fd535912..d59308ad 100644 --- a/src/main/java/tconstruct/tools/items/Pattern.java +++ b/src/main/java/tconstruct/tools/items/Pattern.java @@ -100,7 +100,7 @@ public class Pattern extends CraftingItem implements IPattern { /* Tags and information about the pattern */ @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { float cost = getPatternCost(stack) / 2f; if (cost > 0) { if (cost - (int) cost < 0.1) list.add(StatCollector.translateToLocal("pattern1.tooltip") + (int) cost); diff --git a/src/main/java/tconstruct/tools/items/TitleIcon.java b/src/main/java/tconstruct/tools/items/TitleIcon.java index ec14e911..a848ba64 100644 --- a/src/main/java/tconstruct/tools/items/TitleIcon.java +++ b/src/main/java/tconstruct/tools/items/TitleIcon.java @@ -83,7 +83,7 @@ public class TitleIcon extends Item { @Override public String getItemStackDisplayName(ItemStack par1ItemStack) { - String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim(); + String s = (StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim(); String s1 = mobNames[par1ItemStack.getItemDamage()]; if (s1 != null) { @@ -94,7 +94,7 @@ public class TitleIcon extends Item { } @Override - public void getSubItems(Item b, CreativeTabs tab, List list) { + public void getSubItems(Item b, CreativeTabs tab, List list) { for (int i = 0; i < mobNames.length; i++) list.add(new ItemStack(b, 1, i)); } diff --git a/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java index 18e702f2..368d277b 100644 --- a/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java +++ b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java @@ -68,12 +68,10 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent for (final ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { final int xPos = x + dir.offsetX, yPos = y + dir.offsetY, zPos = z + dir.offsetZ; final TileEntity tile = world.getTileEntity(xPos, yPos, zPos); - if (!(tile instanceof IInventory) || (tile instanceof CraftingStationLogic) + if (!(tile instanceof IInventory inv) || (tile instanceof CraftingStationLogic) || isBlacklisted(tile.getClass())) continue; - final IInventory inv = (IInventory) tile; - if (patternChest == null && tile instanceof PatternChestLogic) { patternChest = new WeakReference<>(inv); continue; @@ -85,16 +83,16 @@ public class CraftingStationLogic extends InventoryLogic implements ISidedInvent continue; } - if (tile instanceof ISidedInventory - && ((ISidedInventory) tile).getAccessibleSlotsFromSide(dir.getOpposite().ordinal()).length == 0) + if (tile instanceof ISidedInventory sidedIvn + && sidedIvn.getAccessibleSlotsFromSide(dir.getOpposite().ordinal()).length == 0) continue; if (chest == null && inv.isUseableByPlayer(inventoryplayer.player)) { chest = new WeakReference<>(inv); chestDirection = dir; invColumns = 6; - chestSize = tile instanceof ISidedInventory - ? ((ISidedInventory) tile).getAccessibleSlotsFromSide(dir.getOpposite().ordinal()).length + chestSize = tile instanceof ISidedInventory sidedIvn + ? sidedIvn.getAccessibleSlotsFromSide(dir.getOpposite().ordinal()).length : inv.getSizeInventory(); if (tile instanceof TileEntityChest) { diff --git a/src/main/java/tconstruct/util/CraftingRecipeHelper.java b/src/main/java/tconstruct/util/CraftingRecipeHelper.java index edfd0cf8..8da59673 100644 --- a/src/main/java/tconstruct/util/CraftingRecipeHelper.java +++ b/src/main/java/tconstruct/util/CraftingRecipeHelper.java @@ -32,8 +32,7 @@ public class CraftingRecipeHelper { List recipes = CraftingManager.getInstance().getRecipeList(); for (int i = 0; i < recipes.size(); i++) { IRecipe tmpRecipe = recipes.get(i); - if (tmpRecipe instanceof ShapedRecipes) { - ShapedRecipes recipe = (ShapedRecipes) tmpRecipe; + if (tmpRecipe instanceof ShapedRecipes recipe) { ItemStack recipeResult = recipe.getRecipeOutput(); if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) { @@ -47,8 +46,7 @@ public class CraftingRecipeHelper { List recipes = CraftingManager.getInstance().getRecipeList(); for (int i = 0; i < recipes.size(); i++) { IRecipe tmpRecipe = recipes.get(i); - if (tmpRecipe instanceof ShapelessRecipes) { - ShapelessRecipes recipe = (ShapelessRecipes) tmpRecipe; + if (tmpRecipe instanceof ShapelessRecipes recipe) { ItemStack recipeResult = recipe.getRecipeOutput(); if (ItemStack.areItemStacksEqual(resultItem, recipeResult)) { @@ -58,7 +56,7 @@ public class CraftingRecipeHelper { } } - public static void addShapedRecipeFirst(List recipeList, ItemStack itemstack, Object... objArray) { + public static void addShapedRecipeFirst(List recipeList, ItemStack itemstack, Object... objArray) { StringBuilder var3 = new StringBuilder(); int var4 = 0; int var5 = 0; diff --git a/src/main/java/tconstruct/world/blocks/GravelOre.java b/src/main/java/tconstruct/world/blocks/GravelOre.java index 3496e6ec..ea0bae6c 100644 --- a/src/main/java/tconstruct/world/blocks/GravelOre.java +++ b/src/main/java/tconstruct/world/blocks/GravelOre.java @@ -67,7 +67,7 @@ public class GravelOre extends BlockSand { } @Override - public void getSubBlocks(Item id, CreativeTabs tab, List list) { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { for (int iter = 0; iter < 6; iter++) { list.add(new ItemStack(id, 1, iter)); } diff --git a/src/main/java/tconstruct/world/blocks/SlimeExplosive.java b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java index e3ca269e..6ae9bdb6 100644 --- a/src/main/java/tconstruct/world/blocks/SlimeExplosive.java +++ b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java @@ -46,7 +46,7 @@ public class SlimeExplosive extends TConstructBlock { } @Override - public void getSubBlocks(Item b, CreativeTabs tab, List list) { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 2; iter++) { list.add(new ItemStack(b, 1, iter * 2)); } @@ -121,8 +121,7 @@ public class SlimeExplosive extends TConstructBlock { @Override public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { - if (par5Entity instanceof EntityArrow && !par1World.isRemote) { - EntityArrow entityarrow = (EntityArrow) par5Entity; + if (par5Entity instanceof EntityArrow entityarrow && !par1World.isRemote) { if (entityarrow.isBurning()) { this.primeTnt( diff --git a/src/main/java/tconstruct/world/blocks/SoilSlab.java b/src/main/java/tconstruct/world/blocks/SoilSlab.java index f0c37055..3ddd748b 100644 --- a/src/main/java/tconstruct/world/blocks/SoilSlab.java +++ b/src/main/java/tconstruct/world/blocks/SoilSlab.java @@ -34,20 +34,16 @@ public class SoilSlab extends SlabBase { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - switch (meta % 8) { - case 0: - return this.blockIcon; // Block.grass.getIcon(1, 0); - case 1: - return Blocks.dirt.getIcon(side, 0); - case 2: - return Blocks.mycelium.getIcon(1, 0); - default: - return TinkerTools.craftedSoil.getIcon(side, meta - 3); - } + return switch (meta % 8) { + case 0 -> this.blockIcon; // Block.grass.getIcon(1, 0); + case 1 -> Blocks.dirt.getIcon(side, 0); + case 2 -> Blocks.mycelium.getIcon(1, 0); + default -> TinkerTools.craftedSoil.getIcon(side, meta - 3); + }; } @Override - public void getSubBlocks(Item b, CreativeTabs tab, List list) { + public void getSubBlocks(Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 8; iter++) { list.add(new ItemStack(b, 1, iter)); } diff --git a/src/main/java/tconstruct/world/entity/CartEntity.java b/src/main/java/tconstruct/world/entity/CartEntity.java index 03180341..97eb3f81 100644 --- a/src/main/java/tconstruct/world/entity/CartEntity.java +++ b/src/main/java/tconstruct/world/entity/CartEntity.java @@ -134,10 +134,10 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS @Override protected void entityInit() { - this.dataWatcher.addObject(16, new Byte((byte) 0)); - this.dataWatcher.addObject(17, new Integer(0)); - this.dataWatcher.addObject(18, new Integer(1)); - this.dataWatcher.addObject(19, new Integer(0)); + this.dataWatcher.addObject(16, (byte) 0); + this.dataWatcher.addObject(17, 0); + this.dataWatcher.addObject(18, 1); + this.dataWatcher.addObject(19, 0); } /** @@ -809,12 +809,8 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS if (player.isSneaking()) { if (entityFollowing == null) { entityFollowing = player; - // if (!worldObj.isRemote) - // player.addChatMessage("The cart is following you"); } else { entityFollowing = null; - // if (!worldObj.isRemote) - // player.addChatMessage("The cart has stopped following you"); } return true; } @@ -898,9 +894,9 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS */ protected void setMinecartPowered(boolean par1) { if (par1) { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (this.dataWatcher.getWatchableObjectByte(16) | 1))); + this.dataWatcher.updateObject(16, (byte) (this.dataWatcher.getWatchableObjectByte(16) | 1)); } else { - this.dataWatcher.updateObject(16, Byte.valueOf((byte) (this.dataWatcher.getWatchableObjectByte(16) & -2))); + this.dataWatcher.updateObject(16, (byte) (this.dataWatcher.getWatchableObjectByte(16) & -2)); } } @@ -913,7 +909,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS * 40. */ public void setDamage(int par1) { - this.dataWatcher.updateObject(19, Integer.valueOf(par1)); + this.dataWatcher.updateObject(19, par1); } /** @@ -925,7 +921,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } public void setRollingAmplitude(int par1) { - this.dataWatcher.updateObject(17, Integer.valueOf(par1)); + this.dataWatcher.updateObject(17, par1); } public int getRollingAmplitude() { @@ -933,7 +929,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } public void setRollingDirection(int par1) { - this.dataWatcher.updateObject(18, Integer.valueOf(par1)); + this.dataWatcher.updateObject(18, par1); } public int getRollingDirection() {