diff --git a/build.properties b/build.properties index dcaad6982..8ef5fa076 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.12.2 -mappings_version=snapshot_20170625 -forge_version=14.23.2.2634 +mappings_version=stable_39 +forge_version=14.23.5.2808 mcmp_version=2.3.3 jei_version=4.7.0.67 mod_version=9.4.13 diff --git a/src/main/java/mekanism/api/Chunk3D.java b/src/main/java/mekanism/api/Chunk3D.java index 144edfc46..2ee3e5459 100644 --- a/src/main/java/mekanism/api/Chunk3D.java +++ b/src/main/java/mekanism/api/Chunk3D.java @@ -73,7 +73,7 @@ public class Chunk3D */ public Chunk getChunk(World world) { - return world.getChunkFromChunkCoords(x, z); + return world.getChunk(x, z); } /** diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index ad76e1001..ba110231f 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -219,7 +219,7 @@ public class Coord4D return this; } - return new Coord4D(x +(side.getFrontOffsetX()*amount), y +(side.getFrontOffsetY()*amount), z +(side.getFrontOffsetZ()*amount), dimensionId); + return new Coord4D(x +(side.getXOffset()*amount), y +(side.getYOffset()*amount), z +(side.getZOffset()*amount), dimensionId); } public ItemStack getStack(IBlockAccess world) @@ -286,7 +286,7 @@ public class Coord4D for(EnumFacing side : EnumFacing.VALUES) { - if(side.getFrontOffsetX() == diff.x && side.getFrontOffsetY() == diff.y && side.getFrontOffsetZ() == diff.z) + if(side.getXOffset() == diff.x && side.getYOffset() == diff.y && side.getZOffset() == diff.z) { return side; } @@ -335,7 +335,7 @@ public class Coord4D */ public Coord4D step(EnumFacing side) { - return translate(side.getFrontOffsetX(), side.getFrontOffsetY(), side.getFrontOffsetZ()); + return translate(side.getXOffset(), side.getYOffset(), side.getZOffset()); } /** @@ -355,7 +355,7 @@ public class Coord4D */ public Chunk getChunk(World world) { - return world.getChunkFromBlockCoords(getPos()); + return world.getChunk(getPos()); } /** diff --git a/src/main/java/mekanism/api/EnumColor.java b/src/main/java/mekanism/api/EnumColor.java index 3657932a0..53d9ccb21 100644 --- a/src/main/java/mekanism/api/EnumColor.java +++ b/src/main/java/mekanism/api/EnumColor.java @@ -70,7 +70,7 @@ public enum EnumColor implements IStringSerializable return I18n.translateToLocal("color." + unlocalizedName); } - public String getUnlocalizedName(){ + public String getTranslationKey(){ return "color." + unlocalizedName; } @@ -94,7 +94,7 @@ public enum EnumColor implements IStringSerializable } public ITextComponent getTranslatedColouredComponent(){ - ITextComponent t = new TextComponentTranslation(getUnlocalizedName()); + ITextComponent t = new TextComponentTranslation(getTranslationKey()); t.getStyle().setColor(textFormatting); return t; } diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java index 152a9a012..3fa7e7a7f 100644 --- a/src/main/java/mekanism/api/gas/Gas.java +++ b/src/main/java/mekanism/api/gas/Gas.java @@ -95,7 +95,7 @@ public class Gas * Gets the unlocalized name of this Gas. * @return this Gas's unlocalized name */ - public String getUnlocalizedName() + public String getTranslationKey() { return "gas." + unlocalizedName; } @@ -106,7 +106,7 @@ public class Gas */ public String getLocalizedName() { - return I18n.translateToLocal(getUnlocalizedName()); + return I18n.translateToLocal(getTranslationKey()); } /** @@ -114,7 +114,7 @@ public class Gas * @param s - unlocalized name to set * @return this Gas object */ - public Gas setUnlocalizedName(String s) + public Gas setTranslationKey(String s) { unlocalizedName = s; @@ -210,7 +210,7 @@ public class Gas */ public static Gas readFromNBT(NBTTagCompound nbtTags) { - if(nbtTags == null || nbtTags.hasNoTags()) + if(nbtTags == null || nbtTags.isEmpty()) { return null; } diff --git a/src/main/java/mekanism/api/gas/GasStack.java b/src/main/java/mekanism/api/gas/GasStack.java index 05e5ae689..716380178 100644 --- a/src/main/java/mekanism/api/gas/GasStack.java +++ b/src/main/java/mekanism/api/gas/GasStack.java @@ -83,7 +83,7 @@ public class GasStack */ public static GasStack readFromNBT(NBTTagCompound nbtTags) { - if(nbtTags == null || nbtTags.hasNoTags()) + if(nbtTags == null || nbtTags.isEmpty()) { return null; } diff --git a/src/main/java/mekanism/api/gas/GasTank.java b/src/main/java/mekanism/api/gas/GasTank.java index 2b86467c6..a7435a7a5 100644 --- a/src/main/java/mekanism/api/gas/GasTank.java +++ b/src/main/java/mekanism/api/gas/GasTank.java @@ -239,7 +239,7 @@ public class GasTank implements GasTankInfo */ public static GasTank readFromNBT(NBTTagCompound nbtTags) { - if(nbtTags == null || nbtTags.hasNoTags()) + if(nbtTags == null || nbtTags.isEmpty()) { return null; } diff --git a/src/main/java/mekanism/api/infuse/InfuseType.java b/src/main/java/mekanism/api/infuse/InfuseType.java index c55790961..063b88cad 100644 --- a/src/main/java/mekanism/api/infuse/InfuseType.java +++ b/src/main/java/mekanism/api/infuse/InfuseType.java @@ -34,7 +34,7 @@ public final class InfuseType sprite = tex; } - public InfuseType setUnlocalizedName(String name) + public InfuseType setTranslationKey(String name) { unlocalizedName = "infuse." + name; diff --git a/src/main/java/mekanism/api/util/BlockInfo.java b/src/main/java/mekanism/api/util/BlockInfo.java index 2e62b8dce..2ecad09a7 100644 --- a/src/main/java/mekanism/api/util/BlockInfo.java +++ b/src/main/java/mekanism/api/util/BlockInfo.java @@ -32,7 +32,7 @@ public class BlockInfo public int hashCode() { int code = 1; - code = 31 * code + block.getUnlocalizedName().hashCode(); + code = 31 * code + block.getTranslationKey().hashCode(); code = 31 * code + meta; return code; } diff --git a/src/main/java/mekanism/client/CapeBufferDownload.java b/src/main/java/mekanism/client/CapeBufferDownload.java index c9f58f437..96e74467f 100644 --- a/src/main/java/mekanism/client/CapeBufferDownload.java +++ b/src/main/java/mekanism/client/CapeBufferDownload.java @@ -68,7 +68,7 @@ public class CapeBufferDownload extends Thread public ThreadDownloadImageData downloadCape() { try { - File capeFile = new File(resourceLocation.getResourcePath() + ".png"); + File capeFile = new File(resourceLocation.getPath() + ".png"); if(capeFile.exists()) { diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index d8a95a3c2..2346cff3e 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -1100,7 +1100,7 @@ public class ClientProxy extends CommonProxy @Override public File getMinecraftDir() { - return Minecraft.getMinecraft().mcDataDir; + return Minecraft.getMinecraft().gameDir; } @Override diff --git a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java index e587b6d48..774be1bfa 100644 --- a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java @@ -135,7 +135,7 @@ public class GuiSideConfiguration extends GuiMekanism int x = slotPosMap.get(i).xPos; int y = slotPosMap.get(i).yPos; - SideData data = configurable.getConfig().getOutput(currentType, EnumFacing.getFront(i)); + SideData data = configurable.getConfig().getOutput(currentType, EnumFacing.byIndex(i)); if(data != TileComponentConfig.EMPTY) { @@ -184,7 +184,7 @@ public class GuiSideConfiguration extends GuiMekanism int x = slotPosMap.get(i).xPos; int y = slotPosMap.get(i).yPos; - SideData data = configurable.getConfig().getOutput(currentType, EnumFacing.getFront(i)); + SideData data = configurable.getConfig().getOutput(currentType, EnumFacing.byIndex(i)); if(data != TileComponentConfig.EMPTY) { diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index 9ef70872e..7dfc813b1 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -95,9 +95,9 @@ public class GuiTransporterConfig extends GuiMekanism int x = slotPosMap.get(i).xPos; int y = slotPosMap.get(i).yPos; - EnumColor color = configurable.getEjector().getInputColor(EnumFacing.getFront(i)); + EnumColor color = configurable.getEjector().getInputColor(EnumFacing.byIndex(i)); - if(configurable.getConfig().getOutput(TransmissionType.ITEM, EnumFacing.getFront(i)) != TileComponentConfig.EMPTY) + if(configurable.getConfig().getOutput(TransmissionType.ITEM, EnumFacing.byIndex(i)) != TileComponentConfig.EMPTY) { if(color != null) { @@ -153,9 +153,9 @@ public class GuiTransporterConfig extends GuiMekanism int x = slotPosMap.get(i).xPos; int y = slotPosMap.get(i).yPos; - EnumColor color = configurable.getEjector().getInputColor(EnumFacing.getFront(i)); + EnumColor color = configurable.getEjector().getInputColor(EnumFacing.byIndex(i)); - if(configurable.getConfig().getOutput(TransmissionType.ITEM, EnumFacing.getFront(i)) != TileComponentConfig.EMPTY) + if(configurable.getConfig().getOutput(TransmissionType.ITEM, EnumFacing.byIndex(i)) != TileComponentConfig.EMPTY) { if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) { diff --git a/src/main/java/mekanism/client/jei/GasStackHelper.java b/src/main/java/mekanism/client/jei/GasStackHelper.java index 4612c54fe..8870e9982 100644 --- a/src/main/java/mekanism/client/jei/GasStackHelper.java +++ b/src/main/java/mekanism/client/jei/GasStackHelper.java @@ -55,7 +55,7 @@ public class GasStackHelper implements IIngredientHelper @Override public String getModId(GasStack ingredient) { - return ingredient.getGas().getIcon().getResourceDomain(); + return ingredient.getGas().getIcon().getNamespace(); } @Override @@ -67,7 +67,7 @@ public class GasStackHelper implements IIngredientHelper @Override public String getResourceId(GasStack ingredient) { - return ingredient.getGas().getUnlocalizedName(); + return ingredient.getGas().getTranslationKey(); } @Override diff --git a/src/main/java/mekanism/client/render/RenderResizableCuboid.java b/src/main/java/mekanism/client/render/RenderResizableCuboid.java index d431b6eaf..8030b985e 100644 --- a/src/main/java/mekanism/client/render/RenderResizableCuboid.java +++ b/src/main/java/mekanism/client/render/RenderResizableCuboid.java @@ -256,7 +256,7 @@ public class RenderResizableCuboid { if (face == null) { return VEC_ZERO; } - return new Vec3d(face.getFrontOffsetX(), face.getFrontOffsetY(), face.getFrontOffsetZ()); + return new Vec3d(face.getXOffset(), face.getYOffset(), face.getZOffset()); } diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index c38b5ddd3..79c87d225 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -76,7 +76,7 @@ public class RenderTickHandler } } - font.drawStringWithShadow("Block: " + block.getUnlocalizedName(), 1, 1, 0x404040); + font.drawStringWithShadow("Block: " + block.getTranslationKey(), 1, 1, 0x404040); font.drawStringWithShadow("Metadata: " + obj.getBlockState(world), 1, 10, 0x404040); font.drawStringWithShadow("Location: " + MekanismUtils.getCoordDisplay(obj), 1, 19, 0x404040); font.drawStringWithShadow("TileEntity: " + tileDisplay, 1, 28, 0x404040); diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java index 4746da8ba..bcfb5d869 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java @@ -69,9 +69,9 @@ public class MekanismOBJLoader implements ICustomModelLoader for(String s : objModel.getMatLib().getMaterialNames()) { - if(objModel.getMatLib().getMaterial(s).getTexture().getTextureLocation().getResourcePath().startsWith("#")) + if(objModel.getMatLib().getMaterial(s).getTexture().getTextureLocation().getPath().startsWith("#")) { - FMLLog.severe("OBJLoader: Unresolved texture '%s' for obj model '%s'", objModel.getMatLib().getMaterial(s).getTexture().getTextureLocation().getResourcePath(), modelLocation); + FMLLog.severe("OBJLoader: Unresolved texture '%s' for obj model '%s'", objModel.getMatLib().getMaterial(s).getTexture().getTextureLocation().getPath(), modelLocation); builder.put(s, missing); } else { @@ -92,13 +92,13 @@ public class MekanismOBJLoader implements ICustomModelLoader @Override public boolean accepts(ResourceLocation modelLocation) { - return modelLocation.getResourcePath().endsWith(".obj.mek"); + return modelLocation.getPath().endsWith(".obj.mek"); } @Override public IModel loadModel(ResourceLocation loc) throws Exception { - ResourceLocation file = new ResourceLocation(loc.getResourceDomain(), loc.getResourcePath()); + ResourceLocation file = new ResourceLocation(loc.getNamespace(), loc.getPath()); if(!modelCache.containsKey(file)) { @@ -106,12 +106,12 @@ public class MekanismOBJLoader implements ICustomModelLoader if(model instanceof OBJModel) { - if(file.getResourcePath().contains("glow_panel")) + if(file.getPath().contains("glow_panel")) { MekanismOBJModel mekModel = new MekanismOBJModel(OBJModelType.GLOW_PANEL, ((OBJModel)model).getMatLib(), file); modelCache.put(file, mekModel); } - else if(file.getResourcePath().contains("transmitter")) + else if(file.getPath().contains("transmitter")) { MekanismOBJModel mekModel = new MekanismOBJModel(OBJModelType.TRANSMITTER, ((OBJModel)model).getMatLib(), file); modelCache.put(file, mekModel); diff --git a/src/main/java/mekanism/common/CreativeTabMekanism.java b/src/main/java/mekanism/common/CreativeTabMekanism.java index 8ba31a941..f109b4bc9 100644 --- a/src/main/java/mekanism/common/CreativeTabMekanism.java +++ b/src/main/java/mekanism/common/CreativeTabMekanism.java @@ -11,13 +11,7 @@ public class CreativeTabMekanism extends CreativeTabs } @Override - public ItemStack getIconItemStack() - { - return new ItemStack(MekanismItems.AtomicAlloy); - } - - @Override - public ItemStack getTabIconItem() + public ItemStack createIcon() { return new ItemStack(MekanismItems.AtomicAlloy); } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 239c3938e..401c5f695 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -731,13 +731,13 @@ public class Mekanism Mekanism.proxy.preInit(); //Register infuses - InfuseRegistry.registerInfuseType(new InfuseType("CARBON", new ResourceLocation("mekanism:blocks/infuse/Carbon")).setUnlocalizedName("carbon")); - InfuseRegistry.registerInfuseType(new InfuseType("TIN", new ResourceLocation("mekanism:blocks/infuse/Tin")).setUnlocalizedName("tin")); - InfuseRegistry.registerInfuseType(new InfuseType("DIAMOND", new ResourceLocation("mekanism:blocks/infuse/Diamond")).setUnlocalizedName("diamond")); - InfuseRegistry.registerInfuseType(new InfuseType("REDSTONE", new ResourceLocation("mekanism:blocks/infuse/Redstone")).setUnlocalizedName("redstone")); - InfuseRegistry.registerInfuseType(new InfuseType("FUNGI", new ResourceLocation("mekanism:blocks/infuse/Fungi")).setUnlocalizedName("fungi")); - InfuseRegistry.registerInfuseType(new InfuseType("BIO", new ResourceLocation("mekanism:blocks/infuse/Bio")).setUnlocalizedName("bio")); - InfuseRegistry.registerInfuseType(new InfuseType("OBSIDIAN", new ResourceLocation("mekanism:blocks/infuse/Obsidian")).setUnlocalizedName("obsidian")); + InfuseRegistry.registerInfuseType(new InfuseType("CARBON", new ResourceLocation("mekanism:blocks/infuse/Carbon")).setTranslationKey("carbon")); + InfuseRegistry.registerInfuseType(new InfuseType("TIN", new ResourceLocation("mekanism:blocks/infuse/Tin")).setTranslationKey("tin")); + InfuseRegistry.registerInfuseType(new InfuseType("DIAMOND", new ResourceLocation("mekanism:blocks/infuse/Diamond")).setTranslationKey("diamond")); + InfuseRegistry.registerInfuseType(new InfuseType("REDSTONE", new ResourceLocation("mekanism:blocks/infuse/Redstone")).setTranslationKey("redstone")); + InfuseRegistry.registerInfuseType(new InfuseType("FUNGI", new ResourceLocation("mekanism:blocks/infuse/Fungi")).setTranslationKey("fungi")); + InfuseRegistry.registerInfuseType(new InfuseType("BIO", new ResourceLocation("mekanism:blocks/infuse/Bio")).setTranslationKey("bio")); + InfuseRegistry.registerInfuseType(new InfuseType("OBSIDIAN", new ResourceLocation("mekanism:blocks/infuse/Obsidian")).setTranslationKey("obsidian")); Capabilities.registerCapabilities(); } diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 5c36f57bd..98508e31b 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -116,6 +116,6 @@ public class MekanismBlocks public static Block init(Block block, String name) { - return block.setUnlocalizedName(name).setRegistryName("mekanism:" + name); + return block.setTranslationKey(name).setRegistryName("mekanism:" + name); } } diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index 14f2ccc65..19813141f 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -158,6 +158,6 @@ public class MekanismItems public static Item init(Item item, String name) { - return item.setUnlocalizedName(name).setRegistryName("mekanism:" + name); + return item.setTranslationKey(name).setRegistryName("mekanism:" + name); } } diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index 80bb37c26..b6408a33c 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -270,7 +270,7 @@ public interface IFactory return type.getStack(); } - public String getUnlocalizedName() + public String getTranslationKey() { return name; } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 1d61810aa..74c2019e7 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -532,7 +532,7 @@ public abstract class BlockBasic extends Block @SideOnly(Side.CLIENT) @Override - public BlockRenderLayer getBlockLayer() + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } @@ -771,7 +771,7 @@ public abstract class BlockBasic extends Block } tileEntity.setFacing((short)change); - tileEntity.redstone = world.isBlockIndirectlyGettingPowered(pos) > 0; + tileEntity.redstone = world.getRedstonePowerFromNeighbors(pos) > 0; if(tileEntity instanceof TileEntitySecurityDesk) { diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 20d0b0df1..0c16fb9c5 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -148,7 +148,7 @@ public class BlockEnergyCube extends BlockContainer } tileEntity.setFacing((short)change); - tileEntity.redstone = world.isBlockIndirectlyGettingPowered(pos) > 0; + tileEntity.redstone = world.getRedstonePowerFromNeighbors(pos) > 0; } @Override diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index ac0a9fb5a..a3d10aa40 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -113,7 +113,7 @@ public class BlockGasTank extends BlockContainer } tileEntity.setFacing((short)change); - tileEntity.redstone = world.isBlockIndirectlyGettingPowered(pos) > 0; + tileEntity.redstone = world.getRedstonePowerFromNeighbors(pos) > 0; } @Override diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 5b456ea10..d067971a7 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -255,7 +255,7 @@ public abstract class BlockMachine extends BlockContainer } tileEntity.setFacing((short)change); - tileEntity.redstone = world.isBlockIndirectlyGettingPowered(pos) > 0; + tileEntity.redstone = world.getRedstonePowerFromNeighbors(pos) > 0; if(tileEntity instanceof TileEntityLogisticalSorter) { @@ -615,7 +615,7 @@ public abstract class BlockMachine extends BlockContainer @SideOnly(Side.CLIENT) @Override - public BlockRenderLayer getBlockLayer() + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java index 07fa6d5e5..a2a83818a 100644 --- a/src/main/java/mekanism/common/block/BlockObsidianTNT.java +++ b/src/main/java/mekanism/common/block/BlockObsidianTNT.java @@ -38,7 +38,7 @@ public class BlockObsidianTNT extends Block { super.onBlockAdded(world, pos, state); - if(world.isBlockIndirectlyGettingPowered(pos) > 0) + if(world.getRedstonePowerFromNeighbors(pos) > 0) { explode(world, pos); world.setBlockToAir(pos); @@ -48,7 +48,7 @@ public class BlockObsidianTNT extends Block @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block neighborBlock, BlockPos neighborPos) { - if(world.isBlockIndirectlyGettingPowered(pos) > 0) + if(world.getRedstonePowerFromNeighbors(pos) > 0) { explode(world, pos); world.setBlockToAir(pos); @@ -56,7 +56,7 @@ public class BlockObsidianTNT extends Block } @Override - public void onBlockDestroyedByExplosion(World world, BlockPos pos, Explosion explosion) + public void onBlockExploded(World world, BlockPos pos, Explosion explosion) { if(!world.isRemote) { @@ -106,7 +106,7 @@ public class BlockObsidianTNT extends Block } @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity) + public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) { if(entity instanceof EntityArrow && !world.isRemote) { diff --git a/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java b/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java index 82f9cd0c6..d2cd97ca6 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java +++ b/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java @@ -59,7 +59,7 @@ public class BlockStateTransmitter extends ExtendedBlockState return name().toLowerCase(Locale.ROOT); } - public String getUnlocalizedName() + public String getTranslationKey() { return unlocalizedName; } diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java index f5a44dd65..84a74d93f 100644 --- a/src/main/java/mekanism/common/entity/EntityBalloon.java +++ b/src/main/java/mekanism/common/entity/EntityBalloon.java @@ -440,7 +440,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData return false; } else { - setBeenAttacked(); + markVelocityChanged(); if(dmgSource != DamageSource.MAGIC && dmgSource != DamageSource.DROWN && dmgSource != DamageSource.FALL) { diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 98b0250bd..9652f5d83 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -153,7 +153,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine { if(!world.isRemote) { - if(getFollowing() && getOwner() != null && getDistanceSqToEntity(getOwner()) > 4 && !getNavigator().noPath() && getEnergy() > 0) + if(getFollowing() && getOwner() != null && getDistanceSq(getOwner()) > 4 && !getNavigator().noPath() && getEnergy() > 0) { setEnergy(getEnergy() - getRoundedTravelEnergy()); } diff --git a/src/main/java/mekanism/common/entity/ai/RobitAIFollow.java b/src/main/java/mekanism/common/entity/ai/RobitAIFollow.java index a739243d4..eea8b52ab 100644 --- a/src/main/java/mekanism/common/entity/ai/RobitAIFollow.java +++ b/src/main/java/mekanism/common/entity/ai/RobitAIFollow.java @@ -71,7 +71,7 @@ public class RobitAIFollow extends EntityAIBase theRobit.getLookHelper().setLookPositionWithEntity(player, 6.0F, theRobit.getVerticalFaceSpeed()/10); return false; } - else if(theRobit.getDistanceSqToEntity(player) < (minDist * minDist)) + else if(theRobit.getDistanceSq(player) < (minDist * minDist)) { return false; } @@ -88,7 +88,7 @@ public class RobitAIFollow extends EntityAIBase @Override public boolean shouldContinueExecuting() { - return !thePathfinder.noPath() && theRobit.getDistanceSqToEntity(theOwner) > (maxDist * maxDist) && theRobit.getFollowing() && theRobit.getEnergy() > 0 && theOwner.world.provider.getDimension() == theRobit.world.provider.getDimension(); + return !thePathfinder.noPath() && theRobit.getDistanceSq(theOwner) > (maxDist * maxDist) && theRobit.getFollowing() && theRobit.getEnergy() > 0 && theOwner.world.provider.getDimension() == theRobit.world.provider.getDimension(); } @Override @@ -103,7 +103,7 @@ public class RobitAIFollow extends EntityAIBase public void resetTask() { theOwner = null; - thePathfinder.clearPathEntity(); + thePathfinder.clearPath(); theRobit.setPathPriority(PathNodeType.WATER, oldWaterCost); } @@ -120,7 +120,7 @@ public class RobitAIFollow extends EntityAIBase if(!thePathfinder.tryMoveToEntityLiving(theOwner, moveSpeed)) { - if(theRobit.getDistanceSqToEntity(theOwner) >= 144.0D) + if(theRobit.getDistanceSq(theOwner) >= 144.0D) { int x = MathHelper.floor(theOwner.posX) - 2; int y = MathHelper.floor(theOwner.getEntityBoundingBox().minY); @@ -136,7 +136,7 @@ public class RobitAIFollow extends EntityAIBase if((l < 1 || i1 < 1 || l > 3 || i1 > 3) && world.getBlockState(under).isSideSolid(world, under, EnumFacing.UP) && isEmptyBlock(pos) && isEmptyBlock(new BlockPos(x + l, y + 1, z + i1))) { theRobit.setLocationAndAngles((x + l) + 0.5F, y, (z + i1) + 0.5F, theRobit.rotationYaw, theRobit.rotationPitch); - thePathfinder.clearPathEntity(); + thePathfinder.clearPath(); return; } } diff --git a/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java b/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java index 801dce375..affc6a30e 100644 --- a/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java +++ b/src/main/java/mekanism/common/entity/ai/RobitAIPickup.java @@ -58,7 +58,7 @@ public class RobitAIPickup extends EntityAIBase return false; } - if(closest != null && closest.getDistanceSqToEntity(closest) > 100 && thePathfinder.getPathToXYZ(closest.posX, closest.posY, closest.posZ) != null) + if(closest != null && closest.getDistanceSq(closest) > 100 && thePathfinder.getPathToXYZ(closest.posX, closest.posY, closest.posZ) != null) { return true; } @@ -72,7 +72,7 @@ public class RobitAIPickup extends EntityAIBase { EntityItem entity = iter.next(); - double distance = theRobit.getDistanceToEntity(entity); + double distance = theRobit.getDistance(entity); if(distance <= 10) { @@ -100,7 +100,7 @@ public class RobitAIPickup extends EntityAIBase @Override public boolean shouldContinueExecuting() { - return !closest.isDead && !thePathfinder.noPath() && theRobit.getDistanceSqToEntity(closest) > 100 && theRobit.getDropPickup() && theRobit.getEnergy() > 0 && closest.world.provider.getDimension() == theRobit.world.provider.getDimension(); + return !closest.isDead && !thePathfinder.noPath() && theRobit.getDistanceSq(closest) > 100 && theRobit.getDropPickup() && theRobit.getEnergy() > 0 && closest.world.provider.getDimension() == theRobit.world.provider.getDimension(); } @Override @@ -114,7 +114,7 @@ public class RobitAIPickup extends EntityAIBase @Override public void resetTask() { - thePathfinder.clearPathEntity(); + thePathfinder.clearPath(); theRobit.setPathPriority(PathNodeType.WATER, oldWaterCost); } @@ -134,7 +134,7 @@ public class RobitAIPickup extends EntityAIBase if(!thePathfinder.tryMoveToEntityLiving(closest, moveSpeed)) { - if(theRobit.getDistanceSqToEntity(closest) >= 144.0D) + if(theRobit.getDistanceSq(closest) >= 144.0D) { int x = MathHelper.floor(closest.posX) - 2; int y = MathHelper.floor(closest.getEntityBoundingBox().minY); @@ -150,7 +150,7 @@ public class RobitAIPickup extends EntityAIBase if((l < 1 || i1 < 1 || l > 3 || i1 > 3) && world.getBlockState(under).isSideSolid(world, under, EnumFacing.UP) && isEmptyBlock(pos) && isEmptyBlock(new BlockPos(x + l, y + 1, z + i1))) { theRobit.setLocationAndAngles((x + l) + 0.5F, y, (z + i1) + 0.5F, theRobit.rotationYaw, theRobit.rotationPitch); - thePathfinder.clearPathEntity(); + thePathfinder.clearPath(); return; } diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 1ff1a8b1c..da13eb45f 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -262,7 +262,7 @@ public final class MekanismHooks NonNullList seeds = NonNullList.create(); crystalSeed.get().getSubItems(CreativeTabs.SEARCH, seeds);//there appears to be no way to get this via api, so fall back to unloc names for (ItemStack stack : seeds) { - String unloc = crystalSeed.get().getUnlocalizedName(stack); + String unloc = crystalSeed.get().getTranslationKey(stack); if (unloc.endsWith("certus") && pureCertus.isPresent()){ RecipeHandler.addEnrichmentChamberRecipe(stack, pureCertus.get().copy()); } else if (unloc.endsWith("nether") && pureNether.isPresent()){ diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 590d716af..ec2248be5 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -96,7 +96,7 @@ public class ItemAtomicDisassembler extends ItemEnergized } @Override - public float getStrVsBlock(ItemStack itemstack, IBlockState state) + public float getDestroySpeed(ItemStack itemstack, IBlockState state) { return getEnergy(itemstack) != 0 ? getEfficiency(itemstack) : 1F; } @@ -120,7 +120,7 @@ public class ItemAtomicDisassembler extends ItemEnergized Vec3d positionEyes = player.getPositionEyes(1.0F); Vec3d playerLook = player.getLook(1.0F); double blockReachDistance = player.getAttributeMap().getAttributeInstance(EntityPlayer.REACH_DISTANCE).getAttributeValue(); - Vec3d maxReach = positionEyes.addVector(playerLook.x * blockReachDistance, playerLook.y * blockReachDistance, playerLook.z * blockReachDistance); + Vec3d maxReach = positionEyes.add(playerLook.x * blockReachDistance, playerLook.y * blockReachDistance, playerLook.z * blockReachDistance); RayTraceResult res = state.collisionRayTrace(player.world, pos, playerLook, maxReach); //noinspection ConstantConditions - idea thinks it's nonnull due to package level annotations, but it's not return res != null ? res : new RayTraceResult(RayTraceResult.Type.MISS, Vec3d.ZERO, EnumFacing.UP, pos); @@ -171,7 +171,7 @@ public class ItemAtomicDisassembler extends ItemEnergized Block block2 = coord.getBlock(player.world); - block2.onBlockDestroyedByPlayer(player.world, coord.getPos(), state); + block2.onBlockHarvested(player.world, coord.getPos(), state, player); player.world.playEvent(null, 2001, coord.getPos(), Block.getStateId(state)); player.world.setBlockToAir(coord.getPos()); block2.breakBlock(player.world, coord.getPos(), state); diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index 600c4bd1a..f1fa09df2 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -104,9 +104,9 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem EnumColor color = getColor(stack); String dyeName = color.getDyedName(); - if(I18n.canTranslate(getUnlocalizedName(stack) + "." + color.dyeName)) + if(I18n.canTranslate(getTranslationKey(stack) + "." + color.dyeName)) { - return LangUtils.localize(getUnlocalizedName(stack) + "." + color.dyeName); + return LangUtils.localize(getTranslationKey(stack) + "." + color.dyeName); } if(getColor(stack) == EnumColor.BLACK) diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index bf892d760..1a8cdc7f9 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -285,13 +285,13 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt } @Override - public String getUnlocalizedName(ItemStack itemstack) + public String getTranslationKey(ItemStack itemstack) { BasicBlockType type = BasicBlockType.get(itemstack); if(type != null) { - String name = getUnlocalizedName() + "." + type.name; + String name = getTranslationKey() + "." + type.name; if(type == BasicBlockType.BIN || type == BasicBlockType.INDUCTION_CELL || type == BasicBlockType.INDUCTION_PROVIDER) { diff --git a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java index 74cbc1712..0ffe738ce 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java +++ b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java @@ -96,9 +96,9 @@ public class ItemBlockGlowPanel extends ItemBlockMultipartAble EnumColor colour = EnumColor.DYES[itemDamage]; String colourName; - if(I18n.canTranslate(getUnlocalizedName(stack) + "." + colour.dyeName)) + if(I18n.canTranslate(getTranslationKey(stack) + "." + colour.dyeName)) { - return LangUtils.localize(getUnlocalizedName(stack) + "." + colour.dyeName); + return LangUtils.localize(getTranslationKey(stack) + "." + colour.dyeName); } if(colour == EnumColor.BLACK) diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index caff837fc..923c0b66d 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -161,11 +161,11 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } @Override - public String getUnlocalizedName(ItemStack itemstack) + public String getTranslationKey(ItemStack itemstack) { if(MachineType.get(itemstack) != null) { - return getUnlocalizedName() + "." + MachineType.get(itemstack).blockName; + return getTranslationKey() + "." + MachineType.get(itemstack).blockName; } return "null"; @@ -180,9 +180,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { BaseTier tier = type == MachineType.BASIC_FACTORY ? BaseTier.BASIC : (type == MachineType.ADVANCED_FACTORY ? BaseTier.ADVANCED : BaseTier.ELITE); - if(I18n.canTranslate("tile." + tier.getSimpleName() + RecipeType.values()[getRecipeType(itemstack)].getUnlocalizedName() + "Factory")) + if(I18n.canTranslate("tile." + tier.getSimpleName() + RecipeType.values()[getRecipeType(itemstack)].getTranslationKey() + "Factory")) { - return LangUtils.localize("tile." + tier.getSimpleName() + RecipeType.values()[getRecipeType(itemstack)].getUnlocalizedName() + "Factory"); + return LangUtils.localize("tile." + tier.getSimpleName() + RecipeType.values()[getRecipeType(itemstack)].getTranslationKey() + "Factory"); } return tier.getLocalizedName() + " " + RecipeType.values()[getRecipeType(itemstack)].getLocalizedName() + " " + super.getItemStackDisplayName(itemstack); diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java index 3d72c4d8a..994bfd75b 100644 --- a/src/main/java/mekanism/common/item/ItemBlockOre.java +++ b/src/main/java/mekanism/common/item/ItemBlockOre.java @@ -44,7 +44,7 @@ public class ItemBlockOre extends ItemBlock list.add("Hold " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); } else { - list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip." + getUnlocalizedName(itemstack).replace("tile.OreBlock.", "")), itemstack)); + list.addAll(MekanismUtils.splitTooltip(LangUtils.localize("tooltip." + getTranslationKey(itemstack).replace("tile.OreBlock.", "")), itemstack)); } } @@ -55,7 +55,7 @@ public class ItemBlockOre extends ItemBlock } @Override - public String getUnlocalizedName(ItemStack itemstack) + public String getTranslationKey(ItemStack itemstack) { String name; @@ -75,6 +75,6 @@ public class ItemBlockOre extends ItemBlock break; } - return getUnlocalizedName() + "." + name; + return getTranslationKey() + "." + name; } } diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index a168c77bf..dc024cd61 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -32,9 +32,9 @@ public class ItemBlockPlastic extends ItemBlock EnumColor colour = EnumColor.DYES[dyeColour.getDyeDamage()]; String colourName; - if(I18n.canTranslate(getUnlocalizedName(stack) + "." + colour.dyeName)) + if(I18n.canTranslate(getTranslationKey(stack) + "." + colour.dyeName)) { - return LangUtils.localize(getUnlocalizedName(stack) + "." + colour.dyeName); + return LangUtils.localize(getTranslationKey(stack) + "." + colour.dyeName); } if(colour == EnumColor.BLACK) diff --git a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java index a7620a9fd..cb227e955 100644 --- a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java +++ b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java @@ -170,10 +170,10 @@ public class ItemBlockTransmitter extends ItemBlockMultipartAble implements ITie } @Override - public String getUnlocalizedName(ItemStack stack) + public String getTranslationKey(ItemStack stack) { TransmitterType type = TransmitterType.get(stack.getItemDamage()); - String name = type.getUnlocalizedName(); + String name = type.getTranslationKey(); if(type.hasTiers()) { @@ -181,7 +181,7 @@ public class ItemBlockTransmitter extends ItemBlockMultipartAble implements ITie name = tier.getSimpleName() + name; } - return getUnlocalizedName() + "." + name; + return getTranslationKey() + "." + name; } @Override diff --git a/src/main/java/mekanism/common/item/ItemClump.java b/src/main/java/mekanism/common/item/ItemClump.java index 085b0a312..396ee1d61 100644 --- a/src/main/java/mekanism/common/item/ItemClump.java +++ b/src/main/java/mekanism/common/item/ItemClump.java @@ -39,7 +39,7 @@ public class ItemClump extends ItemMekanism implements IMetaItem } @Override - public String getUnlocalizedName(ItemStack item) + public String getTranslationKey(ItemStack item) { if(item.getItemDamage() <= Resource.values().length-1) { diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java index 043e009f9..e547333e6 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurationCard.java +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -146,7 +146,7 @@ public class ItemConfigurationCard extends ItemMekanism if(tile instanceof TileEntityContainerBlock) { - ret = tile.getBlockType().getUnlocalizedName() + "." + ((TileEntityContainerBlock)tile).fullName + ".name"; + ret = tile.getBlockType().getTranslationKey() + "." + ((TileEntityContainerBlock)tile).fullName + ".name"; } if(CapabilityUtils.hasCapability(tile, Capabilities.SPECIAL_CONFIG_DATA_CAPABILITY, side)) @@ -173,7 +173,7 @@ public class ItemConfigurationCard extends ItemMekanism { NBTTagCompound data = ItemDataUtils.getCompound(itemstack, "data"); - if(data.hasNoTags()) + if(data.isEmpty()) { return null; } diff --git a/src/main/java/mekanism/common/item/ItemControlCircuit.java b/src/main/java/mekanism/common/item/ItemControlCircuit.java index 97ab3cfa8..a3e7eb5a7 100644 --- a/src/main/java/mekanism/common/item/ItemControlCircuit.java +++ b/src/main/java/mekanism/common/item/ItemControlCircuit.java @@ -40,7 +40,7 @@ public class ItemControlCircuit extends ItemMekanism implements IMetaItem } @Override - public String getUnlocalizedName(ItemStack item) + public String getTranslationKey(ItemStack item) { return "item." + BaseTier.values()[item.getItemDamage()].getSimpleName() + "ControlCircuit"; } diff --git a/src/main/java/mekanism/common/item/ItemCrystal.java b/src/main/java/mekanism/common/item/ItemCrystal.java index 037fa1cf1..e75cb5836 100644 --- a/src/main/java/mekanism/common/item/ItemCrystal.java +++ b/src/main/java/mekanism/common/item/ItemCrystal.java @@ -39,7 +39,7 @@ public class ItemCrystal extends ItemMekanism implements IMetaItem } @Override - public String getUnlocalizedName(ItemStack item) + public String getTranslationKey(ItemStack item) { if(item.getItemDamage() <= Resource.values().length-1) { diff --git a/src/main/java/mekanism/common/item/ItemDirtyDust.java b/src/main/java/mekanism/common/item/ItemDirtyDust.java index 6f03c2930..5ff9b03df 100644 --- a/src/main/java/mekanism/common/item/ItemDirtyDust.java +++ b/src/main/java/mekanism/common/item/ItemDirtyDust.java @@ -39,7 +39,7 @@ public class ItemDirtyDust extends ItemMekanism implements IMetaItem } @Override - public String getUnlocalizedName(ItemStack item) + public String getTranslationKey(ItemStack item) { if(item.getItemDamage() <= Resource.values().length-1) { diff --git a/src/main/java/mekanism/common/item/ItemDust.java b/src/main/java/mekanism/common/item/ItemDust.java index af78b0eb5..832105619 100644 --- a/src/main/java/mekanism/common/item/ItemDust.java +++ b/src/main/java/mekanism/common/item/ItemDust.java @@ -39,7 +39,7 @@ public class ItemDust extends ItemMekanism implements IMetaItem } @Override - public String getUnlocalizedName(ItemStack item) + public String getTranslationKey(ItemStack item) { if(item.getItemDamage() <= Resource.values().length-1) { diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index e8ca24c6c..47b7cfe57 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -86,7 +86,7 @@ public class ItemElectricBow extends ItemEnergized implements IItemNetwork { ItemArrow itemarrow = (ItemArrow)(ammo.getItem() instanceof ItemArrow ? ammo.getItem() : Items.ARROW); EntityArrow entityarrow = itemarrow.createArrow(world, itemstack, player); - entityarrow.setAim(player, player.rotationPitch, player.rotationYaw, 0.0F, f * 3.0F, 1.0F); + entityarrow.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, f * 3.0F, 1.0F); if(f == 1.0F) { diff --git a/src/main/java/mekanism/common/item/ItemHDPE.java b/src/main/java/mekanism/common/item/ItemHDPE.java index c752d2cfc..d3055a65e 100644 --- a/src/main/java/mekanism/common/item/ItemHDPE.java +++ b/src/main/java/mekanism/common/item/ItemHDPE.java @@ -38,7 +38,7 @@ public class ItemHDPE extends ItemMekanism implements IMetaItem } @Override - public String getUnlocalizedName(ItemStack item) + public String getTranslationKey(ItemStack item) { return "item." + PlasticItem.values()[item.getItemDamage()].getName(); } diff --git a/src/main/java/mekanism/common/item/ItemIngot.java b/src/main/java/mekanism/common/item/ItemIngot.java index 4aaba80e2..319ad0b20 100644 --- a/src/main/java/mekanism/common/item/ItemIngot.java +++ b/src/main/java/mekanism/common/item/ItemIngot.java @@ -42,7 +42,7 @@ public class ItemIngot extends ItemMekanism implements IMetaItem } @Override - public String getUnlocalizedName(ItemStack item) + public String getTranslationKey(ItemStack item) { return "item." + en_USNames[item.getItemDamage()].toLowerCase(Locale.ROOT) + "Ingot"; } diff --git a/src/main/java/mekanism/common/item/ItemNugget.java b/src/main/java/mekanism/common/item/ItemNugget.java index 66e403bea..c1b382020 100644 --- a/src/main/java/mekanism/common/item/ItemNugget.java +++ b/src/main/java/mekanism/common/item/ItemNugget.java @@ -38,7 +38,7 @@ public class ItemNugget extends ItemMekanism implements IMetaItem } @Override - public String getUnlocalizedName(ItemStack item) + public String getTranslationKey(ItemStack item) { return "item." + ItemIngot.en_USNames[item.getItemDamage()].toLowerCase(Locale.ROOT) + "Nugget"; } diff --git a/src/main/java/mekanism/common/item/ItemOtherDust.java b/src/main/java/mekanism/common/item/ItemOtherDust.java index 46f0d4918..7e9a7ad49 100644 --- a/src/main/java/mekanism/common/item/ItemOtherDust.java +++ b/src/main/java/mekanism/common/item/ItemOtherDust.java @@ -49,7 +49,7 @@ public class ItemOtherDust extends ItemMekanism implements IMetaItem } @Override - public String getUnlocalizedName(ItemStack item) + public String getTranslationKey(ItemStack item) { return "item." + subtypes[item.getItemDamage()].toLowerCase(Locale.ROOT) + "Dust"; } diff --git a/src/main/java/mekanism/common/item/ItemShard.java b/src/main/java/mekanism/common/item/ItemShard.java index ad6d5fa34..3b541585c 100644 --- a/src/main/java/mekanism/common/item/ItemShard.java +++ b/src/main/java/mekanism/common/item/ItemShard.java @@ -39,7 +39,7 @@ public class ItemShard extends ItemMekanism implements IMetaItem } @Override - public String getUnlocalizedName(ItemStack item) + public String getTranslationKey(ItemStack item) { if(item.getItemDamage() <= Resource.values().length-1) { diff --git a/src/main/java/mekanism/common/item/ItemTierInstaller.java b/src/main/java/mekanism/common/item/ItemTierInstaller.java index 9f000cd7c..a7e6cf2a6 100644 --- a/src/main/java/mekanism/common/item/ItemTierInstaller.java +++ b/src/main/java/mekanism/common/item/ItemTierInstaller.java @@ -87,7 +87,7 @@ public class ItemTierInstaller extends ItemMekanism implements IMetaItem } @Override - public String getUnlocalizedName(ItemStack item) + public String getTranslationKey(ItemStack item) { return "item." + BaseTier.values()[item.getItemDamage()].getSimpleName().toLowerCase(Locale.ROOT) + "TierInstaller"; } diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 000338f8b..455bd6271 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -82,7 +82,7 @@ public class PacketConfigurationUpdate implements IMessageHandler 0; + boolean power = world.getRedstonePowerFromNeighbors(getPos()) > 0; if(redstone != power) { diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java index 80052fccf..8be6b8d4f 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java @@ -167,7 +167,7 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl @Override public String getName() { - return LangUtils.localize(getBlockType().getUnlocalizedName() + "." + fullName + ".name"); + return LangUtils.localize(getBlockType().getTranslationKey() + "." + fullName + ".name"); } @Override diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityNoisyBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityNoisyBlock.java index 70c764fb5..cff4c1127 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityNoisyBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityNoisyBlock.java @@ -84,7 +84,7 @@ public abstract class TileEntityNoisyBlock extends TileEntityElectricBlock imple @SideOnly(Side.CLIENT) public Vec3d getSoundPosition() { - return new Vec3d(getPos()).addVector(0.5, 0.5, 0.5); + return new Vec3d(getPos()).add(0.5, 0.5, 0.5); } @Override diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java index febf6795b..09477e8c0 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java @@ -612,7 +612,7 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet connectionTypes[hitSide.ordinal()] = connectionTypes[hitSide.ordinal()].next(); sendDesc = true; - onModeChange(EnumFacing.getFront(hitSide.ordinal())); + onModeChange(EnumFacing.byIndex(hitSide.ordinal())); player.sendMessage(new TextComponentGroup().translation("tooltip.configurator.modeChange").string(" ").translation(connectionTypes[hitSide.ordinal()].translationKey())); return EnumActionResult.SUCCESS; diff --git a/src/main/java/mekanism/common/util/GasUtils.java b/src/main/java/mekanism/common/util/GasUtils.java index 3148ccc63..26463c054 100644 --- a/src/main/java/mekanism/common/util/GasUtils.java +++ b/src/main/java/mekanism/common/util/GasUtils.java @@ -145,7 +145,7 @@ public final class GasUtils { IGasHandler handler = possibleAcceptors[i]; - if(handler != null && handler.canReceiveGas(EnumFacing.getFront(i).getOpposite(), stack.getGas())) + if(handler != null && handler.canReceiveGas(EnumFacing.byIndex(i).getOpposite(), stack.getGas())) { availableAcceptors.add(handler); } @@ -172,7 +172,7 @@ public final class GasUtils remaining--; } - EnumFacing dir = EnumFacing.getFront(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite(); + EnumFacing dir = EnumFacing.byIndex(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite(); toSend -= acceptor.receiveGas(dir, new GasStack(stack.getGas(), currentSending), true); } } diff --git a/src/main/java/mekanism/common/util/ItemRegistryUtils.java b/src/main/java/mekanism/common/util/ItemRegistryUtils.java index 25c8fe0bc..4210ba9bc 100644 --- a/src/main/java/mekanism/common/util/ItemRegistryUtils.java +++ b/src/main/java/mekanism/common/util/ItemRegistryUtils.java @@ -44,7 +44,7 @@ public final class ItemRegistryUtils return "null"; } - String modId = itemResourceLocation.getResourceDomain(); + String modId = itemResourceLocation.getNamespace(); String lowercaseModId = modId.toLowerCase(Locale.ENGLISH); String modName = modIDMap.computeIfAbsent(lowercaseModId, k -> WordUtils.capitalize(modId)); diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 4bd6e38fa..d201009e8 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -691,7 +691,7 @@ public final class MekanismUtils } /** - * Better version of the World.isBlockIndirectlyGettingPowered() method that doesn't load chunks. + * Better version of the World.getRedstonePowerFromNeighbors() method that doesn't load chunks. * @param world - the world to perform the check in * @param coord - the coordinate of the block performing the check * @return if the block is indirectly getting powered by LOADED chunks @@ -1077,7 +1077,7 @@ public final class MekanismUtils Vec3d headVec = getHeadVec(player); Vec3d lookVec = player.getLook(1); - Vec3d endVec = headVec.addVector(lookVec.x*reach, lookVec.y*reach, lookVec.z*reach); + Vec3d endVec = headVec.add(lookVec.x*reach, lookVec.y*reach, lookVec.z*reach); return world.rayTraceBlocks(headVec, endVec, true); } @@ -1430,7 +1430,7 @@ public final class MekanismUtils EntityPlayerMP player = (EntityPlayerMP)p; - return general.opsBypassRestrictions && player.mcServer.getPlayerList().canSendCommands(player.getGameProfile()); + return general.opsBypassRestrictions && player.server.getPlayerList().canSendCommands(player.getGameProfile()); } /** diff --git a/src/main/java/mekanism/common/util/MultipartUtils.java b/src/main/java/mekanism/common/util/MultipartUtils.java index 847ef005f..a823006e0 100644 --- a/src/main/java/mekanism/common/util/MultipartUtils.java +++ b/src/main/java/mekanism/common/util/MultipartUtils.java @@ -63,7 +63,7 @@ public final class MultipartUtils d3 = ((EntityPlayerMP)player).interactionManager.getBlockReachDistance(); } - Vec3d end = start.addVector(f5 * d3, f4 * d3, f6 * d3); + Vec3d end = start.add(f5 * d3, f4 * d3, f6 * d3); return Pair.of(start, end); } diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index d9fb6d997..ccc5862fb 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -125,7 +125,7 @@ public final class PipeUtils remaining--; } - EnumFacing dir = EnumFacing.getFront(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite(); + EnumFacing dir = EnumFacing.byIndex(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite(); toSend -= acceptor.fill(copy(stack, currentSending), true); } } diff --git a/src/main/java/mekanism/common/util/StackUtils.java b/src/main/java/mekanism/common/util/StackUtils.java index 534c9a4c7..d928cc2da 100644 --- a/src/main/java/mekanism/common/util/StackUtils.java +++ b/src/main/java/mekanism/common/util/StackUtils.java @@ -252,7 +252,7 @@ public final class StackUtils return -1; } - String name = stack.getItemDamage() == OreDictionary.WILDCARD_VALUE ? stack.getItem().getUnlocalizedName() : stack.getItem().getUnlocalizedName(stack); + String name = stack.getItemDamage() == OreDictionary.WILDCARD_VALUE ? stack.getItem().getTranslationKey() : stack.getItem().getTranslationKey(stack); return name.hashCode() << 8 | stack.getItemDamage(); } } diff --git a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java index 1a9c9b270..e3dfc4b48 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java +++ b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java @@ -35,6 +35,6 @@ public class GeneratorsBlocks public static Block init(Block block, String name) { - return block.setUnlocalizedName(name).setRegistryName("mekanismgenerators:" + name); + return block.setTranslationKey(name).setRegistryName("mekanismgenerators:" + name); } } diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java index 72162940f..5abbee564 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsItems.java +++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java @@ -34,6 +34,6 @@ public class GeneratorsItems public static Item init(Item item, String name) { - return item.setUnlocalizedName(name).setRegistryName("mekanismgenerators:" + name); + return item.setTranslationKey(name).setRegistryName("mekanismgenerators:" + name); } } diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 937a36be2..d6d5d7337 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -201,7 +201,7 @@ public abstract class BlockGenerator extends BlockContainer } tileEntity.setFacing((short)change); - tileEntity.redstone = world.isBlockIndirectlyGettingPowered(pos) > 0; + tileEntity.redstone = world.getRedstonePowerFromNeighbors(pos) > 0; if(tileEntity instanceof IBoundingBlock) { @@ -548,7 +548,7 @@ public abstract class BlockGenerator extends BlockContainer @SideOnly(Side.CLIENT) @Override - public BlockRenderLayer getBlockLayer() + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index da361499c..a0991b154 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -136,7 +136,7 @@ public abstract class BlockReactor extends Block implements ITileEntityProvider if(!stack.isEmpty()) { - if(MekanismUtils.isBCWrench(stack.getItem()) && !stack.getUnlocalizedName().contains("omniwrench")) + if(MekanismUtils.isBCWrench(stack.getItem()) && !stack.getTranslationKey().contains("omniwrench")) { if(entityplayer.isSneaking()) { @@ -197,7 +197,7 @@ public abstract class BlockReactor extends Block implements ITileEntityProvider } @Override - public BlockRenderLayer getBlockLayer() + public BlockRenderLayer getRenderLayer() { return this == GeneratorsBlocks.Reactor ? BlockRenderLayer.CUTOUT : BlockRenderLayer.TRANSLUCENT; } diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 6ca7aafd0..517ae828d 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -108,7 +108,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp } @Override - public String getUnlocalizedName(ItemStack itemstack) + public String getTranslationKey(ItemStack itemstack) { GeneratorType generatorType = GeneratorType.get(itemstack); if(generatorType == null) @@ -116,7 +116,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp return "KillMe!"; } - return getUnlocalizedName() + "." + generatorType.blockName; + return getTranslationKey() + "." + generatorType.blockName; } @Override diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java index f25676c76..d0912b7f7 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java @@ -34,9 +34,9 @@ public class ItemBlockReactor extends ItemBlock } @Override - public String getUnlocalizedName(ItemStack itemstack) + public String getTranslationKey(ItemStack itemstack) { - return getUnlocalizedName() + "." + ReactorBlockType.get(itemstack).name; + return getTranslationKey() + "." + ReactorBlockType.get(itemstack).name; } @Override diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index ad4e432f9..e2105ed78 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -373,7 +373,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen @SideOnly(Side.CLIENT) public Vec3d getSoundPosition() { - return new Vec3d(getPos()).addVector(0.5, 0.5, 0.5); + return new Vec3d(getPos()).add(0.5, 0.5, 0.5); } @Override diff --git a/src/main/java/mekanism/tools/common/ToolsItems.java b/src/main/java/mekanism/tools/common/ToolsItems.java index 764914de2..839a48439 100644 --- a/src/main/java/mekanism/tools/common/ToolsItems.java +++ b/src/main/java/mekanism/tools/common/ToolsItems.java @@ -294,6 +294,6 @@ public class ToolsItems public static Item init(Item item, String name) { - return item.setUnlocalizedName(name).setRegistryName("mekanismtools:" + name); + return item.setTranslationKey(name).setRegistryName("mekanismtools:" + name); } } diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index 7aa2fd5ed..3ccf1a000 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -42,7 +42,7 @@ public class ItemMekanismHoe extends ItemMekanism setMaxStackSize(1); setMaxDamage(enumtoolmaterial.getMaxUses()); setCreativeTab(CreativeTabs.TOOLS); - speed = enumtoolmaterial.getDamageVsEntity() + 1.0F; + speed = enumtoolmaterial.getAttackDamage() + 1.0F; } @Override diff --git a/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java b/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java index e087bf75a..a362f983f 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismPaxel.java @@ -16,9 +16,9 @@ public class ItemMekanismPaxel extends ItemMekanismTool } @Override - public float getStrVsBlock(ItemStack stack, IBlockState blockState) + public float getDestroySpeed(ItemStack stack, IBlockState blockState) { - return blockState.getBlock() != Blocks.BEDROCK ? efficiencyOnProperMaterial : 1.0F; + return blockState.getBlock() != Blocks.BEDROCK ? efficiency : 1.0F; } @Override diff --git a/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java b/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java index 32839b64d..0db2ef3d5 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismPickaxe.java @@ -68,14 +68,14 @@ public class ItemMekanismPickaxe extends ItemMekanismTool } @Override - public float getStrVsBlock(ItemStack itemstack, IBlockState blockState) + public float getDestroySpeed(ItemStack itemstack, IBlockState blockState) { if(blockState != null && blockState.getBlock() != null && (blockState.getMaterial() == Material.IRON || blockState.getMaterial() == Material.ANVIL || blockState.getMaterial() == Material.ROCK)) { - return efficiencyOnProperMaterial; + return efficiency; } else { - return super.getStrVsBlock(itemstack, blockState); + return super.getDestroySpeed(itemstack, blockState); } } }