diff --git a/build.gradle b/build.gradle index 06e499597..aa70a1f8d 100644 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,7 @@ dependencies { deobfCompile "com.mod-buildcraft:buildcraft-api:7.99.17" deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" deobfCompile "mezz.jei:jei_1.12.2:4.13.1.220" - deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA21" + deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26" //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" diff --git a/build.properties b/build.properties index 3bdae1cca..c93bdf6db 100644 --- a/build.properties +++ b/build.properties @@ -2,9 +2,9 @@ #Fri Nov 30 05:12:11 GMT 2018 mod_name=Botania cf_meta_version=1.12.2 -forge_version=14.23.4.2705 +forge_version=14.23.5.2768 dir_repo=./ -mc_mappings=snapshot_20171217 +mc_mappings=stable_39 version=r1.10 dir_output=../Build Output/Botania/ mc_version=1.12.2 diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index f4243aed0..cee71196e 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -660,11 +660,11 @@ public final class BotaniaAPI { if(stack.isEmpty()) return ""; - return "i_" + stack.getItem().getUnlocalizedName() + "@" + stack.getItemDamage(); + return "i_" + stack.getItem().getTranslationKey() + "@" + stack.getItemDamage(); } private static String getMagnetKey(Block block, int meta) { - return "bm_" + block.getUnlocalizedName() + "@" + meta; + return "bm_" + block.getTranslationKey() + "@" + meta; } } diff --git a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java index 8ac7492ce..ff5b30a66 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java @@ -56,7 +56,7 @@ public final class BotaniaAPIClient { * @param model A path to a blockstate json and variant to be used the block. The item model will be drawn from the same blockstate json, from variant "inventory" */ public static void registerSubtileModel(String subTileName, ModelResourceLocation model) { - registerSubtileModel(subTileName, model, new ModelResourceLocation(model.getResourceDomain() + ":" + model.getResourcePath(), "inventory")); + registerSubtileModel(subTileName, model, new ModelResourceLocation(model.getNamespace() + ":" + model.getPath(), "inventory")); } // Convenience overloads for the above two calls diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 59473a330..4da1aaba2 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -65,7 +65,7 @@ public final class LexiconRecipeMappings { if(stack.hasTagCompound() && stack.getItem() instanceof IRecipeKeyProvider) return ((IRecipeKeyProvider) stack.getItem()).getKey(stack); - return stack.getUnlocalizedName() + (forceIgnore || ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); + return stack.getTranslationKey() + (forceIgnore || ignoreMeta(stack) ? "" : "~" + stack.getItemDamage()); } public static boolean ignoreMeta(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index 8820b70d8..d3237abeb 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -24,7 +24,7 @@ public class WikiHooks { public static IWikiProvider getWikiFor(Block block) { ResourceLocation mod = Block.REGISTRY.getNameForObject(block); - return getWikiFor(mod == null ? "" : mod.getResourceDomain().toLowerCase()); + return getWikiFor(mod == null ? "" : mod.getNamespace().toLowerCase()); } public static IWikiProvider getWikiFor(String mod) { diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 16fbd24ef..0ac50fe41 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -85,7 +85,7 @@ public final class HUDHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) public static void onDrawScreenPre(RenderGameOverlayEvent.Pre event) { Minecraft mc = Minecraft.getMinecraft(); - Profiler profiler = mc.mcProfiler; + Profiler profiler = mc.profiler; if(event.getType() == ElementType.HEALTH) { profiler.startSection("botania-hud"); @@ -117,7 +117,7 @@ public final class HUDHandler { @SubscribeEvent public static void onDrawScreenPost(RenderGameOverlayEvent.Post event) { Minecraft mc = Minecraft.getMinecraft(); - Profiler profiler = mc.mcProfiler; + Profiler profiler = mc.profiler; ItemStack main = mc.player.getHeldItemMainhand(); ItemStack offhand = mc.player.getHeldItemOffhand(); @@ -262,7 +262,7 @@ public final class HUDHandler { private static void renderWandModeDisplay(ItemStack stack, ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); - Profiler profiler = mc.mcProfiler; + Profiler profiler = mc.profiler; profiler.startSection("wandMode"); int ticks = mc.ingameGUI.remainingHighlightTicks; @@ -314,7 +314,7 @@ public final class HUDHandler { private static void renderPoolRecipeHUD(ScaledResolution res, TilePool tile, ItemStack stack) { Minecraft mc = Minecraft.getMinecraft(); - Profiler profiler = mc.mcProfiler; + Profiler profiler = mc.profiler; profiler.startSection("poolRecipe"); RecipeManaInfusion recipe = TilePool.getMatchingRecipe(stack, tile.getWorld().getBlockState(tile.getPos().down())); @@ -346,7 +346,7 @@ public final class HUDHandler { private static void renderCrystalCubeHUD(ScaledResolution res, TileCorporeaCrystalCube tile) { Minecraft mc = Minecraft.getMinecraft(); - Profiler profiler = mc.mcProfiler; + Profiler profiler = mc.profiler; profiler.startSection("crystalCube"); ItemStack target = tile.getRequestTarget(); @@ -373,7 +373,7 @@ public final class HUDHandler { private static void drawLexiconHUD(ItemStack stack, IBlockState state, RayTraceResult pos, ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); Block block = state.getBlock(); - Profiler profiler = mc.mcProfiler; + Profiler profiler = mc.profiler; profiler.startSection("lexicon"); FontRenderer font = mc.fontRenderer; diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 35612cdc9..0b7959264 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -111,7 +111,7 @@ public final class ItemsRemainingRenderHandler { int count = 0; for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stack = player.inventory.getStackInSlot(i); - if(!stack.isEmpty() && pattern.matcher(stack.getUnlocalizedName()).find()) + if(!stack.isEmpty() && pattern.matcher(stack.getTranslationKey()).find()) count += stack.getCount(); } diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 14a092660..944305dcb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -43,7 +43,7 @@ public class LightningHandler { @SubscribeEvent public static void onRenderWorldLast(RenderWorldLastEvent event) { - Profiler profiler = Minecraft.getMinecraft().mcProfiler; + Profiler profiler = Minecraft.getMinecraft().profiler; profiler.startSection("botania-particles"); ParticleRenderDispatcher.dispatch(); diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 56339af54..d5e515c91 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -136,7 +136,7 @@ public final class ModelHandler { } public static void registerItemAllMeta(Item item, int range) { - registerItemMetas(item, range, i -> item.getRegistryName().getResourcePath()); + registerItemMetas(item, range, i -> item.getRegistryName().getPath()); } public static void registerItemAppendMeta(Item item, int maxExclusive, String loc) { diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index f0dcf04ce..8260b1ccf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -106,9 +106,9 @@ public final class RedStringRenderer { double freq = 20; double ampl = (0.15 * (Math.sin(l * 2F) * 0.5 + 0.5) + 0.1) * sizeAlpha; double randMul = 0.05; - double x = xpos + Math.sin(l * freq) * ampl * Math.abs(Math.abs(dir.getFrontOffsetX()) - 1) + rand * randMul; - double y = ypos + Math.cos(l * freq) * ampl * Math.abs(Math.abs(dir.getFrontOffsetY()) - 1) + rand * randMul; - double z = zpos + (dir.getFrontOffsetY() == 0 ? Math.sin(l * freq) : Math.cos(l * freq)) * ampl * Math.abs(Math.abs(dir.getFrontOffsetZ()) - 1) + rand * randMul; + double x = xpos + Math.sin(l * freq) * ampl * Math.abs(Math.abs(dir.getXOffset()) - 1) + rand * randMul; + double y = ypos + Math.cos(l * freq) * ampl * Math.abs(Math.abs(dir.getYOffset()) - 1) + rand * randMul; + double z = zpos + (dir.getYOffset() == 0 ? Math.sin(l * freq) : Math.cos(l * freq)) * ampl * Math.abs(Math.abs(dir.getZOffset()) - 1) + rand * randMul; tess.getBuffer().pos(x, y, z).endVertex(); } diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 432ea86d6..204aa03f1 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -140,7 +140,7 @@ public class ClientProxy implements IProxy { @Override public void preInit(FMLPreInitializationEvent event) { - PersistentVariableHelper.setCacheFile(new File(Minecraft.getMinecraft().mcDataDir, "BotaniaVars.dat")); + PersistentVariableHelper.setCacheFile(new File(Minecraft.getMinecraft().gameDir, "BotaniaVars.dat")); try { PersistentVariableHelper.load(); PersistentVariableHelper.save(); diff --git a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java index 58dba86f6..ea20506b2 100644 --- a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java +++ b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java @@ -30,7 +30,7 @@ public final class ParticleRenderDispatcher { public static void dispatch() { Tessellator tessellator = Tessellator.getInstance(); - Profiler profiler = Minecraft.getMinecraft().mcProfiler; + Profiler profiler = Minecraft.getMinecraft().profiler; GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GlStateManager.depthMask(false); diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 62a1d3745..50e8de69a 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -134,10 +134,10 @@ public class SpecialFlowerModel implements IModel { @Override public boolean accepts(ResourceLocation modelLocation) { - return modelLocation.getResourceDomain().equals("botania_special") && ( - modelLocation.getResourcePath().equals("specialflower") || - modelLocation.getResourcePath().equals("models/block/specialflower") || - modelLocation.getResourcePath().equals("models/item/specialflower")); + return modelLocation.getNamespace().equals("botania_special") && ( + modelLocation.getPath().equals("specialflower") || + modelLocation.getPath().equals("models/block/specialflower") || + modelLocation.getPath().equals("models/item/specialflower")); } @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java index 45ee3f2bd..dfeca93b6 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java @@ -37,7 +37,7 @@ public class RenderTileGaiaHead extends TileEntitySkullRenderer { // Null-safe copy of super renderSkull((float)x, (float)y, (float)z, - skull == null ? EnumFacing.NORTH : EnumFacing.getFront(skull.getBlockMetadata() & 7), + skull == null ? EnumFacing.NORTH : EnumFacing.byIndex(skull.getBlockMetadata() & 7), skull == null ? 0 : skull.getSkullRotation() * 360 / 16.0F, 3, null, digProgress, partialTicks); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 84b569ee0..9ac6a31ce 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -113,7 +113,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Nonnull @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } @@ -124,7 +124,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity) { + public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) { if(!world.isRemote && entity instanceof EntityItem) { TileAltar tile = (TileAltar) world.getTileEntity(pos); if(tile.collideEntityItem((EntityItem) entity)) diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index 8c4851770..7c2b679cd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -151,12 +151,12 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig } @Override - public void onBlockDestroyedByPlayer(World world, BlockPos pos, IBlockState state) { + public void onPlayerDestroy(World world, BlockPos pos, IBlockState state) { // TE is already gone so best we can do is just notify everyone for(EnumFacing side : EnumFacing.VALUES) { world.notifyNeighborsOfStateChange(pos.offset(side), this, false); } - super.onBlockDestroyedByPlayer(world, pos, state); + super.onPlayerDestroy(world, pos, state); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 1e0fd8aec..3322f04f7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -83,7 +83,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { if (meta < 2 || meta > 5) { meta = 2; } - return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.byIndex(meta)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index e17791440..2f1eaf425 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -72,7 +72,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Nonnull @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index 78e05f1c9..a98d05a72 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -67,7 +67,7 @@ public class BlockCacophonium extends BlockMod { @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { - boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; + boolean power = world.getRedstonePowerFromNeighbors(pos) > 0 || world.getRedstonePowerFromNeighbors(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); if(power && !powered) { diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 457499e47..f1adfc232 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -73,7 +73,7 @@ public class BlockCocoon extends BlockMod implements ILexiconable { } @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity e) { + public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity e) { if(!world.isRemote && e instanceof EntityItem) { EntityItem item = (EntityItem) e; ItemStack stack = item.getItem(); @@ -87,8 +87,6 @@ public class BlockCocoon extends BlockMod implements ILexiconable { @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { ItemStack stack = player.getHeldItem(hand); - Item item = stack.getItem(); - return addStack(world, pos, stack, player.capabilities.isCreativeMode); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index b8cf14afe..7bb01b414 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -67,7 +67,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { @Nonnull @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getHorizontal(meta)); + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.byHorizontalIndex(meta)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index a5f634be6..387d7802f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -42,7 +42,7 @@ public class BlockGaiaHead extends BlockSkull implements IModelRegister { public BlockGaiaHead() { setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD)); - setUnlocalizedName(LibBlockNames.GAIA_HEAD); + setTranslationKey(LibBlockNames.GAIA_HEAD); setHardness(1.0F); } diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index f4d46e476..9e03b7c63 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -49,7 +49,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable, IMode setCreativeTab(BotaniaCreativeTab.INSTANCE); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH)); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GHOST_RAIL)); - setUnlocalizedName(LibBlockNames.GHOST_RAIL); + setTranslationKey(LibBlockNames.GHOST_RAIL); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 226234cbb..4b08a982f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -66,7 +66,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { if (meta < 2 || meta > 5) { meta = 2; } - return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.byIndex(meta)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 663d640a8..da05ecf2a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -89,7 +89,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { - boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0|| world.isBlockIndirectlyGettingPowered(pos.up()) > 0; + boolean power = world.getRedstonePowerFromNeighbors(pos) > 0|| world.getRedstonePowerFromNeighbors(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); if(power && !powered) { diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 8b0d38765..e3329575b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -30,7 +30,7 @@ public abstract class BlockMod extends Block implements IModelRegister { public BlockMod(Material par2Material, String name) { super(par2Material); - setUnlocalizedName(name); + setTranslationKey(name); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); if(registerInCreative()) setCreativeTab(BotaniaCreativeTab.INSTANCE); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 33073bf87..1758cc8f3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -63,7 +63,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I String name = LibBlockNames.DOUBLE_FLOWER + (second ? 2 : 1); setDefaultState(pickDefaultState()); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - setUnlocalizedName(name); + setTranslationKey(name); setHardness(0F); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index a34b551de..8d4a23a26 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -56,7 +56,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IGrowab } protected BlockModFlower(String name) { - setUnlocalizedName(name); + setTranslationKey(name); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); setHardness(0F); diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index b8301d04d..4e5faa0e0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -221,7 +221,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl world.setBlockState(pos.offset(dir), ModBlocks.pistonRelay.getDefaultState()); else if(!world.isRemote) { ItemStack stack = new ItemStack(ModBlocks.pistonRelay); - world.spawnEntity(new EntityItem(world, x + dir.getFrontOffsetX(), y + dir.getFrontOffsetY(), z + dir.getFrontOffsetZ(), stack)); + world.spawnEntity(new EntityItem(world, x + dir.getXOffset(), y + dir.getYOffset(), z + dir.getZOffset(), stack)); } checkedCoords.add(s); newPos = new DimWithPos(world.provider.getDimension(), pos.offset(dir)); @@ -237,7 +237,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl TileEntity tile = world.getTileEntity(pos2); Material mat = srcState.getMaterial(); - if(!sticky && tile == null && mat.getMobilityFlag() == EnumPushReaction.NORMAL && srcState.getBlockHardness(world, pos2) != -1 && !srcState.getBlock().isAir(srcState, world, pos2)) { + if(!sticky && tile == null && mat.getPushReaction() == EnumPushReaction.NORMAL && srcState.getBlockHardness(world, pos2) != -1 && !srcState.getBlock().isAir(srcState, world, pos2)) { Material destMat = world.getBlockState(pos2.offset(dir)).getMaterial(); if(world.isAirBlock(pos2.offset(dir)) || destMat.isReplaceable()) { world.setBlockState(pos2, Blocks.AIR.getDefaultState()); diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index acb0ea43d..ca6d02031 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -35,7 +35,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { public BlockSolidVines() { setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SOLID_VINE)); - setUnlocalizedName(LibBlockNames.SOLID_VINE); + setTranslationKey(LibBlockNames.SOLID_VINE); setHardness(0.5F); setSoundType(SoundType.PLANT); setCreativeTab(null); diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index c4bbc0682..8c13f8b69 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -90,7 +90,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { - boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; + boolean power = world.getRedstonePowerFromNeighbors(pos) > 0 || world.getRedstonePowerFromNeighbors(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); if(power && !powered) { diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 00469c57d..7c30d1954 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -121,7 +121,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I protected BlockSpecialFlower() { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.SPECIAL_FLOWER)); - setUnlocalizedName(LibBlockNames.SPECIAL_FLOWER); + setTranslationKey(LibBlockNames.SPECIAL_FLOWER); setHardness(0.1F); setSoundType(SoundType.PLANT); setTickRandomly(false); diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 164598091..8262a5161 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -54,7 +54,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { } @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity e) { + public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity e) { if(!world.isRemote && e instanceof EntityItem) { EntityItem item = (EntityItem) e; ItemStack stack = item.getItem(); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index 690b7b159..7a002eb87 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -57,7 +57,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { - boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; + boolean power = world.getRedstonePowerFromNeighbors(pos) > 0 || world.getRedstonePowerFromNeighbors(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); if(power && !powered) { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index 52f9324eb..359b5f082 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -58,7 +58,7 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable { @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { - boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; + boolean power = world.getRedstonePowerFromNeighbors(pos) > 0 || world.getRedstonePowerFromNeighbors(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); if(power && !powered) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index a4e9e86c1..28ece574e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -92,8 +92,9 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Nonnull + @SideOnly(Side.CLIENT) @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index 2dc9aac05..3f6146056 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -64,7 +64,7 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Nonnull @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index deba54970..128156490 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -55,7 +55,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis public BlockModMushroom() { setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.MUSHROOM)); - setUnlocalizedName(LibBlockNames.MUSHROOM); + setTranslationKey(LibBlockNames.MUSHROOM); setLightLevel(0.2F); setHardness(0F); setSoundType(SoundType.PLANT); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index 584f81bda..ad5dabf3d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -57,7 +57,7 @@ public class BlockStarfield extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Nonnull @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT_MIPPED; } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java index 2130ac294..da9be50c4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java @@ -27,7 +27,7 @@ public class BlockAlfglassPane extends BlockModPane { @SideOnly(Side.CLIENT) @Nonnull @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index cb9a7808b..8e8af5653 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -27,7 +27,7 @@ public class BlockBifrostPane extends BlockModPane { @SideOnly(Side.CLIENT) @Nonnull @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java index 544add3e7..03b856b14 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java @@ -27,7 +27,7 @@ public class BlockManaglassPane extends BlockModPane { @SideOnly(Side.CLIENT) @Nonnull @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index 20c574bf5..93799223a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java @@ -30,9 +30,9 @@ public class BlockModPane extends BlockPane implements IModelRegister { public BlockModPane(Block source) { super(Material.GLASS, false); // Backward compat don't kill me - String name = source.getUnlocalizedName().replaceAll("tile.", "") + "Pane"; + String name = source.getTranslationKey().replaceAll("tile.", "") + "Pane"; setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - setUnlocalizedName(name); + setTranslationKey(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); setHardness(0.3F); setSoundType(SoundType.GLASS); diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java index 611148ea6..db3a752de 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java @@ -7,7 +7,7 @@ public abstract class BlockLivingSlab extends BlockModSlab { final IBlockState sourceState; public BlockLivingSlab(boolean full, IBlockState state) { - super(full, state.getMaterial(), state.getBlock().getUnlocalizedName().replaceAll("tile.", "") + state.getBlock().getMetaFromState(state) + "Slab" + (full ? "Full" : "")); + super(full, state.getMaterial(), state.getBlock().getTranslationKey().replaceAll("tile.", "") + state.getBlock().getMetaFromState(state) + "Slab" + (full ? "Full" : "")); setSoundType(state.getBlock().getSoundType()); sourceState = state; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index bba624011..8e6c5f6c3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -40,7 +40,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IM public BlockModSlab(boolean full, Material mat, String name) { super(mat); this.name = name; - setUnlocalizedName(name); + setTranslationKey(name); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); doubleSlab = full; if(!full) { @@ -101,7 +101,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IM @Nonnull @Override - public String getUnlocalizedName(int i) { + public String getTranslationKey(int i) { return name; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java index 5850709e2..adfadeb23 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java @@ -5,7 +5,7 @@ import net.minecraft.block.state.IBlockState; public class BlockLivingStairs extends BlockModStairs { public BlockLivingStairs(IBlockState state) { - super(state, state.getBlock().getUnlocalizedName().replaceAll("tile.", "") + state.getBlock().getMetaFromState(state) + "Stairs"); + super(state, state.getBlock().getTranslationKey().replaceAll("tile.", "") + state.getBlock().getMetaFromState(state) + "Stairs"); } } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index bd6f7aa58..cf2fb2eb9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -24,7 +24,7 @@ public class BlockModStairs extends BlockStairs implements ILexiconable, IModelR public BlockModStairs(IBlockState state, String name) { super(state); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - setUnlocalizedName(name); + setTranslationKey(name); setCreativeTab(BotaniaCreativeTab.INSTANCE); useNeighborBrightness = true; } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 2a4b79bb7..55098b0f8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -38,9 +38,9 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM public BlockModWall(Block block, int meta) { super(block); // For backward compat don't kill me - String name = block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall"; + String name = block.getTranslationKey().replaceAll("tile.", "") + meta + "Wall"; setRegistryName(name); - setUnlocalizedName(name); + setTranslationKey(name); setDefaultState(pickDefaultState()); setCreativeTab(BotaniaCreativeTab.INSTANCE); } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java index b3300af59..15bbbcebb 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -32,9 +32,9 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { public ItemStack dispenseStack(IBlockSource source, ItemStack stack) { World world = source.getWorld(); EnumFacing enumfacing = world.getBlockState(source.getBlockPos()).getValue(BlockDispenser.FACING); - double d0 = source.getX() + enumfacing.getFrontOffsetX() * 1.125F; - double d1 = source.getY() + enumfacing.getFrontOffsetY() * 1.125F; - double d2 = source.getZ() + enumfacing.getFrontOffsetZ() * 1.125F; + double d0 = source.getX() + enumfacing.getXOffset() * 1.125F; + double d1 = source.getY() + enumfacing.getYOffset() * 1.125F; + double d2 = source.getZ() + enumfacing.getZOffset() * 1.125F; BlockPos pos = source.getBlockPos().offset(enumfacing); IBlockState state = world.getBlockState(pos); double d3; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index 5771f6003..1eb368bf5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -72,7 +72,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { if (meta < 2 || meta > 5) { meta = 2; } - return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.byIndex(meta)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 015675883..06ee92d74 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -154,10 +154,10 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon } @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity par5Entity) { - if(par5Entity instanceof EntityItem) { + public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) { + if(entity instanceof EntityItem) { TilePool tile = (TilePool) world.getTileEntity(pos); - if(tile.collideEntityItem((EntityItem) par5Entity)) + if(tile.collideEntityItem((EntityItem) entity)) VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index f0d6b04d9..b8d7b9c60 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -87,7 +87,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, @Nonnull @Override @SideOnly(Side.CLIENT) - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } @@ -136,7 +136,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { - boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; + boolean power = world.getRedstonePowerFromNeighbors(pos) > 0 || world.getRedstonePowerFromNeighbors(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); if(!world.isRemote) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index 808587ca1..48ceada6b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -77,7 +77,7 @@ public class BlockPump extends BlockMod implements ILexiconable { if (meta < 2 || meta > 5) { meta = 2; } - return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.byIndex(meta)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index 06d430bbe..b58eabde8 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -60,7 +60,7 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { @Nonnull @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(BotaniaStateProps.FACING, EnumFacing.getFront(meta)); + return getDefaultState().withProperty(BotaniaStateProps.FACING, EnumFacing.byIndex(meta)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java index 8994b3edf..1d5b7a9af 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -56,13 +56,13 @@ public class BlockRedStringDispenser extends BlockRedString { public IBlockState getStateFromMeta(int meta) { boolean powered = (meta & 8) != 0; meta &= -9; - EnumFacing facing = EnumFacing.getFront(meta); + EnumFacing facing = EnumFacing.byIndex(meta); return getDefaultState().withProperty(BotaniaStateProps.FACING, facing).withProperty(BotaniaStateProps.POWERED, powered); } @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { - boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; + boolean power = world.getRedstonePowerFromNeighbors(pos) > 0 || world.getRedstonePowerFromNeighbors(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); if(power && !powered) { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index cb5f965d0..a291a7cc8 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -63,7 +63,7 @@ public class BlockRedStringInterceptor extends BlockRedString { public IBlockState getStateFromMeta(int meta) { boolean powered = (meta & 8) != 0; meta &= -9; - EnumFacing facing = EnumFacing.getFront(meta); + EnumFacing facing = EnumFacing.byIndex(meta); return getDefaultState().withProperty(BotaniaStateProps.FACING, facing).withProperty(BotaniaStateProps.POWERED, powered); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index b2e64a960..8cb36a7bf 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -41,7 +41,7 @@ public class SubTileDaffomill extends SubTileFunctional { super.onUpdate(); if(supertile.getWorld().rand.nextInt(4) == 0) - Botania.proxy.wispFX(supertile.getPos().getX() + Math.random(), supertile.getPos().getY() + Math.random(), supertile.getPos().getZ() + Math.random(), 0.05F, 0.05F, 0.05F, 0.25F + (float) Math.random() * 0.15F, orientation.getFrontOffsetX() * 0.1F, orientation.getFrontOffsetY() * 0.1F, orientation.getFrontOffsetZ() * 0.1F); + Botania.proxy.wispFX(supertile.getPos().getX() + Math.random(), supertile.getPos().getY() + Math.random(), supertile.getPos().getZ() + Math.random(), 0.05F, 0.05F, 0.05F, 0.25F + (float) Math.random() * 0.15F, orientation.getXOffset() * 0.1F, orientation.getYOffset() * 0.1F, orientation.getZOffset() * 0.1F); if(windTicks == 0 && mana > 0) { windTicks = 20; @@ -56,9 +56,9 @@ public class SubTileDaffomill extends SubTileFunctional { int slowdown = getSlowdownFactor(); for(EntityItem item : items) { if(!item.isDead && item.age >= slowdown) { - item.motionX += orientation.getFrontOffsetX() * 0.05; - item.motionY += orientation.getFrontOffsetY() * 0.05; - item.motionZ += orientation.getFrontOffsetZ() * 0.05; + item.motionX += orientation.getXOffset() * 0.05; + item.motionY += orientation.getYOffset() * 0.05; + item.motionZ += orientation.getZOffset() * 0.05; } } } @@ -154,7 +154,7 @@ public class SubTileDaffomill extends SubTileFunctional { public void readFromPacketNBT(NBTTagCompound cmp) { super.readFromPacketNBT(cmp); - orientation = EnumFacing.getFront(cmp.getInteger(TAG_ORIENTATION) + 2); // retain compat with 1.7 saves + orientation = EnumFacing.byIndex(cmp.getInteger(TAG_ORIENTATION) + 2); // retain compat with 1.7 saves windTicks = cmp.getInteger(TAG_WIND_TICKS); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index f740a38f9..131ec6f3b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -44,7 +44,7 @@ public class SubTileEndoflame extends SubTileGenerating { if(getWorld().isRemote) { if(burnTime > 0 && supertile.getWorld().rand.nextInt(10) == 0) { - Vec3d offset = getWorld().getBlockState(getPos()).getOffset(getWorld(), getPos()).addVector(0.4, 0.7, 0.4); + Vec3d offset = getWorld().getBlockState(getPos()).getOffset(getWorld(), getPos()).add(0.4, 0.7, 0.4); supertile.getWorld().spawnParticle(EnumParticleTypes.FLAME, supertile.getPos().getX() + offset.x + Math.random() * 0.2, supertile.getPos().getY() + offset.y, supertile.getPos().getZ() + offset.z + Math.random() * 0.2, 0.0D, 0.0D, 0.0D); } return; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 3bf5bbaa8..8cc6fa666 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -64,7 +64,7 @@ public class SubTileGourmaryllis extends SubTileGenerating { } else if(cooldown % munchInterval == 0) { getWorld().playSound(null, supertile.getPos(), SoundEvents.ENTITY_GENERIC_EAT, SoundCategory.BLOCKS, 0.5f, 1); - Vec3d offset = getWorld().getBlockState(getPos()).getOffset(getWorld(), getPos()).addVector(0.4, 0.6, 0.4); + Vec3d offset = getWorld().getBlockState(getPos()).getOffset(getWorld(), getPos()).add(0.4, 0.6, 0.4); ((WorldServer) supertile.getWorld()).spawnParticle(EnumParticleTypes.ITEM_CRACK, supertile.getPos().getX()+offset.x, supertile.getPos().getY()+offset.y, supertile.getPos().getZ()+offset.z, 10, 0.1D, 0.1D, 0.1D, 0.03D, Item.getIdFromItem(lastFood.getItem()), lastFood.getItemDamage()); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java index 7477a9c7f..5b05f5955 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java @@ -96,7 +96,7 @@ public class SubTileNarslimmus extends SubTileGenerating { } public static boolean isSlimeChunk(World world, int x, int z) { - Chunk chunk = world.getChunkFromBlockCoords(new BlockPos(x, 0, z)); + Chunk chunk = world.getChunk(new BlockPos(x, 0, z)); return chunk.getRandomWithSeed(987234911L).nextInt(10) == 0; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index dc87da0a4..e6532cd92 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -128,7 +128,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, return true; } - if(SEED_PATTERN.matcher(stack.getUnlocalizedName()).find()) { + if(SEED_PATTERN.matcher(stack.getTranslationKey()).find()) { for(RecipePetals recipe : BotaniaAPI.petalRecipes) { if(recipe.matches(itemHandler)) { saveLastRecipe(); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 02a9a8465..a0f06af9a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -395,7 +395,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { ItemStack pool = new ItemStack(ModBlocks.pool, 1, world.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT).ordinal()); - String name = I18n.format(pool.getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); + String name = I18n.format(pool.getTranslationKey().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = 0x4444FF; HUDHandler.drawSimpleManaHUD(color, knownMana, manaCap, name, res); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index ccae31870..c197bc963 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -566,13 +566,13 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(playerIn instanceof net.minecraft.entity.player.EntityPlayerMP) { d3 = ((net.minecraft.entity.player.EntityPlayerMP) playerIn).interactionManager.getBlockReachDistance(); } - Vec3d vec3d1 = vec3d.addVector((double) f6 * d3, (double) f5 * d3, (double) f7 * d3); + Vec3d vec3d1 = vec3d.add((double) f6 * d3, (double) f5 * d3, (double) f7 * d3); return worldIn.rayTraceBlocks(vec3d, vec3d1, useLiquids, !useLiquids, false); } @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { - String name = I18n.format(new ItemStack(ModBlocks.spreader, 1, world.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); + String name = I18n.format(new ItemStack(ModBlocks.spreader, 1, world.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal()).getTranslationKey().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = isRedstone() ? 0xFF0000 : isDreamwood() ? 0xFF00AE : 0x00FF00; HUDHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index b0d16df12..58d2866fb 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -38,15 +38,10 @@ public final class BotaniaCreativeTab extends CreativeTabs { @Nonnull @Override - public ItemStack getIconItemStack() { + public ItemStack createIcon() { return new ItemStack(ModItems.lexicon); } - @Override - public ItemStack getTabIconItem() { - return getIconItemStack(); - } - @Override public boolean hasSearchBar() { return true; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 6309ff7c9..7d63aba83 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -142,7 +142,7 @@ public class EntityThornChakram extends EntityThrowable { if(bounces < MAX_BOUNCES) { Vector3 currentMovementVec = new Vector3(motionX, motionY, motionZ); EnumFacing dir = pos.sideHit; - Vector3 normalVector = new Vector3(dir.getFrontOffsetX(), dir.getFrontOffsetY(), dir.getFrontOffsetZ()).normalize(); + Vector3 normalVector = new Vector3(dir.getXOffset(), dir.getYOffset(), dir.getZOffset()).normalize(); Vector3 movementVec = normalVector.multiply(-2 * currentMovementVec.dotProduct(normalVector)).add(currentMovementVec); motionX = movementVec.x; diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 482ac3d6d..3f06bb116 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -37,8 +37,8 @@ public class Item16Colors extends ItemMod { @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return getUnlocalizedNameLazy(stack) + stack.getItemDamage(); } @SideOnly(Side.CLIENT) @@ -47,8 +47,8 @@ public class Item16Colors extends ItemMod { ModelHandler.registerItemAllMeta(this, EnumDyeColor.values().length); } - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); + String getUnlocalizedNameLazy(ItemStack stack) { + return super.getTranslationKey(stack); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 92ddffdc5..76f0ba8ef 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -55,8 +55,8 @@ public class ItemAncientWill extends ItemMod { @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + stack.getItemDamage(); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java index 676a749f0..49aac5a51 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java +++ b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java @@ -215,9 +215,9 @@ public class ItemAstrolabe extends ItemMod { for(int x = -xOff; x < xOff + 1; x++) for(int y = 0; y < yOff * 2 + 1; y++) { for(int z = -zOff; z < zOff + 1; z++) { - int xp = pos.getX() + x + dir.getFrontOffsetX(); - int yp = pos.getY() + y + dir.getFrontOffsetY(); - int zp = pos.getZ() + z + dir.getFrontOffsetZ(); + int xp = pos.getX() + x + dir.getXOffset(); + int yp = pos.getY() + y + dir.getYOffset(); + int zp = pos.getZ() + z + dir.getZOffset(); BlockPos newPos = new BlockPos(xp, yp, zp); IBlockState state1 = player.world.getBlockState(newPos); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index b53174eff..2baee4ec7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -227,7 +227,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { Block block = getBlock(par1ItemStack); if(block != null) { int count = getBlockCount(par1ItemStack); - stacks.add(count + " " + I18n.format(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getUnlocalizedName() + ".name")); + stacks.add(count + " " + I18n.format(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getTranslationKey() + ".name")); } if(par1ItemStack.getItemDamage() == 1) diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 8b04aa58c..86ba782ed 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -57,8 +57,8 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + stack.getItemDamage(); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 001f528d8..7749ddd21 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -68,8 +68,8 @@ public class ItemCorporeaSpark extends ItemMod { @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + stack.getItemDamage(); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index 2ea0d6608..e4767f1d5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -59,8 +59,8 @@ public class ItemCraftPattern extends ItemMod { @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + stack.getItemDamage(); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 9bc2171a6..0e9f66752 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -68,8 +68,8 @@ public class ItemGrassHorn extends ItemMod { @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + stack.getItemDamage(); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 7ee53046d..eecfff7eb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -78,8 +78,8 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { @Nonnull @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName() + stack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + stack.getItemDamage(); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index b47e9fd0e..5375f1228 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -35,7 +35,7 @@ public class ItemManaCookie extends ItemFood implements IModelRegister { setPotionEffect(new PotionEffect(MobEffects.SATURATION, 20, 0), 1F); setCreativeTab(BotaniaCreativeTab.INSTANCE); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibItemNames.MANA_COOKIE)); - setUnlocalizedName(LibItemNames.MANA_COOKIE); + setTranslationKey(LibItemNames.MANA_COOKIE); addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "totalbiscuit"), (stack, worldIn, entityIn) -> stack.getDisplayName().toLowerCase(Locale.ROOT).contains("totalbiscuit") ? 1F : 0F); } diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index f07c23003..a52af7b09 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -29,7 +29,7 @@ public abstract class ItemMod extends Item implements IModelRegister { public ItemMod(String name) { setCreativeTab(BotaniaCreativeTab.INSTANCE); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - setUnlocalizedName(name); + setTranslationKey(name); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 719d58816..a4fa31146 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -39,8 +39,8 @@ public class ItemSparkUpgrade extends ItemMod { @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return getUnlocalizedNameLazy(stack) + stack.getItemDamage(); } @SideOnly(Side.CLIENT) @@ -49,7 +49,7 @@ public class ItemSparkUpgrade extends ItemMod { ModelHandler.registerItemAppendMeta(this, 4, LibItemNames.SPARK_UPGRADE); } - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); + String getUnlocalizedNameLazy(ItemStack stack) { + return super.getTranslationKey(stack); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index baab3c655..bad2cc429 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -46,8 +46,8 @@ public class ItemThornChakram extends ItemMod { @Nonnull @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName() + stack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey() + stack.getItemDamage(); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 5adc35fe5..e48f7ec5b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -246,8 +246,8 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack); + public String getTranslationKey(ItemStack stack) { + return getUnlocalizedNameLazy(stack); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 9b5aa7acd..d8b8503ef 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -138,8 +138,8 @@ public class ItemVirus extends ItemMod { @Nonnull @Override - public String getUnlocalizedName(ItemStack stack) { - return super.getUnlocalizedName(stack) + stack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + stack.getItemDamage(); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java index 8e26c9b6d..5e38f827b 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java @@ -25,7 +25,7 @@ public class ItemBlockFloatingSpecialFlower extends ItemBlockSpecialFlower { @Nonnull @Override public String getItemStackDisplayName(@Nonnull ItemStack stack) { - String flowerName = getUnlocalizedName(stack) + ".name"; + String flowerName = getTranslationKey(stack) + ".name"; return String.format(I18n.translateToLocal("botaniamisc.floatingPrefix"), I18n.translateToLocal(flowerName)); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java index 7e441f4a0..b08bfb519 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java @@ -25,8 +25,8 @@ public class ItemBlockModSlab extends ItemSlab { @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return block.getUnlocalizedName().replaceAll("tile.", "tile.botania:"); + public String getTranslationKey(ItemStack stack) { + return block.getTranslationKey().replaceAll("tile.", "tile.botania:"); } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index e87b9c2e2..7afd9c650 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -80,7 +80,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr @Nonnull @Override - public String getUnlocalizedName(ItemStack stack) { + public String getTranslationKey(ItemStack stack) { return BotaniaAPI.getSignatureForName(getType(stack)).getUnlocalizedNameForStack(stack); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java index a65d55f0c..baa81fdb5 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java @@ -25,7 +25,7 @@ public class ItemBlockSpecialQuartz extends ItemMultiTexture { @Nonnull @Override - public String getUnlocalizedName(@Nonnull ItemStack par1ItemStack) { - return par1ItemStack.getItemDamage() >= 3 ? "" : ((BlockSpecialQuartz) block).getNames()[par1ItemStack.getItemDamage()]; + public String getTranslationKey(@Nonnull ItemStack stack) { + return stack.getItemDamage() >= 3 ? "" : ((BlockSpecialQuartz) block).getNames()[stack.getItemDamage()]; } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java index c462dc762..cbf7f2981 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java @@ -24,8 +24,8 @@ public class ItemBlockWithMetadataAndName extends ItemBlockMod { @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + stack.getItemDamage(); } @Override diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index bea264ca9..4d25530a5 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -46,8 +46,8 @@ public class ItemVial extends ItemMod implements IBrewContainer { @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + stack.getItemDamage(); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 1236c6b39..4db95c2ae 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -70,7 +70,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan this.type = type; setCreativeTab(BotaniaCreativeTab.INSTANCE); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - setUnlocalizedName(name); + setTranslationKey(name); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index 5a5aeffc5..81e911676 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -53,8 +53,8 @@ public class ItemManaweaveArmor extends ItemManasteelArmor { @Nonnull @Override @SideOnly(Side.CLIENT) - public String getUnlocalizedName(ItemStack stack) { - String name = super.getUnlocalizedName(stack); + public String getTranslationKey(ItemStack stack) { + String name = super.getTranslationKey(stack); if(ClientProxy.jingleTheBells) name = name.replaceAll("manaweave", "santaweave"); return name; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 43f265170..3b98293f4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -58,7 +58,7 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { @Override public Multimap getAttributeModifiers(@Nonnull EntityEquipmentSlot slot, ItemStack stack) { Multimap multimap = super.getAttributeModifiers(slot, stack); - UUID uuid = new UUID((getUnlocalizedName() + slot.toString()).hashCode(), 0); + UUID uuid = new UUID((getTranslationKey(stack) + slot.toString()).hashCode(), 0); if (slot == armorType) { multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type.getIndex()) / 20, 0)); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 805a1f947..9946f3326 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -74,7 +74,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt IItemHandler inv = BaublesApi.getBaublesHandler((EntityPlayer) evt.getEntityLiving()); for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); - if (!stack.isEmpty() && stack.getItem().getRegistryName().getResourceDomain().equals(LibMisc.MOD_ID)) { + if (!stack.isEmpty() && stack.getItem().getRegistryName().getNamespace().equals(LibMisc.MOD_ID)) { ((ItemBauble) stack.getItem()).onUnequipped(stack, evt.getEntityLiving()); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 81bb34258..78d2b3d1b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -73,8 +73,8 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return super.getTranslationKey(stack) + stack.getItemDamage(); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index fc0e99b64..de95d9c4d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -92,7 +92,7 @@ public final class ToolCommons { TileEntity tile = world.getTileEntity(pos); if(block.removedByPlayer(state, world, pos, player, true)) { - block.onBlockDestroyedByPlayer(world, pos, state); + block.onPlayerDestroy(world, pos, state); if(!dispose || !ItemElementiumPick.isDisposable(block)) { block.harvestBlock(world, player, pos, state, tile, stack); @@ -153,7 +153,7 @@ public final class ToolCommons { { d3 = ((net.minecraft.entity.player.EntityPlayerMP)playerIn).interactionManager.getBlockReachDistance(); }*/ - Vec3d vec3d1 = vec3d.addVector((double)f6 * d3, (double)f5 * d3, (double)f7 * d3); + Vec3d vec3d1 = vec3d.add((double)f6 * d3, (double)f5 * d3, (double)f7 * d3); return worldIn.rayTraceBlocks(vec3d, vec3d1, useLiquids, !useLiquids, false); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index 4fa7e4f63..14a049ef5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -60,7 +60,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel public ItemLivingwoodBow(String name) { setCreativeTab(BotaniaCreativeTab.INSTANCE); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - setUnlocalizedName(name); + setTranslationKey(name); setMaxDamage(500); addPropertyOverride(new ResourceLocation("minecraft:pull"), (stack, worldIn, entityIn) -> { if (entityIn == null) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index 53f134c9e..40cfca866 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -57,7 +57,7 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab super(mat, 8F, -3.1F); setCreativeTab(BotaniaCreativeTab.INSTANCE); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - setUnlocalizedName(name); + setTranslationKey(name); } @Nonnull @@ -89,7 +89,7 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackAt = player.inventory.getStackInSlot(i); - if(!stackAt.isEmpty() && SAPLING_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) { + if(!stackAt.isEmpty() && SAPLING_PATTERN.matcher(stackAt.getItem().getTranslationKey()).find()) { ItemStack saveHeldStack = player.getHeldItem(hand); player.setHeldItem(hand, stackAt); EnumActionResult did = stackAt.getItem().onItemUse(player, world, pos, hand, side, sx, sy, sz); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index 7d67ea102..6395f2723 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -57,7 +57,7 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - setUnlocalizedName(name); + setTranslationKey(name); } @Nonnull @@ -85,7 +85,7 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackAt = player.inventory.getStackInSlot(i); - if(!stackAt.isEmpty() && TORCH_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) { + if(!stackAt.isEmpty() && TORCH_PATTERN.matcher(stackAt.getItem().getTranslationKey()).find()) { ItemStack saveHeldStack = player.getHeldItem(hand); player.setHeldItem(hand, stackAt); EnumActionResult did = stackAt.getItem().onItemUse(player, world, pos, hand, side, sx, sy, sz); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index 0c6cb3410..55acb02d6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -54,7 +54,7 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem, I public ItemManasteelShears(String name) { setCreativeTab(BotaniaCreativeTab.INSTANCE); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - setUnlocalizedName(name); + setTranslationKey(name); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index b8cae9624..702e1afc2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -58,7 +58,7 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - setUnlocalizedName(name); + setTranslationKey(name); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index 4cd546c80..aba5e05ff 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -48,7 +48,7 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem, IMo super(mat); setCreativeTab(BotaniaCreativeTab.INSTANCE); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - setUnlocalizedName(name); + setTranslationKey(name); addPropertyOverride(new ResourceLocation("botania", "elucidator"), (stack, worldIn, entityIn) -> "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) ? 1 : 0); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index 6d6d3c386..4e87627ab 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -171,9 +171,9 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; boolean thor = ItemThorRing.getThorRing(player) != null; - boolean doX = thor || side.getFrontOffsetX() == 0; - boolean doY = thor || side.getFrontOffsetY() == 0; - boolean doZ = thor || side.getFrontOffsetZ() == 0; + boolean doX = thor || side.getXOffset() == 0; + boolean doY = thor || side.getYOffset() == 0; + boolean doZ = thor || side.getZOffset() == 0; int origLevel = getLevel(stack); int level = origLevel + (thor ? 1 : 0); diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index a666f369d..54df35eca 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -155,8 +155,8 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return "item." + LibItemNames.LENS_NAMES[Math.min(SUBTYPES - 1, par1ItemStack.getItemDamage())]; + public String getTranslationKey(ItemStack stack) { + return "item." + LibItemNames.LENS_NAMES[Math.min(SUBTYPES - 1, stack.getItemDamage())]; } @SideOnly(Side.CLIENT) @@ -169,7 +169,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens private String getItemShortTermName(ItemStack stack) { - return net.minecraft.util.text.translation.I18n.translateToLocal(stack.getUnlocalizedName().replaceAll("item.", "item.botania:") + ".short"); + return net.minecraft.util.text.translation.I18n.translateToLocal(stack.getTranslationKey().replaceAll("item.", "item.botania:") + ".short"); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/lens/LensBounce.java b/src/main/java/vazkii/botania/common/item/lens/LensBounce.java index 415138940..bebd45c19 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensBounce.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensBounce.java @@ -27,7 +27,7 @@ public class LensBounce extends Lens { if(!coords.equals(pos.getBlockPos())) { Vector3 currentMovementVec = new Vector3(entity.motionX, entity.motionY, entity.motionZ); EnumFacing dir = pos.sideHit; - Vector3 normalVector = new Vector3(dir.getFrontOffsetX(), dir.getFrontOffsetY(), dir.getFrontOffsetZ()).normalize(); + Vector3 normalVector = new Vector3(dir.getXOffset(), dir.getYOffset(), dir.getZOffset()).normalize(); Vector3 movementVec = normalVector.multiply(-2 * currentMovementVec.dotProduct(normalVector)).add(currentMovementVec); burst.setMotion(movementVec.x, movementVec.y, movementVec.z); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java index dd5f7f1b7..48be156c1 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java @@ -32,7 +32,7 @@ public class LensPiston extends Lens { IBlockState state = entity.world.getBlockState(pos.getBlockPos()); TileEntity tile = entity.world.getTileEntity(pos.getBlockPos()); - if(state.getMobilityFlag() == EnumPushReaction.NORMAL && state.getBlock() != Blocks.OBSIDIAN && state.getBlockHardness(entity.world, pos_) >= 0 && tile == null) { + if(state.getPushReaction() == EnumPushReaction.NORMAL && state.getBlock() != Blocks.OBSIDIAN && state.getBlockHardness(entity.world, pos_) >= 0 && tile == null) { entity.world.destroyBlock(pos.getBlockPos(), false); entity.world.setBlockState(pos_, state, 1 | 2); } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 0098aa2fb..205a69aaa 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -131,8 +131,8 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(types - 1, par1ItemStack.getItemDamage())]; + public String getTranslationKey(ItemStack stack) { + return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(types - 1, stack.getItemDamage())]; } @Override diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 95fa64433..596422685 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -42,12 +42,12 @@ public class ItemQuartz extends ItemMod implements IElvenItem { @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return getUnlocalizedNameLazy(stack) + stack.getItemDamage(); } private String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); + return super.getTranslationKey(par1ItemStack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index cd9be4bb6..15a4cbbc0 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -40,12 +40,12 @@ public class ItemRune extends ItemMod implements IFlowerComponent { @Nonnull @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getTranslationKey(ItemStack stack) { + return getUnlocalizedNameLazy(stack) + stack.getItemDamage(); } - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); + String getUnlocalizedNameLazy(ItemStack stack) { + return super.getTranslationKey(stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index 038074400..1e645741a 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -33,7 +33,7 @@ public class ItemModRecord extends ItemRecord implements IModelRegister { super("botania:" + record, sound); setCreativeTab(BotaniaCreativeTab.INSTANCE); setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - setUnlocalizedName(name); + setTranslationKey(name); file = "botania:music." + record; } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 0f94acb4b..4719eed0f 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -69,7 +69,7 @@ public class ItemRelic extends ItemMod implements IRelic { if(stack.getItem() == ModItems.dice) { addStringToTooltip("", list); - String name = stack.getUnlocalizedName() + ".poem"; + String name = stack.getTranslationKey() + ".poem"; for(int i = 0; i < 4; i++) addStringToTooltip(TextFormatting.ITALIC + I18n.format(name + i), list); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java index 4ff59f4c3..e7877f1e2 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -72,7 +72,7 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, IBlockProvid if(stackToPlace.isEmpty()) { ManaItemHandler.requestManaExactForTool(stack, player, cost, true); for(int i = 0; i < 6; i++) - Botania.proxy.sparkleFX(pos.getX() + side.getFrontOffsetX() + Math.random(), pos.getY() + side.getFrontOffsetY() + Math.random(), pos.getZ() + side.getFrontOffsetZ() + Math.random(), r, g, b, 1F, 5); + Botania.proxy.sparkleFX(pos.getX() + side.getXOffset() + Math.random(), pos.getY() + side.getYOffset() + Math.random(), pos.getZ() + side.getZOffset() + Math.random(), r, g, b, 1F, 5); return EnumActionResult.SUCCESS; } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java index 70480dd1d..ee19807ca 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -44,7 +44,7 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { if (ManaItemHandler.requestManaExactForTool(stack, player, COST, true) && ((ItemBucket) Items.WATER_BUCKET).tryPlaceContainedLiquid(player, world, placePos)) { for(int i = 0; i < 6; i++) - Botania.proxy.sparkleFX(pos.getX() + side.getFrontOffsetX() + Math.random(), pos.getY() + side.getFrontOffsetY() + Math.random(), pos.getZ() + side.getFrontOffsetZ() + Math.random(), 0.2F, 0.2F, 1F, 1F, 5); + Botania.proxy.sparkleFX(pos.getX() + side.getXOffset() + Math.random(), pos.getY() + side.getYOffset() + Math.random(), pos.getZ() + side.getZOffset() + Math.random(), 0.2F, 0.2F, 1F, 1F, 5); return EnumActionResult.SUCCESS; } } diff --git a/src/main/java/vazkii/botania/common/network/PacketDodge.java b/src/main/java/vazkii/botania/common/network/PacketDodge.java index 8fc582764..9684bbcc1 100644 --- a/src/main/java/vazkii/botania/common/network/PacketDodge.java +++ b/src/main/java/vazkii/botania/common/network/PacketDodge.java @@ -38,7 +38,7 @@ public class PacketDodge implements IMessage { @Override public IMessage onMessage(PacketDodge message, MessageContext ctx) { EntityPlayerMP player = ctx.getServerHandler().player; - player.mcServer.addScheduledTask(() -> { + player.server.addScheduledTask(() -> { player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.dash, SoundCategory.PLAYERS, 1F, 1F); IItemHandler baublesInv = BaublesApi.getBaublesHandler(player); diff --git a/src/main/java/vazkii/botania/common/network/PacketJump.java b/src/main/java/vazkii/botania/common/network/PacketJump.java index 46263d0a5..c2de6dfde 100644 --- a/src/main/java/vazkii/botania/common/network/PacketJump.java +++ b/src/main/java/vazkii/botania/common/network/PacketJump.java @@ -34,7 +34,7 @@ public class PacketJump implements IMessage { @Override public IMessage onMessage(PacketJump message, MessageContext ctx) { EntityPlayerMP player = ctx.getServerHandler().player; - player.mcServer.addScheduledTask(() -> { + player.server.addScheduledTask(() -> { IItemHandler baublesInv = BaublesApi.getBaublesHandler(player); ItemStack amuletStack = baublesInv.getStackInSlot(0); diff --git a/src/main/java/vazkii/botania/common/network/PacketLeftClick.java b/src/main/java/vazkii/botania/common/network/PacketLeftClick.java index 089d7666a..eb7349db6 100644 --- a/src/main/java/vazkii/botania/common/network/PacketLeftClick.java +++ b/src/main/java/vazkii/botania/common/network/PacketLeftClick.java @@ -20,7 +20,7 @@ public class PacketLeftClick implements IMessage { @Override public IMessage onMessage(PacketLeftClick message, MessageContext ctx) { EntityPlayerMP player = ctx.getServerHandler().player; - player.mcServer.addScheduledTask(() -> ((ItemTerraSword) ModItems.terraSword).trySpawnBurst(player)); + player.server.addScheduledTask(() -> ((ItemTerraSword) ModItems.terraSword).trySpawnBurst(player)); return null; } }