From af008b9395f67e8a0429d600bf05e54c8129657a Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 24 May 2016 23:35:37 -0400 Subject: [PATCH] <1000 errors --- .../java/mekanism/client/HolidayManager.java | 27 ++-- .../mekanism/client/MekanismKeyHandler.java | 9 +- .../client/gui/GuiMItemStackFilter.java | 4 +- .../client/gui/GuiMMaterialFilter.java | 4 +- .../client/gui/GuiMOreDictFilter.java | 2 +- .../client/gui/GuiTMaterialFilter.java | 2 +- .../advanced/CombinerRecipeWrapper.java | 2 +- .../java/mekanism/client/render/ctm/CTM.java | 2 +- .../mekanism/client/render/ctm/CTMFace.java | 75 ----------- .../client/render/ctm/CTMRegistry.java | 12 +- .../client/render/ctm/TextureCTM.java | 6 +- .../render/item/BakedCustomItemModel.java | 4 +- .../client/render/obj/TransmitterModel.java | 9 +- .../RenderThermodynamicConductor.java | 5 +- .../mekanism/client/sound/ISoundSource.java | 3 +- src/main/java/mekanism/common/Mekanism.java | 120 +++++++++--------- .../java/mekanism/common/MekanismItems.java | 6 +- .../mekanism/common/block/BlockBasic.java | 25 ++-- .../mekanism/common/block/BlockBounding.java | 6 +- .../common/block/BlockCardboardBox.java | 6 +- .../common/block/BlockEnergyCube.java | 6 +- .../mekanism/common/block/BlockGasTank.java | 6 +- .../mekanism/common/block/BlockMachine.java | 22 ++-- .../java/mekanism/common/block/BlockOre.java | 7 +- .../mekanism/common/block/BlockPlastic.java | 14 +- .../common/block/BlockPlasticFence.java | 7 +- .../block/states/BlockStateBounding.java | 3 +- .../block/states/BlockStateCardboardBox.java | 3 +- .../common/block/states/BlockStateFacing.java | 3 +- .../common/block/states/BlockStateOre.java | 3 +- .../block/states/BlockStatePlastic.java | 3 +- .../entangloporter/InventoryFrequency.java | 5 +- .../mekanism/common/entity/EntityFlame.java | 21 +-- .../mekanism/common/entity/EntityRobit.java | 8 +- .../common/integration/MekanismHooks.java | 2 +- .../common/integration/OreDictManager.java | 26 ++-- .../container/ContainerRobitSmelting.java | 9 +- .../common/item/ItemAtomicDisassembler.java | 8 +- .../common/item/ItemConfigurationCard.java | 7 +- .../common/item/ItemConfigurator.java | 5 +- .../mekanism/common/item/ItemDictionary.java | 7 +- .../common/item/ItemNetworkReader.java | 37 +++--- .../common/item/ItemPortableTeleporter.java | 7 +- .../common/item/ItemSeismicReader.java | 5 +- .../common/multipart/ItemGlowPanel.java | 15 +-- .../common/multipart/ItemPartTransmitter.java | 3 +- .../multipart/PartDiversionTransporter.java | 7 +- .../common/multipart/PartGlowPanel.java | 3 +- .../multipart/PartLogisticalTransporter.java | 5 +- .../common/multipart/PartSidedPipe.java | 29 +++-- .../tile/TileEntityAdvancedBoundingBlock.java | 6 +- .../tile/TileEntityAmbientAccumulator.java | 4 +- .../common/tile/TileEntityBasicBlock.java | 6 +- .../mekanism/common/tile/TileEntityBin.java | 6 +- .../common/tile/TileEntityBoilerCasing.java | 4 +- .../common/tile/TileEntityBoundingBlock.java | 4 +- .../common/tile/TileEntityCardboardBox.java | 4 +- .../common/tile/TileEntityChemicalWasher.java | 5 +- .../common/tile/TileEntityCombiner.java | 2 +- .../common/tile/TileEntityDigitalMiner.java | 6 +- .../common/tile/TileEntityDynamicTank.java | 2 +- .../common/tile/TileEntityElectricPump.java | 5 +- .../tile/TileEntityElectrolyticSeparator.java | 2 +- .../common/tile/TileEntityFluidTank.java | 8 +- .../tile/TileEntityFluidicPlenisher.java | 5 +- .../common/tile/TileEntityInductionPort.java | 3 +- .../mekanism/common/tile/TileEntityLaser.java | 6 +- .../common/tile/TileEntityLaserAmplifier.java | 7 +- .../tile/TileEntityLaserTractorBeam.java | 7 +- .../tile/TileEntityNoisyElectricBlock.java | 5 +- .../mekanism/common/tile/TileEntityPRC.java | 5 +- .../common/tile/TileEntityPersonalChest.java | 6 +- .../tile/TileEntityPurificationChamber.java | 2 +- .../tile/TileEntityRotaryCondensentrator.java | 2 +- .../tile/TileEntitySolarNeutronActivator.java | 3 +- .../common/tile/TileEntityTeleporter.java | 34 ++--- ...ileEntityThermalEvaporationController.java | 6 +- .../mekanism/common/util/ChargeUtils.java | 4 +- .../common/util/ItemRegistryUtils.java | 2 +- .../java/mekanism/common/util/LangUtils.java | 3 +- .../mekanism/common/util/MekanismUtils.java | 50 ++++---- .../java/mekanism/common/util/MinerUtils.java | 4 +- .../mekanism/common/util/RecipeUtils.java | 4 +- .../mekanism/common/util/SecurityUtils.java | 3 +- .../common/util/TransporterUtils.java | 2 +- .../common/voice/VoiceConnection.java | 4 +- .../mekanism/common/world/GenHandler.java | 3 +- .../mekanism/common/world/WorldGenSalt.java | 4 +- .../client/GeneratorsClientProxy.java | 4 +- .../generators/client/jei/GeneratorsJEI.java | 12 -- .../common/block/BlockGenerator.java | 6 +- .../generators/common/block/BlockReactor.java | 21 +-- .../turbine/TurbineUpdateProtocol.java | 2 +- .../common/tile/TileEntityHeatGenerator.java | 6 +- .../reactor/TileEntityReactorController.java | 7 +- .../TileEntityReactorLogicAdapter.java | 8 +- .../tile/turbine/TileEntityTurbineCasing.java | 2 +- .../mekanism/tools/item/ItemMekanismAxe.java | 16 +-- .../mekanism/tools/item/ItemMekanismTool.java | 17 +-- 99 files changed, 470 insertions(+), 484 deletions(-) delete mode 100644 src/main/java/mekanism/client/render/ctm/CTMFace.java diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index 7feaba274..b4819780f 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -10,6 +10,7 @@ import mekanism.common.Mekanism; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextComponentString; public final class HolidayManager { @@ -102,13 +103,13 @@ public final class HolidayManager public void onEvent(EntityPlayer player) { String themedLines = getThemedLines(new EnumColor[] {EnumColor.DARK_GREEN, EnumColor.DARK_RED}, 13); - player.addChatMessage(new ChatComponentText(themedLines + EnumColor.DARK_BLUE + "[Mekanism]" + themedLines)); - player.addChatMessage(new ChatComponentText(EnumColor.RED + "Merry Christmas, " + EnumColor.DARK_BLUE + player.getName() + EnumColor.RED + "!")); - player.addChatMessage(new ChatComponentText(EnumColor.RED + "May you have plenty of Christmas cheer")); - player.addChatMessage(new ChatComponentText(EnumColor.RED + "and have a relaxing holiday with your")); - player.addChatMessage(new ChatComponentText(EnumColor.RED + "family :)")); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_GREY + "-aidancbrady")); - player.addChatMessage(new ChatComponentText(themedLines + EnumColor.DARK_BLUE + "[=======]" + themedLines)); + player.addChatMessage(new TextComponentString(themedLines + EnumColor.DARK_BLUE + "[Mekanism]" + themedLines)); + player.addChatMessage(new TextComponentString(EnumColor.RED + "Merry Christmas, " + EnumColor.DARK_BLUE + player.getName() + EnumColor.RED + "!")); + player.addChatMessage(new TextComponentString(EnumColor.RED + "May you have plenty of Christmas cheer")); + player.addChatMessage(new TextComponentString(EnumColor.RED + "and have a relaxing holiday with your")); + player.addChatMessage(new TextComponentString(EnumColor.RED + "family :)")); + player.addChatMessage(new TextComponentString(EnumColor.DARK_GREY + "-aidancbrady")); + player.addChatMessage(new TextComponentString(themedLines + EnumColor.DARK_BLUE + "[=======]" + themedLines)); } @Override @@ -151,12 +152,12 @@ public final class HolidayManager public void onEvent(EntityPlayer player) { String themedLines = getThemedLines(new EnumColor[] {EnumColor.WHITE, EnumColor.YELLOW}, 13); - player.addChatMessage(new ChatComponentText(themedLines + EnumColor.DARK_BLUE + "[Mekanism]" + themedLines)); - player.addChatMessage(new ChatComponentText(EnumColor.AQUA + "Happy New Year, " + EnumColor.DARK_BLUE + player.getName() + EnumColor.RED + "!")); - player.addChatMessage(new ChatComponentText(EnumColor.AQUA + "Best wishes to you as we enter this")); - player.addChatMessage(new ChatComponentText(EnumColor.AQUA + "new and exciting year of " + calendar.get(Calendar.YEAR) + "! :)")); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_GREY + "-aidancbrady")); - player.addChatMessage(new ChatComponentText(themedLines + EnumColor.DARK_BLUE + "[=======]" + themedLines)); + player.addChatMessage(new TextComponentString(themedLines + EnumColor.DARK_BLUE + "[Mekanism]" + themedLines)); + player.addChatMessage(new TextComponentString(EnumColor.AQUA + "Happy New Year, " + EnumColor.DARK_BLUE + player.getName() + EnumColor.RED + "!")); + player.addChatMessage(new TextComponentString(EnumColor.AQUA + "Best wishes to you as we enter this")); + player.addChatMessage(new TextComponentString(EnumColor.AQUA + "new and exciting year of " + calendar.get(Calendar.YEAR) + "! :)")); + player.addChatMessage(new TextComponentString(EnumColor.DARK_GREY + "-aidancbrady")); + player.addChatMessage(new TextComponentString(themedLines + EnumColor.DARK_BLUE + "[=======]" + themedLines)); } } diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 215a38792..87ea42ee3 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -29,6 +29,7 @@ import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextComponentString; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; @@ -83,7 +84,7 @@ public class MekanismKeyHandler extends MekKeyHandler int toSet = configurator.getState(toolStack).ordinal() < ConfiguratorMode.values().length-1 ? configurator.getState(toolStack).ordinal() + 1 : 0; configurator.setState(toolStack, ConfiguratorMode.values()[toSet]); Mekanism.packetHandler.sendToServer(new ConfiguratorStateMessage(configurator.getState(toolStack))); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configureState") + ": " + configurator.getColor(configurator.getState(toolStack)) + configurator.getStateDisplay(configurator.getState(toolStack)))); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configureState") + ": " + configurator.getColor(configurator.getState(toolStack)) + configurator.getStateDisplay(configurator.getState(toolStack)))); } else if(player.isSneaking() && item instanceof ItemElectricBow) { @@ -91,7 +92,7 @@ public class MekanismKeyHandler extends MekKeyHandler bow.setFireState(toolStack, !bow.getFireState(toolStack)); Mekanism.packetHandler.sendToServer(new ElectricBowStateMessage(bow.getFireState(toolStack))); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.fireMode") + ": " + (bow.getFireState(toolStack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.transOnOff(bow.getFireState(toolStack)))); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.fireMode") + ": " + (bow.getFireState(toolStack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.transOnOff(bow.getFireState(toolStack)))); } else if(player.isSneaking() && item instanceof ItemBlockMachine) { @@ -101,7 +102,7 @@ public class MekanismKeyHandler extends MekKeyHandler { machine.setBucketMode(toolStack, !machine.getBucketMode(toolStack)); Mekanism.packetHandler.sendToServer(new PortableTankStateMessage(machine.getBucketMode(toolStack))); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.portableTank.bucketMode") + ": " + (machine.getBucketMode(toolStack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.transOnOff(machine.getBucketMode(toolStack)))); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.portableTank.bucketMode") + ": " + (machine.getBucketMode(toolStack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.transOnOff(machine.getBucketMode(toolStack)))); } } else if(player.isSneaking() && item instanceof ItemWalkieTalkie) @@ -122,7 +123,7 @@ public class MekanismKeyHandler extends MekKeyHandler flamethrower.incrementMode(toolStack); Mekanism.packetHandler.sendToServer(new PacketFlamethrowerData.FlamethrowerDataMessage(PacketFlamethrowerData.FlamethrowerPacket.MODE, null, false)); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.flamethrower.modeBump") + ": " + flamethrower.getMode(toolStack).getName())); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.flamethrower.modeBump") + ": " + flamethrower.getMode(toolStack).getName())); } } else if(kb == armorModeSwitchKey) diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index 36d0faf69..962f20cd9 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -279,7 +279,7 @@ public class GuiMItemStackFilter extends GuiMekanism { if(stack.getItem() instanceof ItemBlock) { - if(Block.getBlockFromItem(stack.getItem()) != Blocks.bedrock) + if(Block.getBlockFromItem(stack.getItem()) != Blocks.BEDROCK) { filter.itemType = stack.copy(); filter.itemType.stackSize = 1; @@ -304,7 +304,7 @@ public class GuiMItemStackFilter extends GuiMekanism { if(stack.getItem() instanceof ItemBlock) { - if(Block.getBlockFromItem(stack.getItem()) != Blocks.bedrock) + if(Block.getBlockFromItem(stack.getItem()) != Blocks.BEDROCK) { toUse = stack.copy(); toUse.stackSize = 1; diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index f859a30e0..c2956a45b 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -261,7 +261,7 @@ public class GuiMMaterialFilter extends GuiMekanism { if(stack.getItem() instanceof ItemBlock) { - if(Block.getBlockFromItem(stack.getItem()) != Blocks.bedrock) + if(Block.getBlockFromItem(stack.getItem()) != Blocks.BEDROCK) { filter.materialItem = stack.copy(); filter.materialItem.stackSize = 1; @@ -286,7 +286,7 @@ public class GuiMMaterialFilter extends GuiMekanism { if(stack.getItem() instanceof ItemBlock) { - if(Block.getBlockFromItem(stack.getItem()) != Blocks.bedrock) + if(Block.getBlockFromItem(stack.getItem()) != Blocks.BEDROCK) { toUse = stack.copy(); toUse.stackSize = 1; diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index d0dae91c3..e2ef6714e 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -332,7 +332,7 @@ public class GuiMOreDictFilter extends GuiMekanism { if(stack.getItem() instanceof ItemBlock) { - if(Block.getBlockFromItem(stack.getItem()) != Blocks.bedrock) + if(Block.getBlockFromItem(stack.getItem()) != Blocks.BEDROCK) { toUse = stack.copy(); toUse.stackSize = 1; diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index bf0ae1e41..10fa797ff 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -244,7 +244,7 @@ public class GuiTMaterialFilter extends GuiMekanism { if(stack.getItem() instanceof ItemBlock) { - if(Block.getBlockFromItem(stack.getItem()) != Blocks.bedrock) + if(Block.getBlockFromItem(stack.getItem()) != Blocks.BEDROCK) { filter.materialItem = stack.copy(); filter.materialItem.stackSize = 1; diff --git a/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java index e77fc03e7..b770154eb 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java @@ -20,6 +20,6 @@ public class CombinerRecipeWrapper extends AdvancedMachineRecipeWrapper @Override public List getFuelStacks(Gas gasType) { - return ListUtils.asList(new ItemStack(Blocks.cobblestone)); + return ListUtils.asList(new ItemStack(Blocks.COBBLESTONE)); } } diff --git a/src/main/java/mekanism/client/render/ctm/CTM.java b/src/main/java/mekanism/client/render/ctm/CTM.java index 56ec3fa0b..78dd81c7f 100644 --- a/src/main/java/mekanism/client/render/ctm/CTM.java +++ b/src/main/java/mekanism/client/render/ctm/CTM.java @@ -293,7 +293,7 @@ public class CTM { } // check that we aren't already connected outwards from this side - ret &= !obscuring.getBlock().isFullCube() || !obscuring.equals(state); + ret &= !obscuring.isFullCube() || !obscuring.equals(state); return ret; } diff --git a/src/main/java/mekanism/client/render/ctm/CTMFace.java b/src/main/java/mekanism/client/render/ctm/CTMFace.java deleted file mode 100644 index ea5c4ca40..000000000 --- a/src/main/java/mekanism/client/render/ctm/CTMFace.java +++ /dev/null @@ -1,75 +0,0 @@ -package mekanism.client.render.ctm; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; - -/** - * Chisel Face, basically a list of IChiselTexture's - */ -public final class CTMFace { - - private List textureList; - - private List childFaces; - - private EnumWorldBlockLayer layer; - - public CTMFace() { - this(new ArrayList<>(), new ArrayList<>()); - } - - public CTMFace(EnumWorldBlockLayer layer) { - this(); - setLayer(layer); - } - - public CTMFace(List textureList, List childFaces) { - this.textureList = textureList; - this.childFaces = childFaces; - } - - public List getTextureList(){ - List list = new ArrayList<>(); - list.addAll(this.textureList); - for (CTMFace face : childFaces){ - list.addAll(face.getTextureList()); - } - return list; - } - - public void addTexture(TextureCTM texture){ - this.textureList.add(texture); - } - - public void addChildFace(CTMFace face){ - this.childFaces.add(face); - } - - public boolean removeTexture(TextureCTM texture){ - return this.textureList.remove(texture); - } - - public boolean removeChildFace(CTMFace face){ - return this.childFaces.remove(face); - } - - public TextureAtlasSprite getParticle(){ - if (textureList.get(0) != null) { - return textureList.get(0).getParticle(); - } - else { - return childFaces.get(0).getParticle(); - } - } - - public void setLayer(EnumWorldBlockLayer layer){ - this.layer = layer; - } - - public EnumWorldBlockLayer getLayer(){ - return this.layer; - } - -} diff --git a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java index 0c79ab459..f38dcce1c 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java +++ b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java @@ -7,16 +7,16 @@ import java.util.List; import java.util.Map; import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.client.resources.model.ModelRotation; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelRotation; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.commons.lang3.tuple.Pair; @@ -79,6 +79,6 @@ public class CTMRegistry register(callbacks[0]); register(callbacks[1]); - return new TextureCTM(EnumWorldBlockLayer.SOLID, callbacks); + return new TextureCTM(BlockRenderLayer.SOLID, callbacks); } } diff --git a/src/main/java/mekanism/client/render/ctm/TextureCTM.java b/src/main/java/mekanism/client/render/ctm/TextureCTM.java index fb1027141..a5d0683fb 100644 --- a/src/main/java/mekanism/client/render/ctm/TextureCTM.java +++ b/src/main/java/mekanism/client/render/ctm/TextureCTM.java @@ -10,16 +10,16 @@ import java.util.stream.Collectors; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.ResourceLocation; public class TextureCTM { - protected EnumWorldBlockLayer layer; + protected BlockRenderLayer layer; public TextureSpriteCallback[] sprites; - public TextureCTM(EnumWorldBlockLayer layer, TextureSpriteCallback[] sprites) + public TextureCTM(BlockRenderLayer layer, TextureSpriteCallback[] sprites) { this.layer = layer; this.sprites = sprites; diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 14f7fb25a..21135e974 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -347,9 +347,9 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GlStateManager.rotate(135, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(-20, 0.0F, 0.0F, 1.0F); - if(type == TransformType.FIRST_PERSON || type == TransformType.THIRD_PERSON) + if(type == TransformType.FIRST_PERSON_RIGHT_HAND || type == TransformType.THIRD_PERSON) { - if(type == TransformType.FIRST_PERSON) + if(type == TransformType.FIRST_PERSON_RIGHT_HAND) { GlStateManager.rotate(55, 0.0F, 1.0F, 0.0F); } diff --git a/src/main/java/mekanism/client/render/obj/TransmitterModel.java b/src/main/java/mekanism/client/render/obj/TransmitterModel.java index 69fe042ac..705113078 100644 --- a/src/main/java/mekanism/client/render/obj/TransmitterModel.java +++ b/src/main/java/mekanism/client/render/obj/TransmitterModel.java @@ -20,6 +20,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; import net.minecraft.util.ResourceLocation; @@ -56,7 +57,7 @@ public class TransmitterModel extends OBJBakedModelBase implements ISmartMultipa public IBakedModel handlePartState(IBlockState state) { IExtendedBlockState extended = (IExtendedBlockState)state; - EnumWorldBlockLayer layer = MinecraftForgeClient.getRenderLayer(); + BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer(); ColorProperty colorProp = extended.getValue(ColorProperty.INSTANCE); int color = -1; @@ -67,7 +68,7 @@ public class TransmitterModel extends OBJBakedModelBase implements ISmartMultipa OBJState obj = extended.getValue(OBJProperty.instance); - if(layer != EnumWorldBlockLayer.TRANSLUCENT) + if(layer != BlockRenderLayer.TRANSLUCENT) { color = -1; } @@ -115,7 +116,7 @@ public class TransmitterModel extends OBJBakedModelBase implements ISmartMultipa { ColorProperty prop = ((IExtendedBlockState)tempState).getValue(ColorProperty.INSTANCE); - if(MinecraftForgeClient.getRenderLayer() == EnumWorldBlockLayer.TRANSLUCENT && prop != null && prop.color != null) + if(MinecraftForgeClient.getRenderLayer() == BlockRenderLayer.TRANSLUCENT && prop != null && prop.color != null) { return new float[] {prop.color.getColor(0), prop.color.getColor(1), prop.color.getColor(2), 1}; } @@ -134,7 +135,7 @@ public class TransmitterModel extends OBJBakedModelBase implements ISmartMultipa ConnectionProperty connection = ((IExtendedBlockState)tempState).getValue(ConnectionProperty.INSTANCE); boolean sideIconOverride = getIconStatus(side, connection) > 0; - if(MinecraftForgeClient.getRenderLayer() == EnumWorldBlockLayer.TRANSLUCENT) + if(MinecraftForgeClient.getRenderLayer() == BlockRenderLayer.TRANSLUCENT) { if(prop != null && prop.color != null) { diff --git a/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java b/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java index add1addc2..1c8ddcbc2 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java @@ -4,6 +4,7 @@ import mekanism.client.render.ColourTemperature; import mekanism.client.render.MekanismRenderer; import mekanism.common.multipart.PartThermodynamicConductor; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; @@ -20,7 +21,7 @@ public class RenderThermodynamicConductor extends RenderTransmitterBase typeProperty = PropertyEnum.create("type", EnumOreType.class); diff --git a/src/main/java/mekanism/common/block/states/BlockStatePlastic.java b/src/main/java/mekanism/common/block/states/BlockStatePlastic.java index daccbf689..042dd73cc 100644 --- a/src/main/java/mekanism/common/block/states/BlockStatePlastic.java +++ b/src/main/java/mekanism/common/block/states/BlockStatePlastic.java @@ -2,6 +2,7 @@ package mekanism.common.block.states; import mekanism.common.block.BlockPlastic; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; @@ -9,7 +10,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; -public class BlockStatePlastic extends BlockState +public class BlockStatePlastic extends BlockStateContainer { public static PropertyEnum colorProperty = PropertyEnum.create("color", EnumDyeColor.class); diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index 66e6349a0..201b41540 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; +import mekanism.common.PacketHandler; import mekanism.common.frequency.Frequency; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -106,7 +107,7 @@ public class InventoryFrequency extends Frequency if(storedFluid.getFluid() != null) { data.add(true); - data.add(storedFluid.getFluid().getFluid().getName()); + data.add(FluidRegistry.getFluidName(storedFluid.getFluid())); data.add(storedFluid.getFluidAmount()); } else { @@ -138,7 +139,7 @@ public class InventoryFrequency extends Frequency if(dataStream.readBoolean()) { - storedFluid.setFluid(new FluidStack(FluidRegistry.getFluid(dataStream.readInt()), dataStream.readInt())); + storedFluid.setFluid(new FluidStack(FluidRegistry.getFluid(PacketHandler.readString(dataStream)), dataStream.readInt())); } else { storedFluid.setFluid(null); diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index ecb857ad0..6e88d3d87 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -23,6 +23,9 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.RayTraceResult.Type; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; @@ -107,15 +110,15 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData private void calculateVector() { - Vec3 localVec = new Vec3(posX, posY, posZ); - Vec3 motionVec = new Vec3(posX + motionX*2, posY + motionY*2, posZ + motionZ*2); + Vec3d localVec = new Vec3d(posX, posY, posZ); + Vec3d motionVec = new Vec3d(posX + motionX*2, posY + motionY*2, posZ + motionZ*2); RayTraceResult mop = worldObj.rayTraceBlocks(localVec, motionVec, true, false, false); - localVec = new Vec3(posX, posY, posZ); - motionVec = new Vec3(posX + motionX, posY + motionY, posZ + motionZ); + localVec = new Vec3d(posX, posY, posZ); + motionVec = new Vec3d(posX + motionX, posY + motionY, posZ + motionZ); if(mop != null) { - motionVec = new Vec3(mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord); + motionVec = new Vec3d(mop.hitVec.xCoord, mop.hitVec.yCoord, mop.hitVec.zCoord); } Entity entity = null; @@ -161,7 +164,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData if(mop != null) { - if(mop.typeOfHit == MovingObjectType.ENTITY && mop.entityHit != null && !mop.entityHit.isImmuneToFire()) + if(mop.typeOfHit == Type.ENTITY && mop.entityHit != null && !mop.entityHit.isImmuneToFire()) { if(mop.entityHit instanceof EntityItem && mode != ItemFlamethrower.FlamethrowerMode.COMBAT) { @@ -177,7 +180,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData burn(mop.entityHit); } } - else if(mop.typeOfHit == MovingObjectType.BLOCK) + else if(mop.typeOfHit == Type.BLOCK) { IBlockState state = worldObj.getBlockState(mop.getBlockPos()); Block block = state.getBlock(); @@ -191,7 +194,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData { if(mode == ItemFlamethrower.FlamethrowerMode.INFERNO && !worldObj.isRemote) { - worldObj.setBlockState(sideCoord.getPos(), Blocks.fire.getDefaultState()); + worldObj.setBlockState(sideCoord.getPos(), Blocks.FIRE.getDefaultState()); } } } @@ -244,7 +247,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData Block b = state.getBlock(); Block newBlock = Block.getBlockFromItem(result.getItem()); - if(newBlock != null && newBlock != Blocks.air) + if(newBlock != null && newBlock != Blocks.AIR) { worldObj.setBlockState(block.getPos(), Block.getBlockFromItem(result.getItem()).getStateFromMeta(result.getItemDamage()), 3); } diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 958308671..4517ec2ab 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -35,13 +35,13 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.util.Constants; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Optional.Interface; import cofh.api.energy.IEnergyContainerItem; @@ -156,7 +156,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine return; } - if(!(homeLocation.getTileEntity(MinecraftServer.getServer().worldServerForDimension(homeLocation.dimensionId)) instanceof TileEntityChargepad)) + if(!(homeLocation.getTileEntity(FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(homeLocation.dimensionId)) instanceof TileEntityChargepad)) { drop(); setDead(); @@ -195,7 +195,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine setEnergy(getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_TE)); } - else if(inventory[27].getItem() == Items.redstone && getEnergy()+ general.ENERGY_PER_REDSTONE <= MAX_ELECTRICITY) + else if(inventory[27].getItem() == Items.REDSTONE && getEnergy()+ general.ENERGY_PER_REDSTONE <= MAX_ELECTRICITY) { setEnergy(getEnergy() + general.ENERGY_PER_REDSTONE); inventory[27].stackSize--; @@ -304,7 +304,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine { setFollowing(false); - if(worldObj.provider.getDimensionId() != homeLocation.dimensionId) + if(worldObj.provider.getDimension() != homeLocation.dimensionId) { travelToDimension(homeLocation.dimensionId); } diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index d706bafd3..733b36c22 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -105,7 +105,7 @@ public final class MekanismHooks try { Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotOsmium"), null, new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal())); Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedObsidian"), null, new ItemStack(MekanismItems.OtherDust, 1, 5)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedGlowstone"), null, new ItemStack(Items.glowstone_dust)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedGlowstone"), null, new ItemStack(Items.GLOWSTONE_DUST)); Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotSteel"), null, new ItemStack(MekanismItems.OtherDust, 1, 1)); } catch(Exception e) {} diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index 0b559f245..34a2bb458 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -45,11 +45,11 @@ public final class OreDictManager if(!Recipe.PRECISION_SAWMILL.containsRecipe(wildStack)) { - RecipeHandler.addPrecisionSawmillRecipe(wildStack, new ItemStack(Items.stick, 6), new ItemStack(MekanismItems.Sawdust), 0.25); + RecipeHandler.addPrecisionSawmillRecipe(wildStack, new ItemStack(Items.STICK, 6), new ItemStack(MekanismItems.Sawdust), 0.25); } } else { - RecipeHandler.addPrecisionSawmillRecipe(StackUtils.size(ore, 1), new ItemStack(Items.stick, 6), new ItemStack(MekanismItems.Sawdust), 0.25); + RecipeHandler.addPrecisionSawmillRecipe(StackUtils.size(ore, 1), new ItemStack(Items.STICK, 6), new ItemStack(MekanismItems.Sawdust), 0.25); } } @@ -62,7 +62,7 @@ public final class OreDictManager { for(ItemStack ore : OreDictionary.getOres("woodRubber")) { - RecipeHandler.addPrecisionSawmillRecipe(StackUtils.size(ore, 1), new ItemStack(Blocks.planks, 4), StackUtils.size(OreDictionary.getOres("itemRubber").get(0), 1), 1F); + RecipeHandler.addPrecisionSawmillRecipe(StackUtils.size(ore, 1), new ItemStack(Blocks.PLANKS, 4), StackUtils.size(OreDictionary.getOres("itemRubber").get(0), 1), 1F); } } @@ -196,7 +196,7 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("oreQuartz")) { - RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(Items.quartz, 6)); + RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(Items.QUARTZ, 6)); } for(ItemStack ore : OreDictionary.getOres("crystalFluix")) @@ -230,12 +230,12 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("ingotRedstone")) { - RecipeHandler.addCrusherRecipe(StackUtils.size(ore, 1), new ItemStack(Items.redstone)); + RecipeHandler.addCrusherRecipe(StackUtils.size(ore, 1), new ItemStack(Items.REDSTONE)); } for(ItemStack ore : OreDictionary.getOres("ingotRefinedGlowstone")) { - RecipeHandler.addCrusherRecipe(StackUtils.size(ore, 1), new ItemStack(Items.glowstone_dust)); + RecipeHandler.addCrusherRecipe(StackUtils.size(ore, 1), new ItemStack(Items.GLOWSTONE_DUST)); } try { @@ -256,20 +256,20 @@ public final class OreDictManager } catch(Exception e) {} try { - RecipeHandler.addCrusherRecipe(new ItemStack(Items.coal), StackUtils.size(OreDictionary.getOres("dustCoal").get(0), 1)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.COAL), StackUtils.size(OreDictionary.getOres("dustCoal").get(0), 1)); } catch(Exception e) {} try { - RecipeHandler.addCrusherRecipe(new ItemStack(Items.coal, 1, 1), StackUtils.size(OreDictionary.getOres("dustCharcoal").get(0), 1)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.COAL, 1, 1), StackUtils.size(OreDictionary.getOres("dustCharcoal").get(0), 1)); } catch(Exception e) {} try { - RecipeHandler.addCrusherRecipe(new ItemStack(Items.gunpowder), StackUtils.size(OreDictionary.getOres("dustSaltpeter").get(0), 1)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.GUNPOWDER), StackUtils.size(OreDictionary.getOres("dustSaltpeter").get(0), 1)); } catch(Exception e) {} for(ItemStack ore : OreDictionary.getOres("dustSaltpeter")) { - RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(Items.gunpowder)); + RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(Items.GUNPOWDER)); } for(ItemStack ore : OreDictionary.getOres("ingotSteel")) @@ -279,7 +279,7 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("dustLapis")) { - RecipeHandler.addCrusherRecipe(new ItemStack(Items.dye, 1, 4), StackUtils.size(ore, 1)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.DYE, 1, 4), StackUtils.size(ore, 1)); } for(ItemStack ore : OreDictionary.getOres("dustLithium")) @@ -289,14 +289,14 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("dustObsidian")) { - RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 4), new ItemStack(Blocks.obsidian)); + RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 4), new ItemStack(Blocks.OBSIDIAN)); RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("DIAMOND"), 10, StackUtils.size(ore, 1), new ItemStack(MekanismItems.OtherDust, 1, 5)); } for(ItemStack ore : OreDictionary.getOres("dustDiamond")) { InfuseRegistry.registerInfuseObject(ore, new InfuseObject(InfuseRegistry.get("DIAMOND"), 10)); - RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(Items.diamond)); + RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(Items.DIAMOND)); } for(ItemStack ore : OreDictionary.getOres("dustTin")) diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java index 28d21cc19..5cb9c3873 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java @@ -4,6 +4,7 @@ import mekanism.common.entity.EntityRobit; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotFurnaceOutput; import net.minecraft.item.ItemStack; @@ -50,9 +51,9 @@ public class ContainerRobitSmelting extends Container } @Override - public void onCraftGuiOpened(ICrafting icrafting) + public void addListener(IContainerListener icrafting) { - super.onCraftGuiOpened(icrafting); + super.addListener(icrafting); icrafting.sendProgressBarUpdate(this, 0, robit.furnaceCookTime); icrafting.sendProgressBarUpdate(this, 1, robit.furnaceBurnTime); icrafting.sendProgressBarUpdate(this, 2, robit.currentItemBurnTime); @@ -63,9 +64,9 @@ public class ContainerRobitSmelting extends Container { super.detectAndSendChanges(); - for(int i = 0; i < crafters.size(); ++i) + for(int i = 0; i < listeners.size(); ++i) { - ICrafting icrafting = (ICrafting)crafters.get(i); + IContainerListener icrafting = (IContainerListener)listeners.get(i); if(lastCookTime != robit.furnaceCookTime) { diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index fde507c15..6e914f269 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -39,7 +39,7 @@ public class ItemAtomicDisassembler extends ItemEnergized @Override public boolean canHarvestBlock(Block block, ItemStack stack) { - return block != Blocks.bedrock; + return block != Blocks.BEDROCK; } @Override @@ -226,11 +226,11 @@ public class ItemAtomicDisassembler extends ItemEnergized } Block block1 = world.getBlockState(pos).getBlock(); - boolean air = block1.isAir(world, pos.up()); + boolean air = block1.isAir(world.getBlockState(pos.up()), world, pos.up()); - if(side != EnumFacing.DOWN && air && (block1 == Blocks.grass || block1 == Blocks.dirt)) + if(side != EnumFacing.DOWN && air && (block1 == Blocks.GRASS || block1 == Blocks.DIRT)) { - Block farm = Blocks.farmland; + Block farm = Blocks.FARMLAND; world.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, farm.stepSound.getStepSound(), (farm.stepSound.getVolume() + 1.0F) / 2.0F, farm.stepSound.getFrequency() * 0.8F); if(world.isRemote) diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java index 27880783c..6f8922367 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurationCard.java +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -17,6 +17,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; public class ItemConfigurationCard extends ItemMekanism @@ -58,7 +59,7 @@ public class ItemConfigurationCard extends ItemMekanism { data.setString("dataType", getNameFromTile(tileEntity)); setData(stack, data); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurationCard.got").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(data.getString("dataType")) + EnumColor.GREY))); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurationCard.got").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(data.getString("dataType")) + EnumColor.GREY))); } return true; @@ -74,11 +75,11 @@ public class ItemConfigurationCard extends ItemMekanism ((ISpecialConfigData)tileEntity).setConfigurationData(getData(stack)); } - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + LangUtils.localize("tooltip.configurationCard.set").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(getDataType(stack)) + EnumColor.DARK_GREEN))); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + LangUtils.localize("tooltip.configurationCard.set").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(getDataType(stack)) + EnumColor.DARK_GREEN))); setData(stack, null); } else { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.configurationCard.unequal") + ".")); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.configurationCard.unequal") + ".")); } return true; diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 4fd0423d2..d8e88b7c7 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -34,6 +34,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; @@ -82,7 +83,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool { if(!player.isSneaking()) { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getViewModeText(getState(stack).getTransmission()) + ": " + initial.color + initial.localize() + " (" + initial.color.getColoredName() + ")")); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getViewModeText(getState(stack).getTransmission()) + ": " + initial.color + initial.localize() + " (" + initial.color.getColoredName() + ")")); } else { if(getEnergy(stack) >= ENERGY_PER_CONFIGURE) @@ -92,7 +93,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool setEnergy(stack, getEnergy(stack) - ENERGY_PER_CONFIGURE); MekanismUtils.incrementOutput(config, getState(stack).getTransmission(), MekanismUtils.getBaseOrientation(side, config.getOrientation())); SideData data = config.getConfig().getOutput(getState(stack).getTransmission(), side, config.getOrientation()); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getToggleModeText(getState(stack).getTransmission()) + ": " + data.color + data.localize() + " (" + data.color.getColoredName() + ")")); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getToggleModeText(getState(stack).getTransmission()) + ": " + data.color + data.localize() + " (" + data.color.getColoredName() + ")")); if(config instanceof TileEntityBasicBlock) { diff --git a/src/main/java/mekanism/common/item/ItemDictionary.java b/src/main/java/mekanism/common/item/ItemDictionary.java index 4d204341f..86f42feb0 100644 --- a/src/main/java/mekanism/common/item/ItemDictionary.java +++ b/src/main/java/mekanism/common/item/ItemDictionary.java @@ -12,6 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; public class ItemDictionary extends ItemMekanism @@ -39,15 +40,15 @@ public class ItemDictionary extends ItemMekanism if(!names.isEmpty()) { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.keysFound") + ":")); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.keysFound") + ":")); for(String name : names) { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_GREEN + " - " + name)); + player.addChatMessage(new TextComponentString(EnumColor.DARK_GREEN + " - " + name)); } } else { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.noKey") + ".")); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.noKey") + ".")); } } diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index fb3349eca..c6c68a87a 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; public class ItemNetworkReader extends ItemEnergized @@ -44,21 +45,21 @@ public class ItemNetworkReader extends ItemEnergized IGridTransmitter transmitter = MekanismUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Transmitters: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkSize())); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Acceptors: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkAcceptorSize())); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Needed: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkNeeded())); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Buffer: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkBuffer())); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Throughput: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkFlow())); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Capacity: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkCapacity())); + player.addChatMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); + player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Transmitters: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkSize())); + player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Acceptors: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkAcceptorSize())); + player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Needed: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkNeeded())); + player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Buffer: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkBuffer())); + player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Throughput: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkFlow())); + player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Capacity: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkCapacity())); if(MekanismUtils.hasCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite())) { IHeatTransfer transfer = MekanismUtils.getCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + transfer.getTemp() + "K above ambient")); + player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + transfer.getTemp() + "K above ambient")); } - player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); + player.addChatMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); return true; } @@ -67,9 +68,9 @@ public class ItemNetworkReader extends ItemEnergized if(drain) setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE); IHeatTransfer transfer = MekanismUtils.getCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + transfer.getTemp() + "K above ambient")); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); + player.addChatMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); + player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + transfer.getTemp() + "K above ambient")); + player.addChatMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); return true; } @@ -90,9 +91,9 @@ public class ItemNetworkReader extends ItemEnergized if(transmitter.getTransmitterNetwork().possibleAcceptors.containsKey(coord.offset(iterSide.getOpposite())) && !iteratedNetworks.contains(transmitter.getTransmitterNetwork())) { - player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[" + transmitter.getTransmissionType().getName() + "]" + EnumColor.GREY + " -------------")); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Connected sides: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().acceptorDirections.get(coord.offset(iterSide.getOpposite())))); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); + player.addChatMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[" + transmitter.getTransmissionType().getName() + "]" + EnumColor.GREY + " -------------")); + player.addChatMessage(new TextComponentString(EnumColor.GREY + " *Connected sides: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetwork().acceptorDirections.get(coord.offset(iterSide.getOpposite())))); + player.addChatMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); iteratedNetworks.add(transmitter.getTransmitterNetwork()); } @@ -106,14 +107,14 @@ public class ItemNetworkReader extends ItemEnergized if(player.isSneaking() && MekanismAPI.debug) { String[] strings = TransmitterNetworkRegistry.getInstance().toStrings(); - player.addChatMessage(new ChatComponentText(EnumColor.GREY + "---------- " + EnumColor.DARK_BLUE + "[Mekanism Debug]" + EnumColor.GREY + " ----------")); + player.addChatMessage(new TextComponentString(EnumColor.GREY + "---------- " + EnumColor.DARK_BLUE + "[Mekanism Debug]" + EnumColor.GREY + " ----------")); for(String s : strings) { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_GREY + s)); + player.addChatMessage(new TextComponentString(EnumColor.DARK_GREY + s)); } - player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); + player.addChatMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); } } diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 56948333f..208ab92e4 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -15,6 +15,7 @@ import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem @@ -52,7 +53,7 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem if(getOwner(itemstack) == null) { setOwner(itemstack, entityplayer.getName()); - entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.nowOwn"))); + entityplayer.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.nowOwn"))); } else { if(SecurityUtils.canAccess(entityplayer, itemstack)) @@ -77,9 +78,9 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem int neededEnergy = 1000; - if(entity.worldObj.provider.getDimensionId() != coords.dimensionId) + if(entity.worldObj.provider.getDimension() != coords.dimensionId) { - neededEnergy+=10000; + neededEnergy += 10000; } int distance = (int)entity.getDistance(coords.xCoord, coords.yCoord, coords.zCoord); diff --git a/src/main/java/mekanism/common/item/ItemSeismicReader.java b/src/main/java/mekanism/common/item/ItemSeismicReader.java index 42346e2e1..f6933e4c4 100644 --- a/src/main/java/mekanism/common/item/ItemSeismicReader.java +++ b/src/main/java/mekanism/common/item/ItemSeismicReader.java @@ -7,6 +7,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; public class ItemSeismicReader extends ItemEnergized @@ -33,7 +34,7 @@ public class ItemSeismicReader extends ItemEnergized { if(!world.isRemote) { - entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.seismicReader.needsEnergy"))); + entityplayer.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.seismicReader.needsEnergy"))); } return itemstack; @@ -42,7 +43,7 @@ public class ItemSeismicReader extends ItemEnergized { if(!world.isRemote) { - entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.seismicReader.noVibrations"))); + entityplayer.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.seismicReader.noVibrations"))); } return itemstack; diff --git a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java index cee16ce15..74fb65c6b 100644 --- a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java @@ -2,27 +2,20 @@ package mekanism.common.multipart; import java.util.List; -/* -import codechicken.lib.vec.BlockCoord; -import codechicken.lib.vec.Vector3; -import codechicken.microblock.HollowMicroblock; -import codechicken.multipart.JItemMultiPart; -import codechicken.multipart.TMultiPart; -import codechicken.multipart.TileMultipart; -*/ import mcmultipart.item.ItemMultiPart; import mcmultipart.multipart.IMultipart; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.base.IMetaItem; import mekanism.common.util.LangUtils; -//import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; public class ItemGlowPanel extends ItemMultiPart implements IMetaItem @@ -35,7 +28,7 @@ public class ItemGlowPanel extends ItemMultiPart implements IMetaItem } @Override - public IMultipart createPart(World world, BlockPos pos, EnumFacing orientation, Vec3 vHit, ItemStack item, EntityPlayer player) + public IMultipart createPart(World world, BlockPos pos, EnumFacing orientation, Vec3d vHit, ItemStack item, EntityPlayer player) { EnumColor col = EnumColor.DYES[item.getItemDamage()]; @@ -67,7 +60,7 @@ public class ItemGlowPanel extends ItemMultiPart implements IMetaItem EnumColor colour = EnumColor.DYES[stack.getItemDamage()]; String colourName; - if(StatCollector.canTranslate(getUnlocalizedName(stack) + "." + colour.dyeName)) + if(I18n.canTranslate(getUnlocalizedName(stack) + "." + colour.dyeName)) { return LangUtils.localize(getUnlocalizedName(stack) + "." + colour.dyeName); } diff --git a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index b0d4cbb78..3bdffad43 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -22,6 +22,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; /* import codechicken.lib.vec.BlockCoord; @@ -42,7 +43,7 @@ public class ItemPartTransmitter extends ItemMultiPart implements IMetaItem } @Override - public IMultipart createPart(World world, BlockPos pos, EnumFacing dir, Vec3 hit, ItemStack stack, EntityPlayer player) + public IMultipart createPart(World world, BlockPos pos, EnumFacing dir, Vec3d hit, ItemStack stack, EntityPlayer player) { TransmitterType type = TransmitterType.values()[stack.getItemDamage()]; diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index 977576a14..57598ce1a 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -15,6 +15,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraft.util.text.TextComponentString; public class PartDiversionTransporter extends PartLogisticalTransporter { @@ -47,11 +48,13 @@ public class PartDiversionTransporter extends PartLogisticalTransporter } @Override - public void writeToNBT(NBTTagCompound nbtTags) + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) { super.writeToNBT(nbtTags); nbtTags.setIntArray("modes", modes); + + return nbtTags; } @Override @@ -124,7 +127,7 @@ public class PartDiversionTransporter extends PartLogisticalTransporter refreshConnections(); notifyPartUpdate(); notifyTileChange(); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.configurator.toggleDiverter") + ": " + EnumColor.RED + description)); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.configurator.toggleDiverter") + ": " + EnumColor.RED + description)); Coord4D coord = new Coord4D(getPos(), getWorld()); Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, getNetworkedData(new ArrayList())), new Range4D(coord)); diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index ec7a987ec..82bea838f 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -12,6 +12,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.MekanismItems; import mekanism.common.block.states.BlockStateFacing; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -165,7 +166,7 @@ public class PartGlowPanel extends Multipart implements IOccludingPart } @Override - public BlockState createBlockState() + public BlockStateContainer createBlockState() { return new GlowPanelBlockState(); } diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index 0d80bff63..04ee5bbb5 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -34,6 +34,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.text.TextComponentString; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.util.Constants.NBT; @@ -336,7 +337,7 @@ public class PartLogisticalTransporter extends PartTransmitter 0) { - data.add(valveFluid.getName()); + data.add(FluidRegistry.getFluidName(valveFluid)); } if(fluidTank.getFluid() != null) { data.add(1); - data.add(fluidTank.getFluid().getFluid().getName()); + data.add(FluidRegistry.getFluidName(fluidTank.getFluid())); data.add(fluidTank.getFluid().amount); } else { @@ -449,7 +451,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc if(!worldObj.isRemote) { setActive(!getActive()); - worldObj.playSoundEffect(getPos().getX(), getPos().getY(), getPos().getZ(), "random.click", 0.3F, 1); + worldObj.playSound(null, getPos().getX(), getPos().getY(), getPos().getZ(), SoundEvents.UI_BUTTON_CLICK, SoundCategory.BLOCKS, 0.3F, 1); } return true; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index effbe744b..c39567b9e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -33,6 +33,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; +import net.minecraft.util.text.TextComponentString; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.Fluid; @@ -266,7 +267,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen if(fluidTank.getFluid() != null) { data.add(1); - data.add(fluidTank.getFluid().getFluid().getName()); + data.add(FluidRegistry.getFluidName(fluidTank.getFluid())); data.add(fluidTank.getFluid().amount); } else { @@ -490,7 +491,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen usedNodes.clear(); finishedCalc = false; - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurator.plenisherReset"))); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurator.plenisherReset"))); return true; } diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 1aa568b1a..004ed91c8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -27,6 +27,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.text.TextComponentString; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -436,7 +437,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement { mode = !mode; String modeText = " " + (mode ? EnumColor.DARK_RED : EnumColor.DARK_GREEN) + LangUtils.transOutputInput(mode) + "."; - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurator.inductionPortMode") + modeText)); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurator.inductionPortMode") + modeText)); Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); markDirty(); diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index 6e4913553..90bf3f72f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -16,7 +16,7 @@ import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; -import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -59,7 +59,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc if(hitCoord != null) { - Block blockHit = hitCoord.getBlock(worldObj); + IBlockState blockHit = hitCoord.getBlockState(worldObj); TileEntity tileHit = hitCoord.getTileEntity(worldObj); float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); @@ -91,7 +91,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc if(hitCoord != null) { - Block blockHit = hitCoord.getBlock(worldObj); + IBlockState blockHit = hitCoord.getBlockState(worldObj); TileEntity tileHit = hitCoord.getTileEntity(worldObj); float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 45bf44122..52f46a3db 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -19,11 +19,12 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.MekanismUtils; -import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -86,7 +87,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement if(hitCoord != null) { - Block blockHit = hitCoord.getBlock(worldObj); + IBlockState blockHit = hitCoord.getBlockState(worldObj); TileEntity tileHit = hitCoord.getTileEntity(worldObj); float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); @@ -138,7 +139,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement if(hitCoord != null) { - Block blockHit = hitCoord.getBlock(worldObj); + IBlockState blockHit = hitCoord.getBlockState(worldObj); TileEntity tileHit = hitCoord.getTileEntity(worldObj); float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index fbc557f68..906f0f526 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -16,11 +16,12 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; -import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityLaserTractorBeam extends TileEntityContainerBlock implements ILaserReceptor, ISecurityTile @@ -74,7 +75,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme if(hitCoord != null) { - Block blockHit = hitCoord.getBlock(worldObj); + IBlockState blockHit = hitCoord.getBlockState(worldObj); TileEntity tileHit = hitCoord.getTileEntity(worldObj); float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) @@ -113,7 +114,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme if(hitCoord != null) { - Block blockHit = hitCoord.getBlock(worldObj); + IBlockState blockHit = hitCoord.getBlockState(worldObj); TileEntity tileHit = hitCoord.getTileEntity(worldObj); float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) diff --git a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java index 26e44341f..c170543a3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java @@ -10,6 +10,7 @@ import mekanism.common.base.IUpgradeTile; import mekanism.common.base.SoundWrapper; import net.minecraft.client.audio.ISound.AttenuationType; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.Vec3d; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -81,9 +82,9 @@ public abstract class TileEntityNoisyElectricBlock extends TileEntityElectricBlo @Override @SideOnly(Side.CLIENT) - public Vec3 getSoundPosition() + public Vec3d getSoundPosition() { - return new Vec3(getPos()).addVector(0.5, 0.5, 0.5); + return new Vec3d(getPos()).addVector(0.5, 0.5, 0.5); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 2c93e3b4b..aed1b0623 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -14,6 +14,7 @@ import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; import mekanism.api.transmitters.TransmissionType; +import mekanism.common.PacketHandler; import mekanism.common.SideData; import mekanism.common.Upgrade; import mekanism.common.base.ISustainedData; @@ -216,7 +217,7 @@ public class TileEntityPRC extends TileEntityBasicMachine 0) && (lidAngle == 0.0F)) { - worldObj.playSoundEffect(getPos().getX() + 0.5F, getPos().getY() + 0.5D, getPos().getZ() + 0.5F, "random.chestopen", 0.5F, (worldObj.rand.nextFloat()*0.1F) + 0.9F); + worldObj.playSound(null, getPos().getX() + 0.5F, getPos().getY() + 0.5D, getPos().getZ() + 0.5F, SoundEvents.BLOCK_CHEST_OPEN, SoundCategory.BLOCKS, 0.5F, (worldObj.rand.nextFloat()*0.1F) + 0.9F); } if((playersUsing.size() == 0 && lidAngle > 0.0F) || (playersUsing.size() > 0 && lidAngle < 1.0F)) @@ -59,7 +61,7 @@ public class TileEntityPersonalChest extends TileEntityContainerBlock implements if(lidAngle < split && angle >= split) { - worldObj.playSoundEffect(getPos().getX() + 0.5D, getPos().getY() + 0.5D, getPos().getZ() + 0.5D, "random.chestclosed", 0.5F, (worldObj.rand.nextFloat()*0.1F) + 0.9F); + worldObj.playSound(null, getPos().getX() + 0.5D, getPos().getY() + 0.5D, getPos().getZ() + 0.5D, SoundEvents.BLOCK_CHEST_CLOSE, SoundCategory.BLOCKS, 0.5F, (worldObj.rand.nextFloat()*0.1F) + 0.9F); } if(lidAngle < 0.0F) diff --git a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java index 1bc467596..91015e06e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java @@ -33,7 +33,7 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac @Override public GasStack getItemGas(ItemStack itemstack) { - if(itemstack.isItemEqual(new ItemStack(Items.flint))) return new GasStack(GasRegistry.getGas("oxygen"), 10); + if(itemstack.isItemEqual(new ItemStack(Items.FLINT))) return new GasStack(GasRegistry.getGas("oxygen"), 10); if(Block.getBlockFromItem(itemstack.getItem()) == MekanismBlocks.GasTank && ((IGasItem)itemstack.getItem()).getGas(itemstack) != null && ((IGasItem)itemstack.getItem()).getGas(itemstack).getGas() == GasRegistry.getGas("oxygen")) return new GasStack(GasRegistry.getGas("oxygen"), 1); diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 5cf55f08c..a7a6f324c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -321,7 +321,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp if(fluidTank.getFluid() != null) { data.add(true); - data.add(fluidTank.getFluid().getFluid().getName()); + data.add(FluidRegistry.getFluidName(fluidTank.getFluid())); data.add(fluidTank.getFluid().amount); } else { diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index 31cd432ad..ef98bced5 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -34,6 +34,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.world.biome.BiomeDesert; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; @@ -147,7 +148,7 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im public boolean isDesert() { - return worldObj.provider.getBiomeGenForCoords(getPos()) instanceof BiomeGenDesert; + return worldObj.provider.getBiomeForCoords(getPos()) instanceof BiomeDesert; } public SolarNeutronRecipe getRecipe() diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 3a5ff459c..467feae9e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -32,8 +32,12 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.play.server.SPacketEntityEffect; +import net.minecraft.network.play.server.SPacketRespawn; +import net.minecraft.network.play.server.SPacketSetExperience; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.EnumFacing; @@ -50,7 +54,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityTeleporter extends TileEntityElectricBlock implements IComputerIntegration, IChunkLoader, IFrequencyHandler, IRedstoneControl, ISecurityTile { - private MinecraftServer server = MinecraftServer.getServer(); + private MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); public AxisAlignedBB teleportBounds = null; @@ -388,7 +392,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo setEnergy(getEnergy() - calculateEnergyCost(entity, closestCoords)); - worldObj.playSoundAtEntity(entity, "mob.endermen.portal", 1.0F, 1.0F); + worldObj.playSound(entity.posX, entity.posY, entity.posZ, SoundEvents.ENTITY_ENDERMEN_TELEPORT, entity.getSoundCategory(), 1.0F, 1.0F, false); } } } @@ -401,8 +405,8 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo WorldServer oldWorld = player.mcServer.worldServerForDimension(player.dimension); player.dimension = coord.dimensionId; WorldServer newWorld = player.mcServer.worldServerForDimension(player.dimension); - player.playerNetServerHandler.sendPacket(new S07PacketRespawn(player.dimension, player.worldObj.getDifficulty(), newWorld.getWorldInfo().getTerrainType(), player.theItemInWorldManager.getGameType())); - oldWorld.removePlayerEntityDangerously(player); + player.connection.sendPacket(new SPacketRespawn(player.dimension, player.worldObj.getDifficulty(), newWorld.getWorldInfo().getTerrainType(), player.interactionManager.getGameType())); + oldWorld.removeEntityDangerously(player); player.isDead = false; if(player.isEntityAlive()) @@ -413,23 +417,23 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo player.setWorld(newWorld); } - player.mcServer.getConfigurationManager().preparePlayer(player, oldWorld); - player.playerNetServerHandler.setPlayerLocation(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, player.rotationYaw, player.rotationPitch); - player.theItemInWorldManager.setWorld(newWorld); - player.mcServer.getConfigurationManager().updateTimeAndWeatherForPlayer(player, newWorld); - player.mcServer.getConfigurationManager().syncPlayerInventory(player); + player.mcServer.getPlayerList().preparePlayer(player, oldWorld); + player.connection.setPlayerLocation(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, player.rotationYaw, player.rotationPitch); + player.interactionManager.setWorld(newWorld); + player.mcServer.getPlayerList().updateTimeAndWeatherForPlayer(player, newWorld); + player.mcServer.getPlayerList().syncPlayerInventory(player); for(PotionEffect potioneffect : player.getActivePotionEffects()) { - player.playerNetServerHandler.sendPacket(new S1DPacketEntityEffect(player.getEntityId(), potioneffect)); + player.connection.sendPacket(new SPacketEntityEffect(player.getEntityId(), potioneffect)); } - player.playerNetServerHandler.sendPacket(new S1FPacketSetExperience(player.experience, player.experienceTotal, player.experienceLevel)); // Force XP sync + player.connection.sendPacket(new SPacketSetExperience(player.experience, player.experienceTotal, player.experienceLevel)); // Force XP sync FMLCommonHandler.instance().firePlayerChangedDimensionEvent(player, id, coord.dimensionId); } else { - player.playerNetServerHandler.setPlayerLocation(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, player.rotationYaw, player.rotationPitch); + player.connection.setPlayerLocation(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, player.rotationYaw, player.rotationPitch); } } @@ -437,7 +441,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { WorldServer world = server.worldServerForDimension(coord.dimensionId); - if(entity.worldObj.provider.getDimensionId() != coord.dimensionId) + if(entity.worldObj.provider.getDimension() != coord.dimensionId) { entity.worldObj.removeEntity(entity); entity.isDead = false; @@ -499,7 +503,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo } } - player.playerNetServerHandler.setPlayerLocation(player.posX, player.posY, player.posZ, yaw, player.rotationPitch); + player.connection.setPlayerLocation(player.posX, player.posY, player.posZ, yaw, player.rotationPitch); } public List getToTeleport() @@ -522,7 +526,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { int energyCost = 1000; - if(entity.worldObj.provider.getDimensionId() != coords.dimensionId) + if(entity.worldObj.provider.getDimension() != coords.dimensionId) { energyCost+=10000; } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 15d68c0dd..6da6fda82 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -271,7 +271,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva { if(!temperatureSet) { - biomeTemp = worldObj.getBiomeGenForCoordsBody(getPos()).getFloatTemperature(getPos()); + biomeTemp = worldObj.getBiomeForCoordsBody(getPos()).getFloatTemperature(getPos()); temperatureSet = true; } @@ -625,7 +625,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva if(inputTank.getFluid() != null) { data.add(true); - data.add(inputTank.getFluid().getFluid().getName()); + data.add(FluidRegistry.getFluidName(inputTank.getFluid())); data.add(inputTank.getFluid().amount); } else { @@ -635,7 +635,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva if(outputTank.getFluid() != null) { data.add(true); - data.add(outputTank.getFluid().getFluid().getName()); + data.add(FluidRegistry.getFluidName(outputTank.getFluid())); data.add(outputTank.getFluid().amount); } else { diff --git a/src/main/java/mekanism/common/util/ChargeUtils.java b/src/main/java/mekanism/common/util/ChargeUtils.java index 8348284a9..92701d14a 100644 --- a/src/main/java/mekanism/common/util/ChargeUtils.java +++ b/src/main/java/mekanism/common/util/ChargeUtils.java @@ -51,7 +51,7 @@ public final class ChargeUtils storer.setEnergy(storer.getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_TE)); } - else if(inv.getStackInSlot(slotID).getItem() == Items.redstone && storer.getEnergy()+ general.ENERGY_PER_REDSTONE <= storer.getMaxEnergy()) + else if(inv.getStackInSlot(slotID).getItem() == Items.REDSTONE && storer.getEnergy()+ general.ENERGY_PER_REDSTONE <= storer.getMaxEnergy()) { storer.setEnergy(storer.getEnergy() + general.ENERGY_PER_REDSTONE); inv.getStackInSlot(slotID).stackSize--; @@ -107,7 +107,7 @@ public final class ChargeUtils return (MekanismUtils.useIC2() && itemstack.getItem() instanceof IElectricItem && ((IElectricItem)itemstack.getItem()).canProvideEnergy(itemstack)) || (itemstack.getItem() instanceof IEnergizedItem && ((IEnergizedItem)itemstack.getItem()).canSend(itemstack)) || (MekanismUtils.useRF() && itemstack.getItem() instanceof IEnergyContainerItem && ((IEnergyContainerItem)itemstack.getItem()).extractEnergy(itemstack, 1, true) != 0) || - itemstack.getItem() == Items.redstone; + itemstack.getItem() == Items.REDSTONE; } /** diff --git a/src/main/java/mekanism/common/util/ItemRegistryUtils.java b/src/main/java/mekanism/common/util/ItemRegistryUtils.java index 514fd268c..0418b530a 100644 --- a/src/main/java/mekanism/common/util/ItemRegistryUtils.java +++ b/src/main/java/mekanism/common/util/ItemRegistryUtils.java @@ -37,7 +37,7 @@ public final class ItemRegistryUtils populateMap(); } - ResourceLocation itemResourceLocation = Item.itemRegistry.getNameForObject(stack.getItem()); + ResourceLocation itemResourceLocation = Item.REGISTRY.getNameForObject(stack.getItem()); String modId = itemResourceLocation.getResourceDomain(); String lowercaseModId = modId.toLowerCase(Locale.ENGLISH); String modName = modIDMap.get(lowercaseModId); diff --git a/src/main/java/mekanism/common/util/LangUtils.java b/src/main/java/mekanism/common/util/LangUtils.java index 0b3d1a3e1..172253907 100644 --- a/src/main/java/mekanism/common/util/LangUtils.java +++ b/src/main/java/mekanism/common/util/LangUtils.java @@ -1,6 +1,7 @@ package mekanism.common.util; import mekanism.api.gas.GasStack; +import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fluids.FluidStack; public final class LangUtils @@ -37,6 +38,6 @@ public final class LangUtils */ public static String localize(String s) { - return StatCollector.translateToLocal(s); + return I18n.translateToLocal(s); } } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 07dbd71d4..06a75c496 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -77,6 +77,9 @@ import net.minecraft.util.EnumFacing.Axis; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -128,28 +131,28 @@ public final class MekanismUtils if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == 1 || !list.isEmpty()) { - entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); - entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " " + LangUtils.localize("update.outdated") + ".")); + entityplayer.addChatMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------")); + entityplayer.addChatMessage(new TextComponentString(EnumColor.GREY + " " + LangUtils.localize("update.outdated") + ".")); if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == 1) { - entityplayer.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " Mekanism: " + EnumColor.DARK_RED + Mekanism.versionNumber)); + entityplayer.addChatMessage(new TextComponentString(EnumColor.INDIGO + " Mekanism: " + EnumColor.DARK_RED + Mekanism.versionNumber)); } for(IModule module : list) { - entityplayer.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " Mekanism" + module.getName() + ": " + EnumColor.DARK_RED + module.getVersion())); + entityplayer.addChatMessage(new TextComponentString(EnumColor.INDIGO + " Mekanism" + module.getName() + ": " + EnumColor.DARK_RED + module.getVersion())); } - entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " " + LangUtils.localize("update.consider") + " " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber)); - entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " " + LangUtils.localize("update.newFeatures") + ": " + EnumColor.INDIGO + Mekanism.recentNews)); - entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " " + LangUtils.localize("update.visit") + " " + EnumColor.DARK_GREY + "aidancbrady.com/mekanism" + EnumColor.GREY + " " + LangUtils.localize("update.toDownload") + ".")); - entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); + entityplayer.addChatMessage(new TextComponentString(EnumColor.GREY + " " + LangUtils.localize("update.consider") + " " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber)); + entityplayer.addChatMessage(new TextComponentString(EnumColor.GREY + " " + LangUtils.localize("update.newFeatures") + ": " + EnumColor.INDIGO + Mekanism.recentNews)); + entityplayer.addChatMessage(new TextComponentString(EnumColor.GREY + " " + LangUtils.localize("update.visit") + " " + EnumColor.DARK_GREY + "aidancbrady.com/mekanism" + EnumColor.GREY + " " + LangUtils.localize("update.toDownload") + ".")); + entityplayer.addChatMessage(new TextComponentString(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------")); return true; } else if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == -1) { - entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("update.devBuild") + " " + EnumColor.DARK_GREY + Mekanism.versionNumber)); + entityplayer.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("update.devBuild") + " " + EnumColor.DARK_GREY + Mekanism.versionNumber)); return true; } } @@ -721,14 +724,13 @@ public final class MekanismUtils if(sideCoord.exists(world) && sideCoord.offset(side).exists(world)) { IBlockState blockState = sideCoord.getBlockState(world); - Block block = blockState.getBlock(); - boolean weakPower = block.shouldCheckWeakPower(world, coord.getPos(), side); + boolean weakPower = blockState.getBlock().shouldCheckWeakPower(blockState, world, coord.getPos(), side); if(weakPower && isDirectlyGettingPowered(world, sideCoord)) { return true; } - else if(!weakPower && block.getWeakPower(world, sideCoord.getPos(), blockState, side) > 0) + else if(!weakPower && blockState.getWeakPower(world, sideCoord.getPos(), side) > 0) { return true; } @@ -778,7 +780,7 @@ public final class MekanismUtils Block block1 = offset.getBlock(world); block1.onNeighborChange(world, offset.getPos(), coord.getPos()); - if(block1.isNormalCube(world, offset.getPos())) + if(offset.getBlockState(world).isNormalCube()) { offset = offset.offset(dir); @@ -884,7 +886,7 @@ public final class MekanismUtils return null; } - if((block == Blocks.water || block == Blocks.flowing_water) && state.getValue(BlockLiquid.LEVEL) == 0) + if((block == Blocks.WATER || block == Blocks.FLOWING_WATER) && state.getValue(BlockLiquid.LEVEL) == 0) { if(!filter) { @@ -894,7 +896,7 @@ public final class MekanismUtils return new FluidStack(FluidRegistry.getFluid("heavywater"), 10); } } - else if((block == Blocks.lava || block == Blocks.flowing_lava) && state.getValue(BlockLiquid.LEVEL) == 0) + else if((block == Blocks.LAVA || block == Blocks.FLOWING_LAVA) && state.getValue(BlockLiquid.LEVEL) == 0) { return new FluidStack(FluidRegistry.LAVA, FluidContainerRegistry.BUCKET_VOLUME); } @@ -948,11 +950,11 @@ public final class MekanismUtils } else if(fluid == FluidRegistry.WATER) { - return Blocks.flowing_water; + return Blocks.FLOWING_WATER; } else if(fluid == FluidRegistry.LAVA) { - return Blocks.flowing_lava; + return Blocks.FLOWING_LAVA; } else { return fluid.getBlock(); @@ -983,7 +985,7 @@ public final class MekanismUtils player.openContainer = new ContainerPersonalChest(player.inventory, tileEntity, inventory, isBlock); player.openContainer.windowId = id; - player.openContainer.onCraftGuiOpened(player); + player.openContainer.addListener(player); } /** @@ -1091,9 +1093,9 @@ public final class MekanismUtils { double reach = Mekanism.proxy.getReach(player); - Vec3 headVec = getHeadVec(player); - Vec3 lookVec = player.getLook(1); - Vec3 endVec = headVec.addVector(lookVec.xCoord*reach, lookVec.yCoord*reach, lookVec.zCoord*reach); + Vec3d headVec = getHeadVec(player); + Vec3d lookVec = player.getLook(1); + Vec3d endVec = headVec.addVector(lookVec.xCoord*reach, lookVec.yCoord*reach, lookVec.zCoord*reach); return world.rayTraceBlocks(headVec, endVec, true); } @@ -1103,7 +1105,7 @@ public final class MekanismUtils * @param player - player to check * @return head location */ - private static Vec3 getHeadVec(EntityPlayer player) + private static Vec3d getHeadVec(EntityPlayer player) { double posX = player.posX; double posY = player.posY; @@ -1119,7 +1121,7 @@ public final class MekanismUtils } } - return new Vec3(posX, posY, posZ); + return new Vec3d(posX, posY, posZ); } /** @@ -1420,7 +1422,7 @@ public final class MekanismUtils */ public static boolean isOp(EntityPlayerMP player) { - return general.opsBypassRestrictions && player.mcServer.getConfigurationManager().canSendCommands(player.getGameProfile()); + return general.opsBypassRestrictions && player.mcServer.getPlayerList().canSendCommands(player.getGameProfile()); } /** diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index 9fdc1b2a5..a59de1d3f 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -13,14 +13,14 @@ import net.minecraft.world.World; public final class MinerUtils { - public static List specialSilkIDs = ListUtils.asList(Blocks.ice); + public static List specialSilkIDs = ListUtils.asList(Blocks.ICE); public static List getDrops(World world, Coord4D obj, boolean silk) { IBlockState state = obj.getBlockState(world); Block block = state.getBlock(); - if(block == null || block.isAir(world, obj.getPos())) + if(block == null || block.isAir(state, world, obj.getPos())) { return new ArrayList(); } diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index d2094aee5..cd1b2c7db 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -278,7 +278,7 @@ public class RecipeUtils } else if(nbtTags.hasKey("itemname")) { - Object obj = Item.itemRegistry.getObject(new ResourceLocation(nbtTags.getString("itemname"))); + Object obj = Item.REGISTRY.getObject(new ResourceLocation(nbtTags.getString("itemname"))); if(obj != null) { @@ -287,7 +287,7 @@ public class RecipeUtils } else if(nbtTags.hasKey("blockname")) { - Object obj = Block.blockRegistry.getObject(new ResourceLocation(nbtTags.getString("blockname"))); + Object obj = Block.REGISTRY.getObject(new ResourceLocation(nbtTags.getString("blockname"))); if(obj != null) { diff --git a/src/main/java/mekanism/common/util/SecurityUtils.java b/src/main/java/mekanism/common/util/SecurityUtils.java index 7df991538..8455baaf0 100644 --- a/src/main/java/mekanism/common/util/SecurityUtils.java +++ b/src/main/java/mekanism/common/util/SecurityUtils.java @@ -13,6 +13,7 @@ import mekanism.common.security.SecurityFrequency; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.text.TextComponentString; import net.minecraftforge.fml.relauncher.Side; public final class SecurityUtils @@ -110,7 +111,7 @@ public final class SecurityUtils public static void displayNoAccess(EntityPlayer player) { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("gui.noAccessDesc"))); + player.addChatMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("gui.noAccessDesc"))); } public static SecurityMode getSecurity(ISecurityTile security, Side side) diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java index 32fd6ac0c..fca110a0c 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -109,7 +109,7 @@ public final class TransporterUtils public static float[] getStackPosition(ILogisticalTransporter tileEntity, TransporterStack stack, float partial) { - Coord4D offset = new Coord4D(0, 0, 0, tileEntity.world().provider.getDimensionId()).offset(stack.getSide(tileEntity)); + Coord4D offset = new Coord4D(0, 0, 0, tileEntity.world().provider.getDimension()).offset(stack.getSide(tileEntity)); float progress = (((float)stack.progress + partial) / 100F) - 0.5F; return new float[] {0.5F + offset.xCoord*progress, 0.25F + offset.yCoord*progress, 0.5F + offset.zCoord*progress}; diff --git a/src/main/java/mekanism/common/voice/VoiceConnection.java b/src/main/java/mekanism/common/voice/VoiceConnection.java index 1501f4d31..a8aabd629 100644 --- a/src/main/java/mekanism/common/voice/VoiceConnection.java +++ b/src/main/java/mekanism/common/voice/VoiceConnection.java @@ -48,7 +48,7 @@ public class VoiceConnection extends Thread while(username == null && retryCount <= 100) { try { - List l = Collections.synchronizedList((List)((ArrayList)server.getConfigurationManager().playerEntityList).clone()); + List l = Collections.synchronizedList((List)((ArrayList)server.getPlayerList().getPlayerList()).clone()); for(Object obj : l) { @@ -198,6 +198,6 @@ public class VoiceConnection extends Thread public EntityPlayerMP getPlayer() { - return server.getConfigurationManager().getPlayerByUsername(username); + return server.getPlayerList().getPlayerByUsername(username); } } diff --git a/src/main/java/mekanism/common/world/GenHandler.java b/src/main/java/mekanism/common/world/GenHandler.java index 9afb4f731..2bba63c23 100644 --- a/src/main/java/mekanism/common/world/GenHandler.java +++ b/src/main/java/mekanism/common/world/GenHandler.java @@ -7,6 +7,7 @@ import mekanism.common.MekanismBlocks; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraft.world.chunk.IChunkGenerator; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderEnd; import net.minecraft.world.gen.ChunkProviderHell; @@ -16,7 +17,7 @@ import net.minecraftforge.fml.common.IWorldGenerator; public class GenHandler implements IWorldGenerator { @Override - public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) + public void generate(Random random, int chunkX, int chunkZ, World world, IChunkGenerator chunkGenerator, IChunkProvider chunkProvider) { if(!(chunkGenerator instanceof ChunkProviderHell) && !(chunkGenerator instanceof ChunkProviderEnd)) { diff --git a/src/main/java/mekanism/common/world/WorldGenSalt.java b/src/main/java/mekanism/common/world/WorldGenSalt.java index 1420156f9..9e76bbe6d 100644 --- a/src/main/java/mekanism/common/world/WorldGenSalt.java +++ b/src/main/java/mekanism/common/world/WorldGenSalt.java @@ -25,7 +25,7 @@ public class WorldGenSalt extends WorldGenerator @Override public boolean generate(World world, Random random, BlockPos pos) { - if(world.getBlockState(pos).getBlock().getMaterial() != Material.water) + if(world.getBlockState(pos).getMaterial() != Material.WATER) { return false; } @@ -47,7 +47,7 @@ public class WorldGenSalt extends WorldGenerator BlockPos newPos = new BlockPos(xPos, yPos, zPos); Block block = world.getBlockState(newPos).getBlock(); - if(block == Blocks.dirt || block == Blocks.clay || block == MekanismBlocks.SaltBlock) + if(block == Blocks.DIRT || block == Blocks.CLAY || block == MekanismBlocks.SaltBlock) { world.setBlockState(newPos, blockGen.getDefaultState(), 2); } diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index 99530370a..1aaad8470 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -119,11 +119,11 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy for(String s : CUSTOM_RENDERS) { ModelResourceLocation model = new ModelResourceLocation("mekanismgenerators:" + s, "inventory"); - Object obj = event.modelRegistry.getObject(model); + Object obj = event.getModelRegistry().getObject(model); if(obj instanceof IBakedModel) { - event.modelRegistry.putObject(model, new GeneratorItemModelFactory((IBakedModel)obj)); + event.getModelRegistry().putObject(model, new GeneratorItemModelFactory((IBakedModel)obj)); } } } diff --git a/src/main/java/mekanism/generators/client/jei/GeneratorsJEI.java b/src/main/java/mekanism/generators/client/jei/GeneratorsJEI.java index a5d90446e..905a886f1 100644 --- a/src/main/java/mekanism/generators/client/jei/GeneratorsJEI.java +++ b/src/main/java/mekanism/generators/client/jei/GeneratorsJEI.java @@ -2,12 +2,9 @@ package mekanism.generators.client.jei; import mekanism.client.jei.MekanismJEI; import mekanism.generators.common.GeneratorsBlocks; -import mezz.jei.api.IItemRegistry; -import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; -import mezz.jei.api.IRecipeRegistry; import mezz.jei.api.JEIPlugin; import net.minecraft.item.Item; @@ -20,15 +17,6 @@ public class GeneratorsJEI implements IModPlugin registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(GeneratorsBlocks.Generator), MekanismJEI.UNUSED_TAGS); } - @Override - public void onItemRegistryAvailable(IItemRegistry registry) {} - - @Override - public void onJeiHelpersAvailable(IJeiHelpers helpers) {} - - @Override - public void onRecipeRegistryAvailable(IRecipeRegistry registry) {} - @Override public void onRuntimeAvailable(IJeiRuntime runtime) {} } diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index c87eb64e3..5e59aafb2 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -36,6 +36,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -50,6 +51,7 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.IExtendedBlockState; @@ -122,7 +124,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock @Override public IBlockState getExtendedState(IBlockState stateIn, IBlockAccess w, BlockPos pos) { - if(stateIn.getBlock() == null || stateIn.getBlock().getMaterial() == Material.air) + if(stateIn.getBlock() == null || stateIn.getMaterial() == Material.AIR) { return stateIn; } @@ -134,7 +136,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock } @Override - public BlockState createBlockState() + public BlockStateContainer createBlockState() { return new BlockStateGenerator(this, getTypeProperty()); } diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index dbcfae65a..2c7fe63fd 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -22,6 +22,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; @@ -29,6 +30,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -44,7 +47,7 @@ public abstract class BlockReactor extends BlockContainer implements ICTMBlock public BlockReactor() { - super(Material.iron); + super(Material.IRON); setHardness(3.5F); setResistance(8F); setCreativeTab(Mekanism.tabMekanism); @@ -103,7 +106,7 @@ public abstract class BlockReactor extends BlockContainer implements ICTMBlock @Override public IBlockState getExtendedState(IBlockState stateIn, IBlockAccess w, BlockPos pos) { - if(stateIn.getBlock() == null || stateIn.getBlock().getMaterial() == Material.air) + if(stateIn.getBlock() == null || stateIn.getMaterial() == Material.AIR) { return stateIn; } @@ -115,7 +118,7 @@ public abstract class BlockReactor extends BlockContainer implements ICTMBlock } @Override - public BlockState createBlockState() + public BlockStateContainer createBlockState() { return new BlockStateReactor(this, getTypeProperty()); } @@ -230,25 +233,25 @@ public abstract class BlockReactor extends BlockContainer implements ICTMBlock } @Override - public EnumWorldBlockLayer getBlockLayer() + public BlockRenderLayer getBlockLayer() { - return this == GeneratorsBlocks.Reactor ? EnumWorldBlockLayer.CUTOUT : EnumWorldBlockLayer.TRANSLUCENT; + return this == GeneratorsBlocks.Reactor ? BlockRenderLayer.CUTOUT : BlockRenderLayer.TRANSLUCENT; } @Override - public int getRenderType() + public EnumBlockRenderType getRenderType(IBlockState state) { - return 3; + return EnumBlockRenderType.MODEL; } @Override - public boolean isOpaqueCube() + public boolean isOpaqueCube(IBlockState state) { return false; } @Override - public boolean isFullCube() + public boolean isFullCube(IBlockState state) { return false; } diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java index f88205f7b..17e139cd5 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java @@ -152,7 +152,7 @@ public class TurbineUpdateProtocol extends UpdateProtocol EFFECTIVE_ON = Sets.newHashSet(new Block[] {Blocks.PLANKS, Blocks.BOOKSHELF, Blocks.LOG, Blocks.LOG2, Blocks.CHEST, Blocks.PUMPKIN, Blocks.LIT_PUMPKIN, Blocks.MELON_BLOCK, Blocks.LADDER, Blocks.WOODEN_BUTTON, Blocks.WOODEN_PRESSURE_PLATE}); public ItemMekanismAxe(ToolMaterial enumtoolmaterial) { - super(3, enumtoolmaterial, blocksEffectiveAgainst); + super(3, enumtoolmaterial, EFFECTIVE_ON); } @Override @@ -26,12 +30,4 @@ public class ItemMekanismAxe extends ItemMekanismTool return super.getDigSpeed(itemstack, blockState); } } - - static - { - blocksEffectiveAgainst = (new Block[] - { - Blocks.planks, Blocks.bookshelf, Blocks.log, Blocks.log2, Blocks.chest, Blocks.wooden_slab, Blocks.double_wooden_slab, Blocks.pumpkin, Blocks.lit_pumpkin - }); - } } diff --git a/src/main/java/mekanism/tools/item/ItemMekanismTool.java b/src/main/java/mekanism/tools/item/ItemMekanismTool.java index 50fa16fa5..e920f95f3 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismTool.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismTool.java @@ -1,8 +1,7 @@ package mekanism.tools.item; -import java.util.Arrays; -import java.util.HashSet; import java.util.List; +import java.util.Set; import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; @@ -17,9 +16,9 @@ import net.minecraft.item.ItemTool; public class ItemMekanismTool extends ItemTool { - public ItemMekanismTool(int mobBoost, ToolMaterial toolMaterial, Block[] effectiveBlocks) + public ItemMekanismTool(int mobBoost, ToolMaterial toolMaterial, Set effectiveBlocksIn) { - super(mobBoost, toolMaterial, new HashSet(Arrays.asList(effectiveBlocks))); + super(mobBoost, toolMaterial, effectiveBlocksIn); setCreativeTab(Mekanism.tabMekanism); } @@ -48,7 +47,7 @@ public class ItemMekanismTool extends ItemTool } else if(material == MekanismTools.toolLAZULI || material == MekanismTools.toolLAZULI2) { - return new ItemStack(Items.dye, 1, 4); + return new ItemStack(Items.DYE, 1, 4); } else if(material == MekanismTools.toolOSMIUM || material == MekanismTools.toolOSMIUM2) { @@ -69,12 +68,4 @@ public class ItemMekanismTool extends ItemTool return material.getRepairItemStack(); } - -/* - @Override - public void registerIcons(IIconRegister register) - { - itemIcon = register.registerIcon("mekanism:" + getUnlocalizedName().replace("item.", "")); - } -*/ }