diff --git a/src/main/java/com/lothrazar/samscontrolblocks/ModControlBlocks.java b/src/main/java/com/lothrazar/samscontrolblocks/ModControlBlocks.java index 9e11a79..d7c5af4 100644 --- a/src/main/java/com/lothrazar/samscontrolblocks/ModControlBlocks.java +++ b/src/main/java/com/lothrazar/samscontrolblocks/ModControlBlocks.java @@ -12,15 +12,18 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.StatCollector; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvent; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -123,7 +126,7 @@ else if(ClientProxy.keyTransform.isPressed()) public static void playSoundAt(World world,BlockPos pos, String sound) { - world.playSound(pos.getX(), pos.getY(), pos.getZ(), sound, 1.0F, 1.0F, false); + world.playSound((double)pos.getX(), (double)pos.getY(), (double)pos.getZ(), new SoundEvent(new ResourceLocation(sound)), SoundCategory.MASTER,1.0F, 1.0F,false); } public static ArrayList getBlockListFromCSV(String csv) @@ -151,25 +154,25 @@ public static ArrayList getBlockListFromCSV(String csv) public static void playSoundAt(Entity player, String sound) { - player.worldObj.playSoundAtEntity(player, sound, 1.0F, 1.0F); + player.world.playSound((double)player.getPosition().getX(), (double)player.getPosition().getY(), (double)player.getPosition().getZ(), new SoundEvent(new ResourceLocation(sound)), SoundCategory.MASTER,1.0F, 1.0F,false); } public static String lang(String name) { - return StatCollector.translateToLocal(name); + return name; } public static void addChatMessage(String string) { - addChatMessage(new ChatComponentTranslation(string)); + addChatMessage(string); } - public static void addChatMessage(IChatComponent string) + public static void addChatMessage(ITextComponent string) { Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(string); } public static void addChatMessage(EntityPlayer player,String string) { - player.addChatMessage(new ChatComponentTranslation(string)); + player.sendMessage(new TextComponentString(string)); } public static EnumFacing getPlayerFacing(EntityPlayer player) @@ -203,7 +206,7 @@ public static void spawnParticle(World world, EnumParticleTypes type, double x, public static void execute(EntityPlayer player, String cmd) { - MinecraftServer.getServer().getCommandManager().executeCommand(player, cmd); + FMLCommonHandler.instance().getMinecraftServerInstance().getCommandManager().executeCommand(player, cmd); } } diff --git a/src/main/java/com/lothrazar/samscontrolblocks/UtilMoveBlock.java b/src/main/java/com/lothrazar/samscontrolblocks/UtilMoveBlock.java index aa480ad..7cb730b 100644 --- a/src/main/java/com/lothrazar/samscontrolblocks/UtilMoveBlock.java +++ b/src/main/java/com/lothrazar/samscontrolblocks/UtilMoveBlock.java @@ -6,7 +6,8 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; @@ -23,18 +24,18 @@ private static void translateCSV() ignoreList = ModControlBlocks.getBlockListFromCSV(ignoreListFromConfig); //ignoreList.add(Blocks.bedrock); - ignoreList.add(Blocks.end_portal_frame); - ignoreList.add(Blocks.end_portal); - ignoreList.add(Blocks.portal); - ignoreList.add(Blocks.bed); - ignoreList.add(Blocks.dark_oak_door); - ignoreList.add(Blocks.acacia_door); - ignoreList.add(Blocks.birch_door); - ignoreList.add(Blocks.oak_door); - ignoreList.add(Blocks.spruce_door); - ignoreList.add(Blocks.jungle_door); - ignoreList.add(Blocks.iron_door); - ignoreList.add(Blocks.skull); + ignoreList.add(Blocks.END_PORTAL_FRAME); + ignoreList.add(Blocks.END_PORTAL); + ignoreList.add(Blocks.PORTAL); + ignoreList.add(Blocks.BED); + ignoreList.add(Blocks.DARK_OAK_DOOR); + ignoreList.add(Blocks.ACACIA_DOOR); + ignoreList.add(Blocks.BIRCH_DOOR); + ignoreList.add(Blocks.OAK_DOOR); + ignoreList.add(Blocks.SPRUCE_DOOR); + ignoreList.add(Blocks.JUNGLE_DOOR); + ignoreList.add(Blocks.IRON_DOOR); + ignoreList.add(Blocks.SKULL); } } @@ -67,8 +68,7 @@ public static void moveBlockTo(World world, EntityPlayer player,BlockPos pos, Bl //world.destroyBlock(posMoveToHere, false); world.destroyBlock(pos, false); world.setBlockState(posMoveToHere, hit);//pulls the block towards the player - - player.swingItem(); + player.swingArm(EnumHand.MAIN_HAND); } } } diff --git a/src/main/java/com/lothrazar/samscontrolblocks/UtilRotateBlockMeta.java b/src/main/java/com/lothrazar/samscontrolblocks/UtilRotateBlockMeta.java index aabbd29..02a4efe 100644 --- a/src/main/java/com/lothrazar/samscontrolblocks/UtilRotateBlockMeta.java +++ b/src/main/java/com/lothrazar/samscontrolblocks/UtilRotateBlockMeta.java @@ -4,7 +4,8 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; @@ -13,14 +14,14 @@ public class UtilRotateBlockMeta private static int INVALID = -1; public static void transformBlock(EntityPlayer player, World world, BlockPos pos) { - IBlockState blockState = player.worldObj.getBlockState(pos); + IBlockState blockState = player.world.getBlockState(pos); Block block = blockState.getBlock(); int metaCurrent, metaNew = INVALID; IBlockState blockStateNew = null; - if(block == Blocks.red_mushroom_block) + if(block == Blocks.RED_MUSHROOM_BLOCK) { - metaCurrent = Blocks.red_mushroom_block.getMetaFromState(blockState); + metaCurrent = Blocks.RED_MUSHROOM_BLOCK.getMetaFromState(blockState); //from wiki we know that [11-13] are unused //meta 14 is only vanilla used one //OLD one was meta 0, all pores @@ -35,12 +36,12 @@ else if(metaCurrent == 15) metaNew = 0; if(metaNew > INVALID) - blockStateNew = Blocks.red_mushroom_block.getStateFromMeta(metaNew); + blockStateNew = Blocks.RED_MUSHROOM_BLOCK.getStateFromMeta(metaNew); } - else if(block == Blocks.stonebrick) + else if(block == Blocks.STONEBRICK) { - metaCurrent = Blocks.stonebrick.getMetaFromState(blockState); + metaCurrent = Blocks.STONEBRICK.getMetaFromState(blockState); if(metaCurrent == 0)//0 is regular, 3 is chiseled metaNew = 3; @@ -49,12 +50,12 @@ else if(metaCurrent == 3) //Not doing mossy or cracked here is deliberate, it costs vines or smelting time to make those if(metaNew > INVALID) - blockStateNew = Blocks.stonebrick.getStateFromMeta(metaNew); + blockStateNew = Blocks.STONEBRICK.getStateFromMeta(metaNew); } - else if(block == Blocks.stone) + else if(block == Blocks.STONE) { - metaCurrent = Blocks.stone.getMetaFromState(blockState); + metaCurrent = Blocks.STONE.getMetaFromState(blockState); //skip 0 which is regular stone //granite regular/polish @@ -74,11 +75,11 @@ else if(metaCurrent == 6) metaNew = 5; if(metaNew > INVALID) - blockStateNew = Blocks.stone.getStateFromMeta(metaNew); + blockStateNew = Blocks.STONE.getStateFromMeta(metaNew); } - else if(block == Blocks.brown_mushroom_block) + else if(block == Blocks.BROWN_MUSHROOM_BLOCK) { - metaCurrent = Blocks.brown_mushroom_block.getMetaFromState(blockState); + metaCurrent = Blocks.BROWN_MUSHROOM_BLOCK.getMetaFromState(blockState); if(0 <= metaCurrent && metaCurrent <= 9) metaNew = metaCurrent+1; @@ -90,11 +91,11 @@ else if(metaCurrent == 15) metaNew = 0; if(metaNew > INVALID) - blockStateNew = Blocks.brown_mushroom_block.getStateFromMeta(metaNew); + blockStateNew = Blocks.BROWN_MUSHROOM_BLOCK.getStateFromMeta(metaNew); } - else if(block == Blocks.double_stone_slab) + else if(block == Blocks.DOUBLE_STONE_SLAB) { - metaCurrent = Blocks.double_stone_slab.getMetaFromState(blockState); + metaCurrent = Blocks.DOUBLE_STONE_SLAB.getMetaFromState(blockState); if(metaCurrent == 0)//smoothstone slabs metaNew = 8; @@ -107,11 +108,11 @@ else if(metaCurrent == 9) metaNew = 1; if(metaNew > INVALID) - blockStateNew = Blocks.double_stone_slab.getStateFromMeta(metaNew); + blockStateNew = Blocks.DOUBLE_STONE_SLAB.getStateFromMeta(metaNew); } - else if(block == Blocks.double_stone_slab2) + else if(block == Blocks.DOUBLE_STONE_SLAB2) { - metaCurrent = Blocks.double_stone_slab2.getMetaFromState(blockState); + metaCurrent = Blocks.DOUBLE_STONE_SLAB2.getMetaFromState(blockState); if(metaCurrent == 0)//RED sandstone slabs metaNew = 8; @@ -119,11 +120,11 @@ else if(metaCurrent == 8) metaNew = 0; if(metaNew > INVALID) - blockStateNew = Blocks.double_stone_slab2.getStateFromMeta(metaNew); + blockStateNew = Blocks.DOUBLE_STONE_SLAB2.getStateFromMeta(metaNew); } - else if(block == Blocks.log2) + else if(block == Blocks.LOG2) { - metaCurrent = Blocks.log2.getMetaFromState(blockState); + metaCurrent = Blocks.LOG2.getMetaFromState(blockState); int acaciaVert = 0; @@ -155,11 +156,11 @@ else if(metaCurrent == darkMagic) metaNew = darkVert; if(metaNew > INVALID) - blockStateNew = Blocks.log2.getStateFromMeta(metaNew); + blockStateNew = Blocks.LOG2.getStateFromMeta(metaNew); } - else if(block == Blocks.log) + else if(block == Blocks.LOG) { - metaCurrent = Blocks.log.getMetaFromState(blockState); + metaCurrent = Blocks.LOG.getMetaFromState(blockState); int oakVert = 0; int spruceVert=1; @@ -216,12 +217,12 @@ else if(metaCurrent == jungleMagic) if(metaNew > INVALID) { - blockStateNew = Blocks.log.getStateFromMeta(metaNew); + blockStateNew = Blocks.LOG.getStateFromMeta(metaNew); } } - else if(block == Blocks.stone_slab) + else if(block == Blocks.STONE_SLAB) { - metaCurrent = Blocks.stone_slab.getMetaFromState(blockState); + metaCurrent = Blocks.STONE_SLAB.getMetaFromState(blockState); if(metaCurrent <= 7) metaNew = metaCurrent + 8; @@ -231,12 +232,12 @@ else if(block == Blocks.stone_slab) if(metaNew > INVALID) { - blockStateNew = Blocks.stone_slab.getStateFromMeta(metaNew); + blockStateNew = Blocks.STONE_SLAB.getStateFromMeta(metaNew); } } - else if(block == Blocks.stone_slab2) + else if(block == Blocks.STONE_SLAB2) { - metaCurrent = Blocks.stone_slab2.getMetaFromState(blockState); + metaCurrent = Blocks.STONE_SLAB2.getMetaFromState(blockState); if(metaCurrent <= 7) metaNew = metaCurrent + 8; @@ -246,12 +247,12 @@ else if(block == Blocks.stone_slab2) if(metaNew > INVALID) { - blockStateNew = Blocks.stone_slab2.getStateFromMeta(metaNew); + blockStateNew = Blocks.STONE_SLAB2.getStateFromMeta(metaNew); } } - else if(block == Blocks.wooden_slab) + else if(block == Blocks.WOODEN_SLAB) { - metaCurrent = Blocks.wooden_slab.getMetaFromState(blockState); + metaCurrent = Blocks.WOODEN_SLAB.getMetaFromState(blockState); if(metaCurrent <= 7) metaNew = metaCurrent + 8; @@ -261,12 +262,12 @@ else if(block == Blocks.wooden_slab) if(metaNew > INVALID) { - blockStateNew = Blocks.wooden_slab.getStateFromMeta(metaNew); + blockStateNew = Blocks.WOODEN_SLAB.getStateFromMeta(metaNew); } } - else if(block == Blocks.sandstone) + else if(block == Blocks.SANDSTONE) { - metaCurrent = Blocks.sandstone.getMetaFromState(blockState); + metaCurrent = Blocks.SANDSTONE.getMetaFromState(blockState); if(metaCurrent == 2) metaNew = 0; @@ -276,12 +277,12 @@ else if(block == Blocks.sandstone) if(metaNew > INVALID) { - blockStateNew = Blocks.sandstone.getStateFromMeta(metaNew); + blockStateNew = Blocks.SANDSTONE.getStateFromMeta(metaNew); } } - else if(block == Blocks.red_sandstone) + else if(block == Blocks.RED_SANDSTONE) { - metaCurrent = Blocks.red_sandstone.getMetaFromState(blockState); + metaCurrent = Blocks.RED_SANDSTONE.getMetaFromState(blockState); if(metaCurrent == 2) metaNew = 0; @@ -291,12 +292,12 @@ else if(block == Blocks.red_sandstone) if(metaNew > INVALID) { - blockStateNew = Blocks.red_sandstone.getStateFromMeta(metaNew); + blockStateNew = Blocks.RED_SANDSTONE.getStateFromMeta(metaNew); } } - else if(block == Blocks.sandstone_stairs) + else if(block == Blocks.SANDSTONE_STAIRS) { - metaCurrent = Blocks.sandstone_stairs.getMetaFromState(blockState); + metaCurrent = Blocks.SANDSTONE_STAIRS.getMetaFromState(blockState); if(metaCurrent == 8) metaNew = 0; @@ -305,12 +306,12 @@ else if(block == Blocks.sandstone_stairs) if(metaNew > INVALID) { - blockStateNew = Blocks.sandstone_stairs.getStateFromMeta(metaNew); + blockStateNew = Blocks.SANDSTONE_STAIRS.getStateFromMeta(metaNew); } } - else if(block == Blocks.red_sandstone_stairs) + else if(block == Blocks.RED_SANDSTONE_STAIRS) { - metaCurrent = Blocks.red_sandstone_stairs.getMetaFromState(blockState); + metaCurrent = Blocks.RED_SANDSTONE_STAIRS.getMetaFromState(blockState); if(metaCurrent == 8) metaNew = 0; @@ -319,12 +320,12 @@ else if(block == Blocks.red_sandstone_stairs) if(metaNew > INVALID) { - blockStateNew = Blocks.red_sandstone_stairs.getStateFromMeta(metaNew); + blockStateNew = Blocks.RED_SANDSTONE_STAIRS.getStateFromMeta(metaNew); } } - else if(block == Blocks.stone_stairs) + else if(block == Blocks.STONE_STAIRS) { - metaCurrent = Blocks.stone_stairs.getMetaFromState(blockState); + metaCurrent = Blocks.STONE_STAIRS.getMetaFromState(blockState); if(metaCurrent == 8) metaNew = 0; @@ -333,12 +334,12 @@ else if(block == Blocks.stone_stairs) if(metaNew > INVALID) { - blockStateNew = Blocks.stone_stairs.getStateFromMeta(metaNew); + blockStateNew = Blocks.STONE_STAIRS.getStateFromMeta(metaNew); } } - else if(block == Blocks.stone_brick_stairs) + else if(block == Blocks.STONE_BRICK_STAIRS) { - metaCurrent = Blocks.stone_brick_stairs.getMetaFromState(blockState); + metaCurrent = Blocks.STONE_BRICK_STAIRS.getMetaFromState(blockState); if(metaCurrent == 8) metaNew = 0; @@ -347,12 +348,12 @@ else if(block == Blocks.stone_brick_stairs) if(metaNew > INVALID) { - blockStateNew = Blocks.stone_brick_stairs.getStateFromMeta(metaNew); + blockStateNew = Blocks.STONE_BRICK_STAIRS.getStateFromMeta(metaNew); } } - else if(block == Blocks.quartz_stairs) + else if(block == Blocks.QUARTZ_STAIRS) { - metaCurrent = Blocks.quartz_stairs.getMetaFromState(blockState); + metaCurrent = Blocks.QUARTZ_STAIRS.getMetaFromState(blockState); if(metaCurrent == 8) metaNew = 0; @@ -361,12 +362,12 @@ else if(block == Blocks.quartz_stairs) if(metaNew > INVALID) { - blockStateNew = Blocks.quartz_stairs.getStateFromMeta(metaNew); + blockStateNew = Blocks.QUARTZ_STAIRS.getStateFromMeta(metaNew); } } - else if(block == Blocks.brick_stairs) + else if(block == Blocks.BRICK_STAIRS) { - metaCurrent = Blocks.brick_stairs.getMetaFromState(blockState); + metaCurrent = Blocks.BRICK_STAIRS.getMetaFromState(blockState); if(metaCurrent == 8) metaNew = 0; @@ -375,12 +376,12 @@ else if(block == Blocks.brick_stairs) if(metaNew > INVALID) { - blockStateNew = Blocks.brick_stairs.getStateFromMeta(metaNew); + blockStateNew = Blocks.BRICK_STAIRS.getStateFromMeta(metaNew); } } - else if(block == Blocks.spruce_stairs) + else if(block == Blocks.SPRUCE_STAIRS) { - metaCurrent = Blocks.spruce_stairs.getMetaFromState(blockState); + metaCurrent = Blocks.SPRUCE_STAIRS.getMetaFromState(blockState); if(metaCurrent == 8) metaNew = 0; @@ -389,12 +390,12 @@ else if(block == Blocks.spruce_stairs) if(metaNew > INVALID) { - blockStateNew = Blocks.spruce_stairs.getStateFromMeta(metaNew); + blockStateNew = Blocks.SPRUCE_STAIRS.getStateFromMeta(metaNew); } } - else if(block == Blocks.birch_stairs) + else if(block == Blocks.BIRCH_STAIRS) { - metaCurrent = Blocks.birch_stairs.getMetaFromState(blockState); + metaCurrent = Blocks.BIRCH_STAIRS.getMetaFromState(blockState); if(metaCurrent == 8) metaNew = 0; @@ -403,12 +404,12 @@ else if(block == Blocks.birch_stairs) if(metaNew > INVALID) { - blockStateNew = Blocks.birch_stairs.getStateFromMeta(metaNew); + blockStateNew = Blocks.BIRCH_STAIRS.getStateFromMeta(metaNew); } } - else if(block == Blocks.oak_stairs) + else if(block == Blocks.OAK_STAIRS) { - metaCurrent = Blocks.oak_stairs.getMetaFromState(blockState); + metaCurrent = Blocks.OAK_STAIRS.getMetaFromState(blockState); if(metaCurrent == 8) metaNew = 0; @@ -417,12 +418,12 @@ else if(block == Blocks.oak_stairs) if(metaNew > INVALID) { - blockStateNew = Blocks.oak_stairs.getStateFromMeta(metaNew); + blockStateNew = Blocks.OAK_STAIRS.getStateFromMeta(metaNew); } } - else if(block == Blocks.jungle_stairs) + else if(block == Blocks.JUNGLE_STAIRS) { - metaCurrent = Blocks.jungle_stairs.getMetaFromState(blockState); + metaCurrent = Blocks.JUNGLE_STAIRS.getMetaFromState(blockState); if(metaCurrent == 8) metaNew = 0; @@ -431,12 +432,12 @@ else if(block == Blocks.jungle_stairs) if(metaNew > INVALID) { - blockStateNew = Blocks.jungle_stairs.getStateFromMeta(metaNew); + blockStateNew = Blocks.JUNGLE_STAIRS.getStateFromMeta(metaNew); } } - else if(block == Blocks.acacia_stairs) + else if(block == Blocks.ACACIA_STAIRS) { - metaCurrent = Blocks.acacia_stairs.getMetaFromState(blockState); + metaCurrent = Blocks.ACACIA_STAIRS.getMetaFromState(blockState); if(metaCurrent == 8) metaNew = 0; @@ -445,12 +446,12 @@ else if(block == Blocks.acacia_stairs) if(metaNew > INVALID) { - blockStateNew = Blocks.acacia_stairs.getStateFromMeta(metaNew); + blockStateNew = Blocks.ACACIA_STAIRS.getStateFromMeta(metaNew); } } - else if(block == Blocks.dark_oak_stairs) + else if(block == Blocks.DARK_OAK_STAIRS) { - metaCurrent = Blocks.dark_oak_stairs.getMetaFromState(blockState); + metaCurrent = Blocks.DARK_OAK_STAIRS.getMetaFromState(blockState); if(metaCurrent == 8) metaNew = 0; @@ -459,12 +460,12 @@ else if(block == Blocks.dark_oak_stairs) if(metaNew > INVALID) { - blockStateNew = Blocks.dark_oak_stairs.getStateFromMeta(metaNew); + blockStateNew = Blocks.DARK_OAK_STAIRS.getStateFromMeta(metaNew); } } - else if(block == Blocks.quartz_block) + else if(block == Blocks.QUARTZ_BLOCK) { - metaCurrent = Blocks.quartz_block.getMetaFromState(blockState); + metaCurrent = Blocks.QUARTZ_BLOCK.getMetaFromState(blockState); if(metaCurrent == 4) metaNew = 0; @@ -473,12 +474,12 @@ else if(block == Blocks.quartz_block) if(metaNew > INVALID) { - blockStateNew = Blocks.quartz_block.getStateFromMeta(metaNew); + blockStateNew = Blocks.QUARTZ_BLOCK.getStateFromMeta(metaNew); } } - else if(block == Blocks.pumpkin) + else if(block == Blocks.PUMPKIN) { - metaCurrent = Blocks.pumpkin.getMetaFromState(blockState); + metaCurrent = Blocks.PUMPKIN.getMetaFromState(blockState); if(metaCurrent == 4) metaNew = 0; @@ -487,12 +488,12 @@ else if(block == Blocks.pumpkin) if(metaNew > INVALID) { - blockStateNew = Blocks.pumpkin.getStateFromMeta(metaNew); + blockStateNew = Blocks.PUMPKIN.getStateFromMeta(metaNew); } } - else if(block == Blocks.lit_pumpkin) + else if(block == Blocks.LIT_PUMPKIN) { - metaCurrent = Blocks.lit_pumpkin.getMetaFromState(blockState); + metaCurrent = Blocks.LIT_PUMPKIN.getMetaFromState(blockState); if(metaCurrent == 4) metaNew = 0; @@ -501,12 +502,12 @@ else if(block == Blocks.lit_pumpkin) if(metaNew > INVALID) { - blockStateNew = Blocks.lit_pumpkin.getStateFromMeta(metaNew); + blockStateNew = Blocks.LIT_PUMPKIN.getStateFromMeta(metaNew); } } - else if(block == Blocks.hay_block) + else if(block == Blocks.HAY_BLOCK) { - metaCurrent = Blocks.hay_block.getMetaFromState(blockState); + metaCurrent = Blocks.HAY_BLOCK.getMetaFromState(blockState); if(metaCurrent == 0) metaNew = 4; @@ -517,12 +518,12 @@ else if(metaCurrent == 8) if(metaNew > INVALID) { - blockStateNew = Blocks.hay_block.getStateFromMeta(metaNew); + blockStateNew = Blocks.HAY_BLOCK.getStateFromMeta(metaNew); } } - else if(block == Blocks.rail) + else if(block == Blocks.RAIL) { - metaCurrent = Blocks.rail.getMetaFromState(blockState); + metaCurrent = Blocks.RAIL.getMetaFromState(blockState); /*RAILS: * 0 Straight rail connecting to the north and south. @@ -542,12 +543,12 @@ else if(block == Blocks.rail) if(metaNew > INVALID) { - blockStateNew = Blocks.rail.getStateFromMeta(metaNew); + blockStateNew = Blocks.RAIL.getStateFromMeta(metaNew); } } - else if(block == Blocks.dropper) + else if(block == Blocks.DROPPER) { - metaCurrent = Blocks.dropper.getMetaFromState(blockState); + metaCurrent = Blocks.DROPPER.getMetaFromState(blockState); if(metaCurrent == 5) metaNew = 0; @@ -556,12 +557,12 @@ else if(block == Blocks.dropper) if(metaNew > INVALID) { - blockStateNew = Blocks.dropper.getStateFromMeta(metaNew); + blockStateNew = Blocks.DROPPER.getStateFromMeta(metaNew); } } - else if(block == Blocks.dispenser) + else if(block == Blocks.DISPENSER) { - metaCurrent = Blocks.dispenser.getMetaFromState(blockState); + metaCurrent = Blocks.DISPENSER.getMetaFromState(blockState); if(metaCurrent == 5) metaNew = 0; @@ -570,12 +571,12 @@ else if(block == Blocks.dispenser) if(metaNew > INVALID) { - blockStateNew = Blocks.dispenser.getStateFromMeta(metaNew); + blockStateNew = Blocks.DISPENSER.getStateFromMeta(metaNew); } } - else if(block == Blocks.hopper) + else if(block == Blocks.HOPPER) { - metaCurrent = Blocks.hopper.getMetaFromState(blockState); + metaCurrent = Blocks.HOPPER.getMetaFromState(blockState); if(metaCurrent == 5) metaNew = 0; @@ -586,12 +587,12 @@ else if(metaCurrent == 0) //1 is unused (cant point Up) if(metaNew > INVALID) { - blockStateNew = Blocks.hopper.getStateFromMeta(metaNew); + blockStateNew = Blocks.HOPPER.getStateFromMeta(metaNew); } } - else if(block == Blocks.furnace) + else if(block == Blocks.FURNACE) { - metaCurrent = Blocks.furnace.getMetaFromState(blockState); + metaCurrent = Blocks.FURNACE.getMetaFromState(blockState); if(metaCurrent == 5) //0,1 are down/up, but only 4 directions here metaNew = 2; @@ -600,12 +601,12 @@ else if(block == Blocks.furnace) if(metaNew > INVALID) { - blockStateNew = Blocks.furnace.getStateFromMeta(metaNew); + blockStateNew = Blocks.FURNACE.getStateFromMeta(metaNew); } } - else if(block == Blocks.chest) + else if(block == Blocks.CHEST) { - metaCurrent = Blocks.chest.getMetaFromState(blockState); + metaCurrent = Blocks.CHEST.getMetaFromState(blockState); if(metaCurrent == 5) //0,1 are down/up, but only 4 directions here metaNew = 2; @@ -614,12 +615,12 @@ else if(block == Blocks.chest) if(metaNew > INVALID) { - blockStateNew = Blocks.chest.getStateFromMeta(metaNew); + blockStateNew = Blocks.CHEST.getStateFromMeta(metaNew); } } - else if(block == Blocks.trapped_chest) + else if(block == Blocks.TRAPPED_CHEST) { - metaCurrent = Blocks.trapped_chest.getMetaFromState(blockState); + metaCurrent = Blocks.TRAPPED_CHEST.getMetaFromState(blockState); if(metaCurrent == 5) //0,1 are down/up, but only 4 directions here metaNew = 2; @@ -628,12 +629,12 @@ else if(block == Blocks.trapped_chest) if(metaNew > INVALID) { - blockStateNew = Blocks.trapped_chest.getStateFromMeta(metaNew); + blockStateNew = Blocks.TRAPPED_CHEST.getStateFromMeta(metaNew); } } - else if(block == Blocks.piston) + else if(block == Blocks.PISTON) { - metaCurrent = Blocks.piston.getMetaFromState(blockState); + metaCurrent = Blocks.PISTON.getMetaFromState(blockState); if(metaCurrent == 5) metaNew = 0; @@ -642,12 +643,12 @@ else if(block == Blocks.piston) if(metaNew > INVALID) { - blockStateNew = Blocks.piston.getStateFromMeta(metaNew); + blockStateNew = Blocks.PISTON.getStateFromMeta(metaNew); } } - else if(block == Blocks.sticky_piston) + else if(block == Blocks.STICKY_PISTON) { - metaCurrent = Blocks.sticky_piston.getMetaFromState(blockState); + metaCurrent = Blocks.STICKY_PISTON.getMetaFromState(blockState); if(metaCurrent == 5) metaNew = 0; @@ -656,12 +657,12 @@ else if(block == Blocks.sticky_piston) if(metaNew > INVALID) { - blockStateNew = Blocks.sticky_piston.getStateFromMeta(metaNew); + blockStateNew = Blocks.STICKY_PISTON.getStateFromMeta(metaNew); } } - else if(block == Blocks.wall_sign) + else if(block == Blocks.WALL_SIGN) { - metaCurrent = Blocks.wall_sign.getMetaFromState(blockState); + metaCurrent = Blocks.WALL_SIGN.getMetaFromState(blockState); if(metaCurrent == 5) //0,1 are down/up, but only 4 directions here metaNew = 2; @@ -670,12 +671,12 @@ else if(block == Blocks.wall_sign) if(metaNew > INVALID) { - blockStateNew = Blocks.wall_sign.getStateFromMeta(metaNew); + blockStateNew = Blocks.WALL_SIGN.getStateFromMeta(metaNew); } } - else if(block == Blocks.standing_sign) + else if(block == Blocks.STANDING_SIGN) { - metaCurrent = Blocks.standing_sign.getMetaFromState(blockState); + metaCurrent = Blocks.STANDING_SIGN.getMetaFromState(blockState); if(metaCurrent == 15) metaNew = 0; @@ -684,12 +685,12 @@ else if(block == Blocks.standing_sign) if(metaNew > INVALID) { - blockStateNew = Blocks.standing_sign.getStateFromMeta(metaNew); + blockStateNew = Blocks.STANDING_SIGN.getStateFromMeta(metaNew); } } - else if(block == Blocks.standing_banner) + else if(block == Blocks.STANDING_BANNER) { - metaCurrent = Blocks.standing_banner.getMetaFromState(blockState); + metaCurrent = Blocks.STANDING_BANNER.getMetaFromState(blockState); if(metaCurrent == 15) metaNew = 0; @@ -698,12 +699,12 @@ else if(block == Blocks.standing_banner) if(metaNew > INVALID) { - blockStateNew = Blocks.standing_banner.getStateFromMeta(metaNew); + blockStateNew = Blocks.STANDING_BANNER.getStateFromMeta(metaNew); } } - else if(block == Blocks.trapdoor) + else if(block == Blocks.TRAPDOOR) { - metaCurrent = Blocks.trapdoor.getMetaFromState(blockState); + metaCurrent = Blocks.TRAPDOOR.getMetaFromState(blockState); if(metaCurrent >= 8) metaNew = metaCurrent - 8; //move it from top to bottom and back. NOT spinning its side @@ -712,12 +713,12 @@ else if(block == Blocks.trapdoor) if(metaNew > INVALID) { - blockStateNew = Blocks.trapdoor.getStateFromMeta(metaNew); + blockStateNew = Blocks.TRAPDOOR.getStateFromMeta(metaNew); } } - else if(block == Blocks.iron_trapdoor) + else if(block == Blocks.IRON_TRAPDOOR) { - metaCurrent = Blocks.iron_trapdoor.getMetaFromState(blockState); + metaCurrent = Blocks.IRON_TRAPDOOR.getMetaFromState(blockState); if(metaCurrent >= 8) metaNew = metaCurrent - 8; @@ -726,13 +727,13 @@ else if(block == Blocks.iron_trapdoor) if(metaNew > INVALID) { - blockStateNew = Blocks.iron_trapdoor.getStateFromMeta(metaNew); + blockStateNew = Blocks.IRON_TRAPDOOR.getStateFromMeta(metaNew); } } if(blockStateNew != null) { - player.swingItem(); + player.swingArm(EnumHand.MAIN_HAND); if(world.isRemote) // clientside { @@ -742,7 +743,7 @@ else if(block == Blocks.iron_trapdoor) { ModControlBlocks.playSoundAt(player, "random.wood_click"); - player.worldObj.setBlockState(pos,blockStateNew); + player.world.setBlockState(pos,blockStateNew); } diff --git a/src/main/java/com/lothrazar/samscontrolblocks/proxy/MessageKeyPull.java b/src/main/java/com/lothrazar/samscontrolblocks/proxy/MessageKeyPull.java index cfe1520..1a13a50 100644 --- a/src/main/java/com/lothrazar/samscontrolblocks/proxy/MessageKeyPull.java +++ b/src/main/java/com/lothrazar/samscontrolblocks/proxy/MessageKeyPull.java @@ -9,7 +9,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; public class MessageKeyPull implements IMessage, IMessageHandler { @@ -46,9 +46,9 @@ public void toBytes(ByteBuf buf) @Override public IMessage onMessage(MessageKeyPull message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; + EntityPlayer player = ctx.getServerHandler().player; //.playerEntity; - UtilMoveBlock.moveBlockTo(player.worldObj, player, message.pos, message.pos.offset(player.getHorizontalFacing().getOpposite())); + UtilMoveBlock.moveBlockTo(player.world, player, message.pos, message.pos.offset(player.getHorizontalFacing().getOpposite())); return null; } diff --git a/src/main/java/com/lothrazar/samscontrolblocks/proxy/MessageKeyPush.java b/src/main/java/com/lothrazar/samscontrolblocks/proxy/MessageKeyPush.java index 4f1702a..fc5d7b1 100644 --- a/src/main/java/com/lothrazar/samscontrolblocks/proxy/MessageKeyPush.java +++ b/src/main/java/com/lothrazar/samscontrolblocks/proxy/MessageKeyPush.java @@ -9,20 +9,20 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; public class MessageKeyPush implements IMessage, IMessageHandler { - private BlockPos pos; + private net.minecraft.util.math.BlockPos pos; private String csv; public static final int ID = 0; public MessageKeyPush() { } - public MessageKeyPush(BlockPos pm) + public MessageKeyPush(net.minecraft.util.math.BlockPos posMouse) { - pos = pm; + pos = posMouse; csv = ModControlBlocks.posToCSV(pos); } @@ -45,9 +45,9 @@ public void toBytes(ByteBuf buf) @Override public IMessage onMessage(MessageKeyPush message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; + EntityPlayer player = ctx.getServerHandler().player; // .playerEntity; - UtilMoveBlock.moveBlockTo(player.worldObj, player, message.pos, message.pos.offset(player.getHorizontalFacing())); + UtilMoveBlock.moveBlockTo(player.world, player, message.pos, message.pos.offset(player.getHorizontalFacing())); //.worldObj return null; } diff --git a/src/main/java/com/lothrazar/samscontrolblocks/proxy/MessageKeyRotate.java b/src/main/java/com/lothrazar/samscontrolblocks/proxy/MessageKeyRotate.java index 82e95e8..37470c6 100644 --- a/src/main/java/com/lothrazar/samscontrolblocks/proxy/MessageKeyRotate.java +++ b/src/main/java/com/lothrazar/samscontrolblocks/proxy/MessageKeyRotate.java @@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; public class MessageKeyRotate implements IMessage, IMessageHandler { @@ -44,9 +44,9 @@ public void toBytes(ByteBuf buf) @Override public IMessage onMessage(MessageKeyRotate message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; + EntityPlayer player = ctx.getServerHandler().player; - UtilRotateBlockMeta.transformBlock(player, player.worldObj, message.pos); + UtilRotateBlockMeta.transformBlock(player, player.world, message.pos); return null; }