diff --git a/build.gradle b/build.gradle index 0e29fcec7..16d2addb1 100644 --- a/build.gradle +++ b/build.gradle @@ -70,8 +70,8 @@ if (ENV.BUILD_NUMBER) { } minecraft { - version = "1.10.2-12.18.2.2121" - mappings = "snapshot_20161105" + version = "1.11-13.19.0.2152" + mappings = "snapshot_20161118" replace "@MODVERSION@", project.version // makeObfSourceJar = false useDepAts = true @@ -94,13 +94,15 @@ dependencies { if(!f.exists()){ f.mkdir() } - deobfCompile 'RebornCore:RebornCore-1.10.2:+:universal' - deobfCompile "mezz.jei:jei_1.10.2:+" -// compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24:deobf" - deobfCompile "slimeknights:TConstruct:1.10.2-2.5.3.jenkins384" - deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170" - deobfCompile "mcjty.theoneprobe:TheOneProbe:1.9.4-1.0.4-14" - deobfCompile 'net.industrial-craft:industrialcraft-2:2.6.58-ex110:dev' + deobfCompile 'RebornCore:RebornCore-1.11:+:universal' + deobfCompile "mezz.jei:jei_1.11:+" + //1.11 updates +// compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24:deobf" +// deobfCompile "slimeknights:TConstruct:1.10.2-2.5.3.jenkins384" +// deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170" + deobfCompile "mcjty.theoneprobe:TheOneProbe:1.11-1.3.3-46" + //Only API untill + deobfCompile 'net.industrial-craft:industrialcraft-2:2.6.58-ex110:api' } diff --git a/src/main/java/techreborn/api/gui/SlotUpgrade.java b/src/main/java/techreborn/api/gui/SlotUpgrade.java index 2ff85f997..851382279 100644 --- a/src/main/java/techreborn/api/gui/SlotUpgrade.java +++ b/src/main/java/techreborn/api/gui/SlotUpgrade.java @@ -2,7 +2,7 @@ package techreborn.api.gui; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import reborncore.client.gui.BaseSlot; +import reborncore.client.gui.slots.BaseSlot; import techreborn.utils.upgrade.IMachineUpgrade; public class SlotUpgrade extends BaseSlot { diff --git a/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java b/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java index f951a90e3..213487d08 100644 --- a/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java +++ b/src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java @@ -55,7 +55,7 @@ public class RecipeConfigManager { ConfigItem newItem = new ConfigItem(); newItem.setItemName(stack.getItem().getUnlocalizedName()); newItem.setMeta(stack.getItemDamage()); - newItem.setStackSize(stack.stackSize); + newItem.setStackSize(stack.getCount()); newItem.setLocalName(stack.getDisplayName()); return newItem; } diff --git a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java index 75025d721..430434572 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java @@ -52,7 +52,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock { } @Override - public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block neighborBlock) { + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block neighborBlock, BlockPos p_189540_5_) { if (worldIn.canBlockSeeSky(pos.up()) && !worldIn.isRaining() && !worldIn.isThundering() && worldIn.isDaytime()) { worldIn.setBlockState(pos, diff --git a/src/main/java/techreborn/client/StackToolTipEvent.java b/src/main/java/techreborn/client/StackToolTipEvent.java index b14da7e97..f6526ca0a 100644 --- a/src/main/java/techreborn/client/StackToolTipEvent.java +++ b/src/main/java/techreborn/client/StackToolTipEvent.java @@ -53,7 +53,7 @@ public class StackToolTipEvent { Block block = Block.getBlockFromItem(event.getItemStack().getItem()); if (block != null && (block instanceof BlockContainer || block instanceof ITileEntityProvider) && block.getRegistryName().getResourceDomain().contains("techreborn")) { - TileEntity tile = block.createTileEntity(Minecraft.getMinecraft().theWorld, + TileEntity tile = block.createTileEntity(Minecraft.getMinecraft().world, block.getDefaultState()); if (tile instanceof IListInfoProvider) { ((IListInfoProvider) tile).addInfo(event.getToolTip(), false); diff --git a/src/main/java/techreborn/client/TechRebornCreativeTab.java b/src/main/java/techreborn/client/TechRebornCreativeTab.java index e627bd60f..c869cffd4 100644 --- a/src/main/java/techreborn/client/TechRebornCreativeTab.java +++ b/src/main/java/techreborn/client/TechRebornCreativeTab.java @@ -2,6 +2,7 @@ package techreborn.client; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import techreborn.init.ModBlocks; public class TechRebornCreativeTab extends CreativeTabs { @@ -13,7 +14,7 @@ public class TechRebornCreativeTab extends CreativeTabs { } @Override - public Item getTabIconItem() { - return Item.getItemFromBlock(ModBlocks.thermalGenerator); + public ItemStack getTabIconItem() { + return new ItemStack(ModBlocks.thermalGenerator); } } diff --git a/src/main/java/techreborn/client/TechRebornCreativeTabMisc.java b/src/main/java/techreborn/client/TechRebornCreativeTabMisc.java index 0aaadad03..17c5c2374 100644 --- a/src/main/java/techreborn/client/TechRebornCreativeTabMisc.java +++ b/src/main/java/techreborn/client/TechRebornCreativeTabMisc.java @@ -2,6 +2,7 @@ package techreborn.client; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import techreborn.init.ModItems; public class TechRebornCreativeTabMisc extends CreativeTabs { @@ -13,8 +14,8 @@ public class TechRebornCreativeTabMisc extends CreativeTabs { } @Override - public Item getTabIconItem() { - return ModItems.dynamicCell; + public ItemStack getTabIconItem() { + return new ItemStack(ModItems.dynamicCell); } } diff --git a/src/main/java/techreborn/client/container/ContainerAESU.java b/src/main/java/techreborn/client/container/ContainerAESU.java index 198ec9678..67ea286f9 100644 --- a/src/main/java/techreborn/client/container/ContainerAESU.java +++ b/src/main/java/techreborn/client/container/ContainerAESU.java @@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; +import reborncore.client.gui.slots.BaseSlot; import reborncore.common.container.RebornContainer; import techreborn.tiles.TileAesu; diff --git a/src/main/java/techreborn/client/container/ContainerAlloyFurnace.java b/src/main/java/techreborn/client/container/ContainerAlloyFurnace.java index 5bb7c5d68..82da51f25 100644 --- a/src/main/java/techreborn/client/container/ContainerAlloyFurnace.java +++ b/src/main/java/techreborn/client/container/ContainerAlloyFurnace.java @@ -3,8 +3,8 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.SlotFurnaceFuel; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.tiles.TileAlloyFurnace; diff --git a/src/main/java/techreborn/client/container/ContainerAlloySmelter.java b/src/main/java/techreborn/client/container/ContainerAlloySmelter.java index 9811bfc24..05142cf63 100644 --- a/src/main/java/techreborn/client/container/ContainerAlloySmelter.java +++ b/src/main/java/techreborn/client/container/ContainerAlloySmelter.java @@ -3,10 +3,10 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; import reborncore.api.tile.IContainerLayout; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotCharge; -import reborncore.client.gui.SlotInput; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotCharge; +import reborncore.client.gui.slots.SlotInput; +import reborncore.client.gui.slots.SlotOutput; import techreborn.api.gui.SlotUpgrade; import techreborn.tiles.TileAlloySmelter; diff --git a/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java b/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java index 85276ab54..8cf68d4df 100644 --- a/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java +++ b/src/main/java/techreborn/client/container/ContainerAssemblingMachine.java @@ -3,8 +3,8 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; import reborncore.api.tile.IContainerLayout; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import techreborn.api.gui.SlotUpgrade; import techreborn.tiles.TileAssemblingMachine; diff --git a/src/main/java/techreborn/client/container/ContainerBatbox.java b/src/main/java/techreborn/client/container/ContainerBatbox.java index 81ef96398..8d934ad15 100644 --- a/src/main/java/techreborn/client/container/ContainerBatbox.java +++ b/src/main/java/techreborn/client/container/ContainerBatbox.java @@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotCharge; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotCharge; import reborncore.common.container.RebornContainer; import techreborn.tiles.storage.TileBatBox; diff --git a/src/main/java/techreborn/client/container/ContainerBlastFurnace.java b/src/main/java/techreborn/client/container/ContainerBlastFurnace.java index 3814faa79..d190f0f47 100644 --- a/src/main/java/techreborn/client/container/ContainerBlastFurnace.java +++ b/src/main/java/techreborn/client/container/ContainerBlastFurnace.java @@ -2,8 +2,8 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IContainerListener; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import techreborn.tiles.multiblock.TileBlastFurnace; public class ContainerBlastFurnace extends ContainerCrafting { diff --git a/src/main/java/techreborn/client/container/ContainerCentrifuge.java b/src/main/java/techreborn/client/container/ContainerCentrifuge.java index d456e866d..910837450 100644 --- a/src/main/java/techreborn/client/container/ContainerCentrifuge.java +++ b/src/main/java/techreborn/client/container/ContainerCentrifuge.java @@ -3,8 +3,8 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; import reborncore.api.tile.IContainerLayout; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import techreborn.api.gui.SlotUpgrade; import techreborn.tiles.TileCentrifuge; diff --git a/src/main/java/techreborn/client/container/ContainerChargeBench.java b/src/main/java/techreborn/client/container/ContainerChargeBench.java index d5779bbc2..890b6d629 100644 --- a/src/main/java/techreborn/client/container/ContainerChargeBench.java +++ b/src/main/java/techreborn/client/container/ContainerChargeBench.java @@ -1,11 +1,11 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import reborncore.client.gui.BaseSlot; +import reborncore.client.gui.slots.BaseSlot; import reborncore.common.container.RebornContainer; import techreborn.tiles.TileChargeBench; -//import reborncore.client.gui.BaseSlot; +//import reborncore.client.gui.slots.BaseSlot; public class ContainerChargeBench extends RebornContainer { diff --git a/src/main/java/techreborn/client/container/ContainerChemicalReactor.java b/src/main/java/techreborn/client/container/ContainerChemicalReactor.java index 6cdc7db20..babf78760 100644 --- a/src/main/java/techreborn/client/container/ContainerChemicalReactor.java +++ b/src/main/java/techreborn/client/container/ContainerChemicalReactor.java @@ -1,8 +1,8 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import techreborn.api.gui.SlotUpgrade; import techreborn.tiles.TileChemicalReactor; diff --git a/src/main/java/techreborn/client/container/ContainerChunkloader.java b/src/main/java/techreborn/client/container/ContainerChunkloader.java index c10ac95a1..5c60df8fa 100644 --- a/src/main/java/techreborn/client/container/ContainerChunkloader.java +++ b/src/main/java/techreborn/client/container/ContainerChunkloader.java @@ -1,7 +1,7 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import reborncore.client.gui.BaseSlot; +import reborncore.client.gui.slots.BaseSlot; import reborncore.common.container.RebornContainer; import techreborn.tiles.TileChunkLoader; diff --git a/src/main/java/techreborn/client/container/ContainerCompressor.java b/src/main/java/techreborn/client/container/ContainerCompressor.java index bfbcaf07e..4ee749f15 100644 --- a/src/main/java/techreborn/client/container/ContainerCompressor.java +++ b/src/main/java/techreborn/client/container/ContainerCompressor.java @@ -1,8 +1,8 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import techreborn.api.gui.SlotUpgrade; import techreborn.tiles.teir1.TileCompressor; diff --git a/src/main/java/techreborn/client/container/ContainerDestructoPack.java b/src/main/java/techreborn/client/container/ContainerDestructoPack.java index 7c9160f66..d6ba81d9f 100644 --- a/src/main/java/techreborn/client/container/ContainerDestructoPack.java +++ b/src/main/java/techreborn/client/container/ContainerDestructoPack.java @@ -2,8 +2,8 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotFilteredVoid; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotFilteredVoid; import reborncore.common.container.RebornContainer; import reborncore.common.util.Inventory; import techreborn.init.ModItems; diff --git a/src/main/java/techreborn/client/container/ContainerDieselGenerator.java b/src/main/java/techreborn/client/container/ContainerDieselGenerator.java index 370986ace..45abd18a6 100644 --- a/src/main/java/techreborn/client/container/ContainerDieselGenerator.java +++ b/src/main/java/techreborn/client/container/ContainerDieselGenerator.java @@ -4,9 +4,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotFake; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotFake; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.tiles.generator.TileDieselGenerator; diff --git a/src/main/java/techreborn/client/container/ContainerDigitalChest.java b/src/main/java/techreborn/client/container/ContainerDigitalChest.java index 6e4aa9d43..37f70db62 100644 --- a/src/main/java/techreborn/client/container/ContainerDigitalChest.java +++ b/src/main/java/techreborn/client/container/ContainerDigitalChest.java @@ -1,9 +1,9 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotFake; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotFake; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.tiles.TileDigitalChest; diff --git a/src/main/java/techreborn/client/container/ContainerElectricFurnace.java b/src/main/java/techreborn/client/container/ContainerElectricFurnace.java index da41c0169..14c3488bb 100644 --- a/src/main/java/techreborn/client/container/ContainerElectricFurnace.java +++ b/src/main/java/techreborn/client/container/ContainerElectricFurnace.java @@ -3,8 +3,8 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.api.gui.SlotUpgrade; import techreborn.tiles.teir1.TileElectricFurnace; diff --git a/src/main/java/techreborn/client/container/ContainerExtractor.java b/src/main/java/techreborn/client/container/ContainerExtractor.java index 1045575bd..98b6f2b03 100644 --- a/src/main/java/techreborn/client/container/ContainerExtractor.java +++ b/src/main/java/techreborn/client/container/ContainerExtractor.java @@ -3,9 +3,9 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; import reborncore.api.tile.IContainerLayout; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotInput; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotInput; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.recipes.RecipeCrafter; import techreborn.api.gui.SlotUpgrade; import techreborn.tiles.teir1.TileExtractor; diff --git a/src/main/java/techreborn/client/container/ContainerFusionReactor.java b/src/main/java/techreborn/client/container/ContainerFusionReactor.java index 94c79516e..d573a100a 100644 --- a/src/main/java/techreborn/client/container/ContainerFusionReactor.java +++ b/src/main/java/techreborn/client/container/ContainerFusionReactor.java @@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.tiles.fusionReactor.TileEntityFusionController; diff --git a/src/main/java/techreborn/client/container/ContainerGasTurbine.java b/src/main/java/techreborn/client/container/ContainerGasTurbine.java index a054b3dfc..aa4133532 100644 --- a/src/main/java/techreborn/client/container/ContainerGasTurbine.java +++ b/src/main/java/techreborn/client/container/ContainerGasTurbine.java @@ -1,9 +1,9 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotFake; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotFake; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.tiles.generator.TileGasTurbine; diff --git a/src/main/java/techreborn/client/container/ContainerGenerator.java b/src/main/java/techreborn/client/container/ContainerGenerator.java index aba8642d6..cc1dcca14 100644 --- a/src/main/java/techreborn/client/container/ContainerGenerator.java +++ b/src/main/java/techreborn/client/container/ContainerGenerator.java @@ -5,8 +5,8 @@ import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.SlotFurnaceFuel; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotCharge; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotCharge; import reborncore.common.container.RebornContainer; import techreborn.tiles.generator.TileGenerator; diff --git a/src/main/java/techreborn/client/container/ContainerGrinder.java b/src/main/java/techreborn/client/container/ContainerGrinder.java index ef1fa408f..5f3f4fa2a 100644 --- a/src/main/java/techreborn/client/container/ContainerGrinder.java +++ b/src/main/java/techreborn/client/container/ContainerGrinder.java @@ -3,9 +3,9 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; import reborncore.api.tile.IContainerLayout; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotInput; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotInput; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.recipes.RecipeCrafter; import techreborn.api.gui.SlotUpgrade; import techreborn.tiles.teir1.TileGrinder; diff --git a/src/main/java/techreborn/client/container/ContainerIDSU.java b/src/main/java/techreborn/client/container/ContainerIDSU.java index cd65650f9..5bf7fe813 100644 --- a/src/main/java/techreborn/client/container/ContainerIDSU.java +++ b/src/main/java/techreborn/client/container/ContainerIDSU.java @@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; +import reborncore.client.gui.slots.BaseSlot; import reborncore.common.container.RebornContainer; import techreborn.tiles.idsu.TileIDSU; diff --git a/src/main/java/techreborn/client/container/ContainerImplosionCompressor.java b/src/main/java/techreborn/client/container/ContainerImplosionCompressor.java index 3dbc3ab4d..7570ded8c 100644 --- a/src/main/java/techreborn/client/container/ContainerImplosionCompressor.java +++ b/src/main/java/techreborn/client/container/ContainerImplosionCompressor.java @@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import techreborn.tiles.multiblock.TileImplosionCompressor; public class ContainerImplosionCompressor extends ContainerCrafting { diff --git a/src/main/java/techreborn/client/container/ContainerIndustrialElectrolyzer.java b/src/main/java/techreborn/client/container/ContainerIndustrialElectrolyzer.java index e7ec6056d..34a1f82d8 100644 --- a/src/main/java/techreborn/client/container/ContainerIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/client/container/ContainerIndustrialElectrolyzer.java @@ -1,8 +1,8 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import techreborn.tiles.TileIndustrialElectrolyzer; public class ContainerIndustrialElectrolyzer extends ContainerCrafting { diff --git a/src/main/java/techreborn/client/container/ContainerIndustrialGrinder.java b/src/main/java/techreborn/client/container/ContainerIndustrialGrinder.java index 0c3b458cc..b5dfe21b3 100644 --- a/src/main/java/techreborn/client/container/ContainerIndustrialGrinder.java +++ b/src/main/java/techreborn/client/container/ContainerIndustrialGrinder.java @@ -1,8 +1,8 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import techreborn.tiles.multiblock.TileIndustrialGrinder; public class ContainerIndustrialGrinder extends ContainerCrafting { diff --git a/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java b/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java index e950782ea..a18083cea 100644 --- a/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java +++ b/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java @@ -1,8 +1,8 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.tiles.multiblock.TileIndustrialSawmill; diff --git a/src/main/java/techreborn/client/container/ContainerIronFurnace.java b/src/main/java/techreborn/client/container/ContainerIronFurnace.java index a21b334bf..1757e03a4 100644 --- a/src/main/java/techreborn/client/container/ContainerIronFurnace.java +++ b/src/main/java/techreborn/client/container/ContainerIronFurnace.java @@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.SlotFurnaceFuel; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.tiles.TileIronFurnace; diff --git a/src/main/java/techreborn/client/container/ContainerLESU.java b/src/main/java/techreborn/client/container/ContainerLESU.java index 243d46339..90c51022d 100644 --- a/src/main/java/techreborn/client/container/ContainerLESU.java +++ b/src/main/java/techreborn/client/container/ContainerLESU.java @@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; +import reborncore.client.gui.slots.BaseSlot; import reborncore.common.container.RebornContainer; import techreborn.config.ConfigTechReborn; import techreborn.tiles.lesu.TileLesu; diff --git a/src/main/java/techreborn/client/container/ContainerMFE.java b/src/main/java/techreborn/client/container/ContainerMFE.java index 5da4a88dd..c991e2dee 100644 --- a/src/main/java/techreborn/client/container/ContainerMFE.java +++ b/src/main/java/techreborn/client/container/ContainerMFE.java @@ -10,8 +10,8 @@ import net.minecraft.inventory.IContainerListener; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotCharge; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotCharge; import reborncore.common.container.RebornContainer; import techreborn.tiles.storage.TileMFE; diff --git a/src/main/java/techreborn/client/container/ContainerMFSU.java b/src/main/java/techreborn/client/container/ContainerMFSU.java index 6a5550ff0..a630caa82 100644 --- a/src/main/java/techreborn/client/container/ContainerMFSU.java +++ b/src/main/java/techreborn/client/container/ContainerMFSU.java @@ -6,8 +6,8 @@ import net.minecraft.inventory.IContainerListener; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotCharge; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotCharge; import reborncore.common.container.RebornContainer; import techreborn.tiles.storage.TileMFSU; diff --git a/src/main/java/techreborn/client/container/ContainerMatterFabricator.java b/src/main/java/techreborn/client/container/ContainerMatterFabricator.java index b1c92709d..e00bca927 100644 --- a/src/main/java/techreborn/client/container/ContainerMatterFabricator.java +++ b/src/main/java/techreborn/client/container/ContainerMatterFabricator.java @@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.tiles.TileMatterFabricator; diff --git a/src/main/java/techreborn/client/container/ContainerQuantumChest.java b/src/main/java/techreborn/client/container/ContainerQuantumChest.java index 527678bd4..c1e6641b5 100644 --- a/src/main/java/techreborn/client/container/ContainerQuantumChest.java +++ b/src/main/java/techreborn/client/container/ContainerQuantumChest.java @@ -1,9 +1,9 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotFake; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotFake; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.tiles.TileQuantumChest; diff --git a/src/main/java/techreborn/client/container/ContainerQuantumTank.java b/src/main/java/techreborn/client/container/ContainerQuantumTank.java index 7c3815f0c..df3cb8ab9 100644 --- a/src/main/java/techreborn/client/container/ContainerQuantumTank.java +++ b/src/main/java/techreborn/client/container/ContainerQuantumTank.java @@ -1,10 +1,10 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotFake; -import reborncore.client.gui.SlotFluid; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotFake; +import reborncore.client.gui.slots.SlotFluid; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.tiles.TileQuantumTank; diff --git a/src/main/java/techreborn/client/container/ContainerRecycler.java b/src/main/java/techreborn/client/container/ContainerRecycler.java index 4c932b57b..c192ee1f8 100644 --- a/src/main/java/techreborn/client/container/ContainerRecycler.java +++ b/src/main/java/techreborn/client/container/ContainerRecycler.java @@ -3,8 +3,8 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.api.gui.SlotUpgrade; import techreborn.tiles.teir1.TileRecycler; diff --git a/src/main/java/techreborn/client/container/ContainerRollingMachine.java b/src/main/java/techreborn/client/container/ContainerRollingMachine.java index 8186a4679..4162bb33e 100644 --- a/src/main/java/techreborn/client/container/ContainerRollingMachine.java +++ b/src/main/java/techreborn/client/container/ContainerRollingMachine.java @@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.api.RollingMachineRecipe; import techreborn.tiles.TileRollingMachine; diff --git a/src/main/java/techreborn/client/container/ContainerScrapboxinator.java b/src/main/java/techreborn/client/container/ContainerScrapboxinator.java index dc99f205d..9a2b8d63d 100644 --- a/src/main/java/techreborn/client/container/ContainerScrapboxinator.java +++ b/src/main/java/techreborn/client/container/ContainerScrapboxinator.java @@ -3,8 +3,8 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.api.gui.SlotUpgrade; import techreborn.tiles.TileScrapboxinator; diff --git a/src/main/java/techreborn/client/container/ContainerSemifluidGenerator.java b/src/main/java/techreborn/client/container/ContainerSemifluidGenerator.java index 0f9ce3e9a..275b6a626 100644 --- a/src/main/java/techreborn/client/container/ContainerSemifluidGenerator.java +++ b/src/main/java/techreborn/client/container/ContainerSemifluidGenerator.java @@ -1,9 +1,9 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotFake; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotFake; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.tiles.generator.TileSemifluidGenerator; diff --git a/src/main/java/techreborn/client/container/ContainerThermalGenerator.java b/src/main/java/techreborn/client/container/ContainerThermalGenerator.java index f67f4aaa6..aac450f7e 100644 --- a/src/main/java/techreborn/client/container/ContainerThermalGenerator.java +++ b/src/main/java/techreborn/client/container/ContainerThermalGenerator.java @@ -1,10 +1,10 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotFake; -import reborncore.client.gui.SlotFluid; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotFake; +import reborncore.client.gui.slots.SlotFluid; +import reborncore.client.gui.slots.SlotOutput; import reborncore.common.container.RebornContainer; import techreborn.tiles.generator.TileThermalGenerator; diff --git a/src/main/java/techreborn/client/container/ContainerVacuumFreezer.java b/src/main/java/techreborn/client/container/ContainerVacuumFreezer.java index d28ca30e2..83abee067 100644 --- a/src/main/java/techreborn/client/container/ContainerVacuumFreezer.java +++ b/src/main/java/techreborn/client/container/ContainerVacuumFreezer.java @@ -1,8 +1,8 @@ package techreborn.client.container; import net.minecraft.entity.player.EntityPlayer; -import reborncore.client.gui.BaseSlot; -import reborncore.client.gui.SlotOutput; +import reborncore.client.gui.slots.BaseSlot; +import reborncore.client.gui.slots.SlotOutput; import techreborn.tiles.multiblock.TileVacuumFreezer; public class ContainerVacuumFreezer extends ContainerCrafting { diff --git a/src/main/java/techreborn/client/container/SlotScrapbox.java b/src/main/java/techreborn/client/container/SlotScrapbox.java index 0086eb5eb..237ad7f95 100644 --- a/src/main/java/techreborn/client/container/SlotScrapbox.java +++ b/src/main/java/techreborn/client/container/SlotScrapbox.java @@ -2,7 +2,7 @@ package techreborn.client.container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import reborncore.client.gui.BaseSlot; +import reborncore.client.gui.slots.BaseSlot; import techreborn.init.ModItems; public class SlotScrapbox extends BaseSlot { diff --git a/src/main/java/techreborn/client/gui/GuiDigitalChest.java b/src/main/java/techreborn/client/gui/GuiDigitalChest.java index af6363867..104ea9198 100644 --- a/src/main/java/techreborn/client/gui/GuiDigitalChest.java +++ b/src/main/java/techreborn/client/gui/GuiDigitalChest.java @@ -39,9 +39,9 @@ public class GuiDigitalChest extends GuiContainer { this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString("Amount", 10, 20, 16448255); if (tile.storedItem != null && tile.getStackInSlot(1) != null) - this.fontRendererObj.drawString(tile.storedItem.stackSize + tile.getStackInSlot(1).stackSize + "", 10, 30, + this.fontRendererObj.drawString(tile.storedItem.getCount() + tile.getStackInSlot(1).getCount() + "", 10, 30, 16448255); if (tile.storedItem == null && tile.getStackInSlot(1) != null) - this.fontRendererObj.drawString(tile.getStackInSlot(1).stackSize + "", 10, 30, 16448255); + this.fontRendererObj.drawString(tile.getStackInSlot(1).getCount() + "", 10, 30, 16448255); } } diff --git a/src/main/java/techreborn/client/gui/GuiQuantumChest.java b/src/main/java/techreborn/client/gui/GuiQuantumChest.java index 672f10eeb..fdb529d7c 100644 --- a/src/main/java/techreborn/client/gui/GuiQuantumChest.java +++ b/src/main/java/techreborn/client/gui/GuiQuantumChest.java @@ -39,9 +39,9 @@ public class GuiQuantumChest extends GuiContainer { this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString("Amount", 10, 20, 16448255); if (tile.storedItem != null && tile.getStackInSlot(1) != null) - this.fontRendererObj.drawString(tile.storedItem.stackSize + tile.getStackInSlot(1).stackSize + "", 10, 30, + this.fontRendererObj.drawString(tile.storedItem.getCount() + tile.getStackInSlot(1).getCount() + "", 10, 30, 16448255); if (tile.storedItem == null && tile.getStackInSlot(1) != null) - this.fontRendererObj.drawString(tile.getStackInSlot(1).stackSize + "", 10, 30, 16448255); + this.fontRendererObj.drawString(tile.getStackInSlot(1).getCount() + "", 10, 30, 16448255); } } diff --git a/src/main/java/techreborn/client/hud/ChargeHud.java b/src/main/java/techreborn/client/hud/ChargeHud.java index 0a326a2d3..df7b4042a 100644 --- a/src/main/java/techreborn/client/hud/ChargeHud.java +++ b/src/main/java/techreborn/client/hud/ChargeHud.java @@ -43,10 +43,10 @@ public class ChargeHud { } public void drawChargeHud(ScaledResolution res) { - EntityPlayer player = mc.thePlayer; + EntityPlayer player = mc.player; ItemStack armorstack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); ItemStack offHandstack = player.getItemStackFromSlot(EntityEquipmentSlot.OFFHAND); - ItemStack stack = mc.thePlayer.inventory.getCurrentItem(); + ItemStack stack = mc.player.inventory.getCurrentItem(); int y = 5; diff --git a/src/main/java/techreborn/client/render/entitys/RenderNukePrimed.java b/src/main/java/techreborn/client/render/entitys/RenderNukePrimed.java index 82e45ef8e..aef4f153e 100644 --- a/src/main/java/techreborn/client/render/entitys/RenderNukePrimed.java +++ b/src/main/java/techreborn/client/render/entitys/RenderNukePrimed.java @@ -29,7 +29,7 @@ public class RenderNukePrimed extends Render { GlStateManager.translate((float) x, (float) y + 0.5F, (float) z); if ((float) entity.fuse - partialTicks + 1.0F < 10.0F) { float f = 1.0F - ((float) entity.fuse - partialTicks + 1.0F) / 10.0F; - f = MathHelper.clamp_float(f, 0.0F, 1.0F); + f = MathHelper.clamp(f, 0.0F, 1.0F); f = f * f; f = f * f; float f1 = 1.0F + f * 0.3F; diff --git a/src/main/java/techreborn/command/TechRebornDevCommand.java b/src/main/java/techreborn/command/TechRebornDevCommand.java index 992ba7525..62823f930 100644 --- a/src/main/java/techreborn/command/TechRebornDevCommand.java +++ b/src/main/java/techreborn/command/TechRebornDevCommand.java @@ -23,12 +23,12 @@ import java.util.List; public class TechRebornDevCommand extends CommandBase { @Override - public String getCommandName() { + public String getName() { return "trdev"; } @Override - public String getCommandUsage(ICommandSender icommandsender) { + public String getUsage(ICommandSender icommandsender) { return "commands.forge.usage"; } @@ -40,20 +40,20 @@ public class TechRebornDevCommand extends CommandBase { @Override public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { if (args.length == 0) { - sender.addChatMessage(new TextComponentString("You need to use arguments, see /trdev help")); + sender.sendMessage(new TextComponentString("You need to use arguments, see /trdev help")); } else if ("help".equals(args[0])) { - sender.addChatMessage(new TextComponentString("recipes - Shows size of the recipe array")); - sender.addChatMessage(new TextComponentString("fluid - Lists the fluid power values")); + sender.sendMessage(new TextComponentString("recipes - Shows size of the recipe array")); + sender.sendMessage(new TextComponentString("fluid - Lists the fluid power values")); } else if ("recipes".equals(args[0])) { - sender.addChatMessage(new TextComponentString(RecipeHandler.recipeList.size() + " recipes loaded")); + sender.sendMessage(new TextComponentString(RecipeHandler.recipeList.size() + " recipes loaded")); } else if ("fluid".equals(args[0])) { for (Object object : FluidPowerManager.fluidPowerValues.keySet().toArray()) { if (object instanceof Fluid) { Fluid fluid = (Fluid) object; - sender.addChatMessage(new TextComponentString( + sender.sendMessage(new TextComponentString( fluid.getUnlocalizedName() + " : " + FluidPowerManager.fluidPowerValues.get(fluid))); } else { - sender.addChatMessage(new TextComponentString("Found invalid fluid entry")); + sender.sendMessage(new TextComponentString("Found invalid fluid entry")); } } } else if ("clear".equals(args[0])) { @@ -66,8 +66,8 @@ public class TechRebornDevCommand extends CommandBase { for (int z = 0; z < 25; z++) { for (int y = 0; y < playerMP.posY; y++) { BlockPos pos = new BlockPos(playerMP.posX + x, y, playerMP.posZ + z); - if (blocksToRemove.contains(playerMP.worldObj.getBlockState(pos).getBlock())) { - playerMP.worldObj.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); + if (blocksToRemove.contains(playerMP.world.getBlockState(pos).getBlock())) { + playerMP.world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); } } } @@ -75,16 +75,16 @@ public class TechRebornDevCommand extends CommandBase { } else if ("getname".equals(args[0])) { EntityPlayer player = (EntityPlayer) sender; if (player.getHeldItem(EnumHand.MAIN_HAND) != null) { - sender.addChatMessage(new TextComponentString(player.getHeldItem(EnumHand.MAIN_HAND).getItem().getRegistryName() + ":" + player.getHeldItem(EnumHand.MAIN_HAND).getItemDamage())); + sender.sendMessage(new TextComponentString(player.getHeldItem(EnumHand.MAIN_HAND).getItem().getRegistryName() + ":" + player.getHeldItem(EnumHand.MAIN_HAND).getItemDamage())); } else { - ((EntityPlayer) sender).addChatComponentMessage(new TextComponentString("hold an item!")); + sender.sendMessage(new TextComponentString("hold an item!")); } } else if ("gen".equals(args[0])) { try { new JsonGenerator().generate(); } catch (IOException e) { e.printStackTrace(); - sender.addChatMessage(new TextComponentString(e.getLocalizedMessage())); + sender.sendMessage(new TextComponentString(e.getLocalizedMessage())); } } } diff --git a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java index 732cb4264..1d63f0085 100644 --- a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeCategory.java @@ -47,7 +47,7 @@ public class AlloySmelterRecipeCategory extends BlankRecipeCategory onItemRightClick(ItemStack stack, World worldIn, EntityPlayer playerIn, EnumHand hand) { + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand hand) { + ItemStack stack = playerIn.getHeldItem(hand); if (!worldIn.isRemote) { RayTraceResult result = rayTrace(worldIn, playerIn, true); @@ -99,14 +101,14 @@ public class DynamicCell extends Item { public boolean tryAddCellToInventory(EntityPlayer player, ItemStack stack, Fluid fluid) { if (player.inventory.addItemStackToInventory(DynamicCell.getCellWithFluid(fluid))) { - --stack.stackSize; + stack.shrink(1); return true; } return false; } @Override - public void getSubItems(Item itemIn, CreativeTabs tab, List subItems) { + public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList subItems) { subItems.add(getEmptyCell(1)); for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) { subItems.add(getCellWithFluid(fluid)); @@ -134,7 +136,7 @@ public class DynamicCell extends Item { Validate.notNull(fluid); ItemStack stack = new ItemStack(ModItems.dynamicCell); getFluidHandler(stack).fill(new FluidStack(fluid, CAPACITY), true); - stack.stackSize = stackSize; + stack.setCount(stackSize); return stack; } diff --git a/src/main/java/techreborn/items/ItemDestructopack.java b/src/main/java/techreborn/items/ItemDestructopack.java index 828b0ddd7..98a84435a 100644 --- a/src/main/java/techreborn/items/ItemDestructopack.java +++ b/src/main/java/techreborn/items/ItemDestructopack.java @@ -21,11 +21,11 @@ public class ItemDestructopack extends ItemTextureBase implements ITexturedItem } @Override - public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { player.openGui(Core.INSTANCE, GuiHandler.destructoPackID, world, (int) player.posX, (int) player.posY, (int) player.posY); - return new ActionResult<>(EnumActionResult.SUCCESS, itemStack); + return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } @Override diff --git a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java index 9e004c7ff..6a07371a8 100644 --- a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java +++ b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java @@ -32,8 +32,9 @@ public class ItemFrequencyTransmitter extends ItemTextureBase implements ITextur } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + ItemStack stack = player.getHeldItem(hand); stack.setTagCompound(new NBTTagCompound()); stack.getTagCompound().setInteger("x", pos.getX()); stack.getTagCompound().setInteger("y", pos.getY()); @@ -56,8 +57,9 @@ public class ItemFrequencyTransmitter extends ItemTextureBase implements ITextur } @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); if (player.isSneaking()) { stack.setTagCompound(null); if (!world.isRemote && ConfigTechReborn.FreqTransmitterChat) { diff --git a/src/main/java/techreborn/items/ItemScrapBox.java b/src/main/java/techreborn/items/ItemScrapBox.java index 269a8f0c8..00b8c1b58 100644 --- a/src/main/java/techreborn/items/ItemScrapBox.java +++ b/src/main/java/techreborn/items/ItemScrapBox.java @@ -21,8 +21,9 @@ public class ItemScrapBox extends ItemTextureBase implements ITexturedItem { } @Override - public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); if (!world.isRemote) { int random = world.rand.nextInt(ScrapboxList.stacks.size()); ItemStack out = ScrapboxList.stacks.get(random).copy(); @@ -33,11 +34,10 @@ public class ItemScrapBox extends ItemTextureBase implements ITexturedItem { player.getPosition().getY() + yOffset, player.getPosition().getZ() + zOffset, out); entityitem.setPickupDelay(20); - world.spawnEntityInWorld(entityitem); - - itemStack.stackSize--; + world.spawnEntity(entityitem); + stack.shrink(1); } - return new ActionResult<>(EnumActionResult.SUCCESS, itemStack); + return new ActionResult<>(EnumActionResult.SUCCESS, stack); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index bd18b8259..ce1371d54 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -83,9 +83,9 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedI } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, + public EnumActionResult onItemUse( EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - return TorchHelper.placeTorch(stack, playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); + return TorchHelper.placeTorch(playerIn.getHeldItem(hand), playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java index e2b0b3b27..42ac95cf8 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java @@ -70,9 +70,9 @@ public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemIn public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) { ItemStack itemstack1 = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); - if (itemstack1 == null) { + if (itemstack1 == ItemStack.EMPTY) { player.setItemStackToSlot(EntityEquipmentSlot.CHEST, itemStack.copy()); - itemStack.stackSize = 0; + itemStack.setCount(0); } return itemStack; diff --git a/src/main/java/techreborn/items/tools/ItemDebugTool.java b/src/main/java/techreborn/items/tools/ItemDebugTool.java index 19dfb2a68..7f4c2ad54 100644 --- a/src/main/java/techreborn/items/tools/ItemDebugTool.java +++ b/src/main/java/techreborn/items/tools/ItemDebugTool.java @@ -37,12 +37,12 @@ public class ItemDebugTool extends ItemTextureBase implements ITexturedItem { } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, + public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { TileEntity tile = worldIn.getTileEntity(pos); if (tile instanceof IEnergyInterfaceTile) { if (!tile.getWorld().isRemote) { - playerIn.addChatComponentMessage( + playerIn.sendMessage( new TextComponentString(TextFormatting.GREEN + "Power" + TextFormatting.BLUE + PowerSystem.getLocaliszedPower(((IEnergyInterfaceTile) tile).getEnergy()))); } diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index 4937c9f91..e12d269f1 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -81,9 +81,9 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, + public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - return TorchHelper.placeTorch(stack, playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); + return TorchHelper.placeTorch(playerIn.getHeldItem(hand), playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index e74b316e7..60cb9e014 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -81,9 +81,9 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITex } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, + public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - return TorchHelper.placeTorch(stack, playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); + return TorchHelper.placeTorch(playerIn.getHeldItem(hand), playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index b3bea069b..edac4d8ad 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -69,9 +69,9 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { modifier = 9; if (slot == EntityEquipmentSlot.MAINHAND) { - multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getAttributeUnlocalizedName(), + multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", (double) modifier, 0)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), + multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -2.4000000953674316D, 0)); } return multimap; @@ -130,8 +130,9 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { } @Override - public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); if (player.isSneaking()) { if (!PoweredItem.canUseEnergy(cost, stack)) { ChatUtils.sendNoSpamMessages(MessageIDs.nanosaberID, new TextComponentString( diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 6bd0a69df..1a1ebe786 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -88,9 +88,9 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, + public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - return TorchHelper.placeTorch(stack, playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); + return TorchHelper.placeTorch(playerIn.getHeldItem(hand), playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemTechManual.java b/src/main/java/techreborn/items/tools/ItemTechManual.java index 37340a41a..84fffe48e 100644 --- a/src/main/java/techreborn/items/tools/ItemTechManual.java +++ b/src/main/java/techreborn/items/tools/ItemTechManual.java @@ -25,11 +25,11 @@ public class ItemTechManual extends ItemTextureBase implements ITexturedItem { } @Override - public ActionResult onItemRightClick(ItemStack itemStackIn, World world, EntityPlayer player, + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { player.openGui(Core.INSTANCE, GuiHandler.manuelID, world, (int) player.posX, (int) player.posY, (int) player.posY); - return new ActionResult<>(EnumActionResult.SUCCESS, itemStackIn); + return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemWrench.java b/src/main/java/techreborn/items/tools/ItemWrench.java index 54dc4b317..6ddbe02a5 100644 --- a/src/main/java/techreborn/items/tools/ItemWrench.java +++ b/src/main/java/techreborn/items/tools/ItemWrench.java @@ -49,13 +49,13 @@ public class ItemWrench extends ItemTR implements ITexturedItem { } @Override - public EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, + public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { if(!PermissionAPI.hasPermission(player.getGameProfile(), RebornPermissions.WRENCH_BLOCK, new BlockPosContext(player, pos, world.getBlockState(pos), side))){ return EnumActionResult.FAIL; } if (CompatManager.isIC2Loaded) { - EnumActionResult result = IC2WrenchHelper.onItemUseFirst(stack, player, world, pos, side, hitX, hitY, hitZ, hand); + EnumActionResult result = IC2WrenchHelper.onItemUseFirst(player.getHeldItem(hand), player, world, pos, side, hitX, hitY, hitZ, hand); if (result == EnumActionResult.SUCCESS) { return result; } @@ -68,7 +68,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem { return EnumActionResult.FAIL; } - if (!player.isSneaking() && !player.worldObj.isRemote) { + if (!player.isSneaking() && !player.world.isRemote) { if (tile instanceof TileMachineBase) { if (side != EnumFacing.DOWN && side != EnumFacing.UP) { ((TileMachineBase) tile).setFacing(side); @@ -76,17 +76,17 @@ public class ItemWrench extends ItemTR implements ITexturedItem { } } } - return super.onItemUseFirst(stack, player, world, pos, side, hitX, hitY, hitZ, hand); + return super.onItemUseFirst(player, world, pos, side, hitX, hitY, hitZ, hand); } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { if(!PermissionAPI.hasPermission(player.getGameProfile(), RebornPermissions.WRENCH_BLOCK, new BlockPosContext(player, pos, world.getBlockState(pos), facing))){ return EnumActionResult.FAIL; } if (CompatManager.isIC2Loaded) { - EnumActionResult result = IC2WrenchHelper.onItemUse(stack, player, world, pos, hand, facing, hitX, hitY, hitZ); + EnumActionResult result = IC2WrenchHelper.onItemUse(player.getHeldItem(hand), player, world, pos, hand, facing, hitX, hitY, hitZ); if (result == EnumActionResult.SUCCESS) { return result; } @@ -106,8 +106,8 @@ public class ItemWrench extends ItemTR implements ITexturedItem { for (int i = 0; i < inventory.getSizeInventory(); i++) { ItemStack itemStack = inventory.getStackInSlot(i); - if (itemStack != null) { - if (itemStack.stackSize > 0) { + if (itemStack != ItemStack.EMPTY) { + if (itemStack.getCount() > 0) { if (itemStack.getItem() instanceof ItemBlock) if (!(((ItemBlock) itemStack.getItem()).block instanceof BlockFluidBase) || !(((ItemBlock) itemStack.getItem()).block instanceof BlockStaticLiquid) @@ -147,7 +147,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem { entityItem.motionY = rand.nextGaussian() * factor + 0.2F; entityItem.motionZ = rand.nextGaussian() * factor; if (!world.isRemote) { - world.spawnEntityInWorld(entityItem); + world.spawnEntity(entityItem); } } } diff --git a/src/main/java/techreborn/manual/pages/CraftingInfoPage.java b/src/main/java/techreborn/manual/pages/CraftingInfoPage.java index bc2035ed9..e923e4434 100644 --- a/src/main/java/techreborn/manual/pages/CraftingInfoPage.java +++ b/src/main/java/techreborn/manual/pages/CraftingInfoPage.java @@ -192,7 +192,7 @@ public class CraftingInfoPage extends TitledPage { FontRenderer font = Objects.firstNonNull(stack.getItem().getFontRenderer(stack), mc.fontRendererObj); @SuppressWarnings("unchecked") - List list = stack.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips); + List list = stack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips); List colored = Lists.newArrayListWithCapacity(list.size()); colored.add(stack.getRarity().rarityColor + list.get(0)); diff --git a/src/main/java/techreborn/parts/fluidPipes/MultipartFluidPipe.java b/src/main/java/techreborn/parts/fluidPipes/MultipartFluidPipe.java index 8de3219a1..8eccd6caa 100644 --- a/src/main/java/techreborn/parts/fluidPipes/MultipartFluidPipe.java +++ b/src/main/java/techreborn/parts/fluidPipes/MultipartFluidPipe.java @@ -371,7 +371,7 @@ public abstract class MultipartFluidPipe extends Multipart implements INormallyO } @Override - public boolean onActivated(EntityPlayer player, EnumHand hand, ItemStack heldItem, PartMOP hit) { + public boolean onActivated(EntityPlayer player, EnumHand hand, PartMOP hit) { //TODO make only wrench able to change mode, shift-click with wrench picks up pipe, and click with empty hand displays current mode in chat (doesn't change it) System.out.println(getWorld().isRemote); diff --git a/src/main/java/techreborn/tiles/TileAlloyFurnace.java b/src/main/java/techreborn/tiles/TileAlloyFurnace.java index 6b6c5f2e9..e18edcb15 100644 --- a/src/main/java/techreborn/tiles/TileAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/TileAlloyFurnace.java @@ -89,7 +89,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab if (this.burnTime > 0) { --this.burnTime; } - if (!this.worldObj.isRemote) { + if (!this.world.isRemote) { if (this.burnTime != 0 || getStackInSlot(input1) != null && getStackInSlot(fuel) != null) { if (this.burnTime == 0 && this.canSmelt()) { this.currentItemBurnTime = this.burnTime = getItemBurnTime(getStackInSlot(fuel)); @@ -129,7 +129,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab Boolean hasItem = false; for (int inputslot = 0; inputslot < 2; inputslot++) { if (ItemUtils.isItemEqual(input, inventory.getStackInSlot(inputslot), true, true, - recipeType.useOreDic()) && inventory.getStackInSlot(inputslot).stackSize >= input.stackSize) { + recipeType.useOreDic()) && inventory.getStackInSlot(inputslot).getCount() >= input.getCount()) { hasItem = true; } } @@ -157,7 +157,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab return true; if (!this.getStackInSlot(output).isItemEqual(itemstack)) return false; - int result = getStackInSlot(output).stackSize + itemstack.stackSize; + int result = getStackInSlot(output).getCount() + itemstack.getCount(); return result <= getInventoryStackLimit() && result <= this.getStackInSlot(output).getMaxStackSize(); // Forge // BugFix: // Make @@ -189,7 +189,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab if (this.getStackInSlot(output) == null) { setInventorySlotContents(output, itemstack.copy()); } else if (this.getStackInSlot(output).getItem() == itemstack.getItem()) { - decrStackSize(output, -itemstack.stackSize); + decrStackSize(output, -itemstack.getCount()); } for (IBaseRecipeType recipeType : RecipeHandler.getRecipeClassFromName(Reference.alloySmelteRecipe)) { @@ -204,7 +204,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab for (int inputSlot = 0; inputSlot < 2; inputSlot++) { if (ItemUtils.isItemEqual(input, inventory.getStackInSlot(inputSlot), true, true, recipeType.useOreDic())) { - inventory.decrStackSize(inputSlot, input.stackSize); + inventory.decrStackSize(inputSlot, input.getCount()); break; } } diff --git a/src/main/java/techreborn/tiles/TileDigitalChest.java b/src/main/java/techreborn/tiles/TileDigitalChest.java index 15fd99a48..5314c05b7 100644 --- a/src/main/java/techreborn/tiles/TileDigitalChest.java +++ b/src/main/java/techreborn/tiles/TileDigitalChest.java @@ -31,14 +31,14 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor @Override public void updateEntity() { - if (!worldObj.isRemote) { + if (!world.isRemote) { if (storedItem != null) { ItemStack fakeStack = storedItem.copy(); - fakeStack.stackSize = 1; + fakeStack.getCount() = 1; setInventorySlotContents(2, fakeStack); } else if (storedItem == null && getStackInSlot(1) != null) { ItemStack fakeStack = getStackInSlot(1).copy(); - fakeStack.stackSize = 1; + fakeStack.getCount() = 1; setInventorySlotContents(2, fakeStack); } else { setInventorySlotContents(2, null); @@ -49,25 +49,25 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor storedItem = getStackInSlot(0); setInventorySlotContents(0, null); } else if (ItemUtils.isItemEqual(storedItem, getStackInSlot(0), true, true)) { - if (storedItem.stackSize <= storage - getStackInSlot(0).stackSize) { - storedItem.stackSize += getStackInSlot(0).stackSize; - decrStackSize(0, getStackInSlot(0).stackSize); + if (storedItem.getCount() <= storage - getStackInSlot(0).getCount()) { + storedItem.getCount() += getStackInSlot(0).getCount(); + decrStackSize(0, getStackInSlot(0).getCount()); } } } if (storedItem != null && getStackInSlot(1) == null) { ItemStack itemStack = storedItem.copy(); - itemStack.stackSize = itemStack.getMaxStackSize(); + itemStack.getCount() = itemStack.getMaxStackSize(); setInventorySlotContents(1, itemStack); - storedItem.stackSize -= itemStack.getMaxStackSize(); + storedItem.getCount() -= itemStack.getMaxStackSize(); } else if (ItemUtils.isItemEqual(getStackInSlot(1), storedItem, true, true)) { - int wanted = getStackInSlot(1).getMaxStackSize() - getStackInSlot(1).stackSize; - if (storedItem.stackSize >= wanted) { + int wanted = getStackInSlot(1).getMaxStackSize() - getStackInSlot(1).getCount(); + if (storedItem.getCount() >= wanted) { decrStackSize(1, -wanted); - storedItem.stackSize -= wanted; + storedItem.getCount() -= wanted; } else { - decrStackSize(1, -storedItem.stackSize); + decrStackSize(1, -storedItem.getCount()); storedItem = null; } } @@ -76,7 +76,7 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { - worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), + world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), getPos().getY(), getPos().getZ()); readFromNBT(packet.getNbtCompound()); } @@ -96,7 +96,7 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor } if (storedItem != null) { - storedItem.stackSize = tagCompound.getInteger("storedQuantity"); + storedItem.getCount() = tagCompound.getInteger("storedQuantity"); } } @@ -110,7 +110,7 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound) { if (storedItem != null) { tagCompound.setTag("storedStack", storedItem.writeToNBT(new NBTTagCompound())); - tagCompound.setInteger("storedQuantity", storedItem.stackSize); + tagCompound.setInteger("storedQuantity", storedItem.getCount()); } else tagCompound.setInteger("storedQuantity", 0); return tagCompound; @@ -156,11 +156,11 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor String name = "of nothing"; if (storedItem != null) { name = storedItem.getDisplayName(); - size += storedItem.stackSize; + size += storedItem.getCount(); } if (getStackInSlot(1) != null) { name = getStackInSlot(1).getDisplayName(); - size += getStackInSlot(1).stackSize; + size += getStackInSlot(1).getCount(); } info.add(size + " " + name); diff --git a/src/main/java/techreborn/tiles/TileEntityFlare.java b/src/main/java/techreborn/tiles/TileEntityFlare.java index d820e00fa..386930b53 100644 --- a/src/main/java/techreborn/tiles/TileEntityFlare.java +++ b/src/main/java/techreborn/tiles/TileEntityFlare.java @@ -20,9 +20,9 @@ public class TileEntityFlare extends TileEntity implements ITickable { @Override public void update() { - EnumDyeColor color = worldObj.getBlockState(pos).getValue(BlockFlare.COLOR); - if(worldObj.isRemote && worldObj.isAirBlock(getPos().up())){ - ParticleSmoke particleSmokeLarge = new ParticleSmoke(worldObj , pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 0, 0.0D, 0); + EnumDyeColor color = world.getBlockState(pos).getValue(BlockFlare.COLOR); + if(world.isRemote && world.isAirBlock(getPos().up())){ + ParticleSmoke particleSmokeLarge = new ParticleSmoke(world , pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 0, 0.0D, 0); particleSmokeLarge.setMaxAge(250); if(color != EnumDyeColor.WHITE){ float[] rgb = EntitySheep.getDyeRgb(color); @@ -32,7 +32,7 @@ public class TileEntityFlare extends TileEntity implements ITickable { Minecraft.getMinecraft().effectRenderer.addEffect(particleSmokeLarge); - worldObj.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 0.3, pos.getZ() + 0.5, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 0.3, pos.getZ() + 0.5, 0.0D, 0.0D, 0.0D); } } diff --git a/src/main/java/techreborn/tiles/TileIronFurnace.java b/src/main/java/techreborn/tiles/TileIronFurnace.java index 8a289b24b..64c0911f7 100644 --- a/src/main/java/techreborn/tiles/TileIronFurnace.java +++ b/src/main/java/techreborn/tiles/TileIronFurnace.java @@ -53,9 +53,9 @@ public class TileIronFurnace extends TileLegacyMachineBase implements IInventory { setInventorySlotContents(fuelslot, new ItemStack(getStackInSlot(fuelslot).getItem().getContainerItem())); - } else if (getStackInSlot(fuelslot).stackSize > 1) { + } else if (getStackInSlot(fuelslot).getCount() > 1) { decrStackSize(fuelslot, 1); - } else if (getStackInSlot(fuelslot).stackSize == 1) { + } else if (getStackInSlot(fuelslot).getCount() == 1) { setInventorySlotContents(fuelslot, null); } updateInventory = true; @@ -86,9 +86,9 @@ public class TileIronFurnace extends TileLegacyMachineBase implements IInventory if (getStackInSlot(output) == null) { setInventorySlotContents(output, itemstack.copy()); } else if (getStackInSlot(output).isItemEqual(itemstack)) { - getStackInSlot(output).stackSize += itemstack.stackSize; + getStackInSlot(output).getCount() += itemstack.getCount(); } - if (getStackInSlot(input1).stackSize > 1) { + if (getStackInSlot(input1).getCount() > 1) { this.decrStackSize(input1, 1); } else { setInventorySlotContents(input1, null); @@ -107,7 +107,7 @@ public class TileIronFurnace extends TileLegacyMachineBase implements IInventory return true; if (!getStackInSlot(output).isItemEqual(itemstack)) return false; - int result = getStackInSlot(output).stackSize + itemstack.stackSize; + int result = getStackInSlot(output).getCount() + itemstack.getCount(); return (result <= getInventoryStackLimit() && result <= itemstack.getMaxStackSize()); } } @@ -125,11 +125,11 @@ public class TileIronFurnace extends TileLegacyMachineBase implements IInventory } public void updateState() { - IBlockState BlockStateContainer = worldObj.getBlockState(pos); + IBlockState BlockStateContainer = world.getBlockState(pos); if (BlockStateContainer.getBlock() instanceof BlockMachineBase) { BlockMachineBase blockMachineBase = (BlockMachineBase) BlockStateContainer.getBlock(); if (BlockStateContainer.getValue(BlockMachineBase.ACTIVE) != fuel > 0) - blockMachineBase.setActive(fuel > 0, worldObj, pos); + blockMachineBase.setActive(fuel > 0, world, pos); } } diff --git a/src/main/java/techreborn/tiles/TileMachineCasing.java b/src/main/java/techreborn/tiles/TileMachineCasing.java index 97d1ff625..71965471e 100644 --- a/src/main/java/techreborn/tiles/TileMachineCasing.java +++ b/src/main/java/techreborn/tiles/TileMachineCasing.java @@ -19,7 +19,7 @@ public class TileMachineCasing extends RectangularMultiblockTileEntityBase { @Override public MultiblockControllerBase createNewMultiblock() { - return new MultiBlockCasing(worldObj); + return new MultiBlockCasing(world); } @Override diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 153a96195..da08afc44 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -84,7 +84,7 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab public void updateEntity() { super.updateEntity(); - if (!super.worldObj.isRemote) { + if (!super.world.isRemote) { for (int i = 0; i < 6; i++) { ItemStack stack = inventory.getStackInSlot(i); if (this.amplifier < 10000 && stack != null) { @@ -122,7 +122,7 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab private boolean spaceForOutput() { return inventory.getStackInSlot(6) == null || ItemUtils.isItemEqual(inventory.getStackInSlot(6), new ItemStack(ModItems.uuMatter), true, true) - && inventory.getStackInSlot(6).stackSize < 64; + && inventory.getStackInSlot(6).getCount() < 64; } private void addOutputProducts() { @@ -130,7 +130,7 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab if (inventory.getStackInSlot(6) == null) { inventory.setInventorySlotContents(6, new ItemStack(ModItems.uuMatter)); } else if (ItemUtils.isItemEqual(inventory.getStackInSlot(6), new ItemStack(ModItems.uuMatter), true, true)) { - inventory.getStackInSlot(6).stackSize = Math.min(64, 1 + inventory.getStackInSlot(6).stackSize); + inventory.getStackInSlot(6).getCount() = Math.min(64, 1 + inventory.getStackInSlot(6).getCount()); } } diff --git a/src/main/java/techreborn/tiles/TilePlayerDectector.java b/src/main/java/techreborn/tiles/TilePlayerDectector.java index 2ac862c70..81c524e6c 100644 --- a/src/main/java/techreborn/tiles/TilePlayerDectector.java +++ b/src/main/java/techreborn/tiles/TilePlayerDectector.java @@ -52,17 +52,17 @@ public class TilePlayerDectector extends TilePowerAcceptor { @Override public void updateEntity() { super.updateEntity(); - if (!worldObj.isRemote && worldObj.getWorldTime() % 20 == 0) { + if (!world.isRemote && world.getWorldTime() % 20 == 0) { boolean lastRedstone = redstone; redstone = false; if (canUseEnergy(10)) { - Iterator tIterator = super.worldObj.playerEntities.iterator(); + Iterator tIterator = super.world.playerEntities.iterator(); while (tIterator.hasNext()) { EntityPlayer player = (EntityPlayer) tIterator.next(); if (player.getDistanceSq((double) super.getPos().getX() + 0.5D, (double) super.getPos().getY() + 0.5D, (double) super.getPos().getZ() + 0.5D) <= 256.0D) { - BlockMachineBase blockMachineBase = (BlockMachineBase) worldObj.getBlockState(pos).getBlock(); - int meta = blockMachineBase.getMetaFromState(worldObj.getBlockState(pos)); + BlockMachineBase blockMachineBase = (BlockMachineBase) world.getBlockState(pos).getBlock(); + int meta = blockMachineBase.getMetaFromState(world.getBlockState(pos)); if (meta == 0) {// ALL redstone = true; } else if (meta == 1) {// Others @@ -80,8 +80,8 @@ public class TilePlayerDectector extends TilePowerAcceptor { useEnergy(10); } if (lastRedstone != redstone) { - WorldUtils.updateBlock(worldObj, getPos()); - worldObj.notifyNeighborsOfStateChange(getPos(), worldObj.getBlockState(getPos()).getBlock()); + WorldUtils.updateBlock(world, getPos()); + world.notifyNeighborsOfStateChange(getPos(), world.getBlockState(getPos()).getBlock()); } } } diff --git a/src/main/java/techreborn/tiles/TilePump.java b/src/main/java/techreborn/tiles/TilePump.java index 7c6882e5a..94a37814f 100644 --- a/src/main/java/techreborn/tiles/TilePump.java +++ b/src/main/java/techreborn/tiles/TilePump.java @@ -31,10 +31,10 @@ public class TilePump extends TilePowerAcceptor implements IFluidHandler { @Override public void updateEntity() { super.updateEntity(); - if (!worldObj.isRemote && worldObj.getTotalWorldTime() % 10 == 0 && !tank.isFull() && tank.getCapacity() - tank.getFluidAmount() >= 1000 && canUseEnergy(ConfigTechReborn.pumpExtractEU)) { - FluidStack fluidStack = drainBlock(worldObj, pos.down(), false); + if (!world.isRemote && world.getTotalWorldTime() % 10 == 0 && !tank.isFull() && tank.getCapacity() - tank.getFluidAmount() >= 1000 && canUseEnergy(ConfigTechReborn.pumpExtractEU)) { + FluidStack fluidStack = drainBlock(world, pos.down(), false); if (fluidStack != null) { - tank.fill(drainBlock(worldObj, pos.down(), true), true); + tank.fill(drainBlock(world, pos.down(), true), true); useEnergy(ConfigTechReborn.pumpExtractEU); } tank.compareAndUpdate(); diff --git a/src/main/java/techreborn/tiles/TileQuantumChest.java b/src/main/java/techreborn/tiles/TileQuantumChest.java index 9138d1894..09ef624ad 100644 --- a/src/main/java/techreborn/tiles/TileQuantumChest.java +++ b/src/main/java/techreborn/tiles/TileQuantumChest.java @@ -33,14 +33,14 @@ public class TileQuantumChest extends TileLegacyMachineBase @Override public void updateEntity() { - if (!worldObj.isRemote) { + if (!world.isRemote) { if (storedItem != null) { ItemStack fakeStack = storedItem.copy(); - fakeStack.stackSize = 1; + fakeStack.getCount() = 1; setInventorySlotContents(2, fakeStack); } else if (storedItem == null && getStackInSlot(1) != null) { ItemStack fakeStack = getStackInSlot(1).copy(); - fakeStack.stackSize = 1; + fakeStack.getCount() = 1; setInventorySlotContents(2, fakeStack); } else { setInventorySlotContents(2, null); @@ -51,25 +51,25 @@ public class TileQuantumChest extends TileLegacyMachineBase storedItem = getStackInSlot(0); setInventorySlotContents(0, null); } else if (ItemUtils.isItemEqual(storedItem, getStackInSlot(0), true, true)) { - if (storedItem.stackSize <= storage - getStackInSlot(0).stackSize) { - storedItem.stackSize += getStackInSlot(0).stackSize; - decrStackSize(0, getStackInSlot(0).stackSize); + if (storedItem.getCount() <= storage - getStackInSlot(0).getCount()) { + storedItem.getCount() += getStackInSlot(0).getCount(); + decrStackSize(0, getStackInSlot(0).getCount()); } } } if (storedItem != null && getStackInSlot(1) == null) { ItemStack itemStack = storedItem.copy(); - itemStack.stackSize = itemStack.getMaxStackSize(); + itemStack.getCount() = itemStack.getMaxStackSize(); setInventorySlotContents(1, itemStack); - storedItem.stackSize -= itemStack.getMaxStackSize(); + storedItem.getCount() -= itemStack.getMaxStackSize(); } else if (ItemUtils.isItemEqual(getStackInSlot(1), storedItem, true, true)) { - int wanted = getStackInSlot(1).getMaxStackSize() - getStackInSlot(1).stackSize; - if (storedItem.stackSize >= wanted) { + int wanted = getStackInSlot(1).getMaxStackSize() - getStackInSlot(1).getCount(); + if (storedItem.getCount() >= wanted) { decrStackSize(1, -wanted); - storedItem.stackSize -= wanted; + storedItem.getCount() -= wanted; } else { - decrStackSize(1, -storedItem.stackSize); + decrStackSize(1, -storedItem.getCount()); storedItem = null; } } @@ -78,7 +78,7 @@ public class TileQuantumChest extends TileLegacyMachineBase @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { - worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), + world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), getPos().getY(), getPos().getZ()); readFromNBT(packet.getNbtCompound()); } @@ -98,7 +98,7 @@ public class TileQuantumChest extends TileLegacyMachineBase } if (storedItem != null) { - storedItem.stackSize = tagCompound.getInteger("storedQuantity"); + storedItem.getCount() = tagCompound.getInteger("storedQuantity"); } } @@ -112,7 +112,7 @@ public class TileQuantumChest extends TileLegacyMachineBase public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound) { if (storedItem != null) { tagCompound.setTag("storedStack", storedItem.writeToNBT(new NBTTagCompound())); - tagCompound.setInteger("storedQuantity", storedItem.stackSize); + tagCompound.setInteger("storedQuantity", storedItem.getCount()); } else { tagCompound.setInteger("storedQuantity", 0); } @@ -161,15 +161,15 @@ public class TileQuantumChest extends TileLegacyMachineBase @Override public void setStoredItemCount(int amount) { - this.storedItem.stackSize = 0; - this.storedItem.stackSize += (amount); + this.storedItem.getCount() = 0; + this.storedItem.getCount() += (amount); this.markDirty(); } @Override public void setStoredItemType(ItemStack type, int amount) { this.storedItem = type; - this.storedItem.stackSize = amount; + this.storedItem.getCount() = amount; this.markDirty(); } @@ -185,11 +185,11 @@ public class TileQuantumChest extends TileLegacyMachineBase String name = "of nothing"; if (storedItem != null) { name = storedItem.getDisplayName(); - size += storedItem.stackSize; + size += storedItem.getCount(); } if (getStackInSlot(1) != null) { name = getStackInSlot(1).getDisplayName(); - size += getStackInSlot(1).stackSize; + size += getStackInSlot(1).getCount(); } info.add(size + " " + name); } diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index 0ebd7486e..e680087f4 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -52,7 +52,7 @@ public class TileQuantumTank extends TileLegacyMachineBase @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { - worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), + world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), getPos().getY(), getPos().getZ()); readFromNBT(packet.getNbtCompound()); } @@ -60,7 +60,7 @@ public class TileQuantumTank extends TileLegacyMachineBase @Override public void updateEntity() { super.updateEntity(); - if (!worldObj.isRemote) { + if (!world.isRemote) { FluidUtils.drainContainers(this, inventory, 0, 1); FluidUtils.fillContainers(this, inventory, 0, 1, tank.getFluidType()); if (tank.getFluidType() != null && getStackInSlot(2) == null) { diff --git a/src/main/java/techreborn/tiles/TileRollingMachine.java b/src/main/java/techreborn/tiles/TileRollingMachine.java index 6418cba01..dee01f384 100644 --- a/src/main/java/techreborn/tiles/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/TileRollingMachine.java @@ -65,11 +65,11 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable public void updateEntity() { super.updateEntity(); charge(2); - if (!worldObj.isRemote) { - currentRecipe = RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, worldObj); + if (!world.isRemote) { + currentRecipe = RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, world); if (currentRecipe != null && canMake()) { if (tickTime >= runTime) { - currentRecipe = RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, worldObj); + currentRecipe = RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, world); if (currentRecipe != null) { boolean hasCrafted = false; if (inventory.getStackInSlot(0) == null) { @@ -77,10 +77,10 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable tickTime = -1; hasCrafted = true; } else { - if (inventory.getStackInSlot(0).stackSize + currentRecipe.stackSize <= currentRecipe + if (inventory.getStackInSlot(0).getCount() + currentRecipe.getCount() <= currentRecipe .getMaxStackSize()) { ItemStack stack = inventory.getStackInSlot(0); - stack.stackSize = stack.stackSize + currentRecipe.stackSize; + stack.getCount() = stack.getCount() + currentRecipe.getCount(); inventory.setInventorySlotContents(0, stack); tickTime = -1; hasCrafted = true; @@ -105,7 +105,7 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable tickTime = -1; } } else { - currentRecipe = RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, worldObj); + currentRecipe = RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, world); if (currentRecipe != null) { inventory.setInventorySlotContents(1, currentRecipe); } else { @@ -115,7 +115,7 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable } public boolean canMake() { - return RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, worldObj) != null; + return RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, world) != null; } @Override diff --git a/src/main/java/techreborn/tiles/TileScrapboxinator.java b/src/main/java/techreborn/tiles/TileScrapboxinator.java index c8e2b918b..768b4e239 100644 --- a/src/main/java/techreborn/tiles/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/TileScrapboxinator.java @@ -68,7 +68,7 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable } public void recycleItems() { - if (this.canOpen() && !worldObj.isRemote) { + if (this.canOpen() && !world.isRemote) { int random = new Random().nextInt(ScrapboxList.stacks.size()); ItemStack out = ScrapboxList.stacks.get(random).copy(); if (getStackInSlot(output) == null) { @@ -76,7 +76,7 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable setInventorySlotContents(output, out); } - if (getStackInSlot(input1).stackSize > 1) { + if (getStackInSlot(input1).getCount() > 1) { useEnergy(cost); this.decrStackSize(input1, 1); } else { @@ -95,11 +95,11 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable } public void updateState() { - IBlockState blockState = worldObj.getBlockState(pos); + IBlockState blockState = world.getBlockState(pos); if (blockState.getBlock() instanceof BlockMachineBase) { BlockMachineBase blockMachineBase = (BlockMachineBase) blockState.getBlock(); if (blockState.getValue(BlockMachineBase.ACTIVE) != progress > 0) - blockMachineBase.setActive(progress > 0, worldObj, pos); + blockMachineBase.setActive(progress > 0, world, pos); } } diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java index 19a661500..5c1d34384 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java @@ -131,7 +131,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn } private boolean isCoil(int x, int y, int z) { - return worldObj.getBlockState(new BlockPos(x, y, z)).getBlock() == ModBlocks.FusionCoil; + return world.getBlockState(new BlockPos(x, y, z)).getBlock() == ModBlocks.FusionCoil; } @Override @@ -139,11 +139,11 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn super.updateEntity(); // TODO improve this code a lot - if (worldObj.getTotalWorldTime() % 20 == 0) { + if (world.getTotalWorldTime() % 20 == 0) { checkCoils(); } - if (!worldObj.isRemote) { + if (!world.isRemote) { if (coilStatus == 1) { if (currentRecipe == null) { if (inventory.hasChanged || crafingTickTime != 0) { @@ -205,11 +205,11 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn if (getStackInSlot(outputStackSlot) == null) { setInventorySlotContents(outputStackSlot, currentRecipe.getOutput().copy()); } else { - decrStackSize(outputStackSlot, -currentRecipe.getOutput().stackSize); + decrStackSize(outputStackSlot, -currentRecipe.getOutput().getCount()); } - decrStackSize(topStackSlot, currentRecipe.getTopInput().stackSize); + decrStackSize(topStackSlot, currentRecipe.getTopInput().getCount()); if (currentRecipe.getBottomInput() != null) { - decrStackSize(bottomStackSlot, currentRecipe.getBottomInput().stackSize); + decrStackSize(bottomStackSlot, currentRecipe.getBottomInput().getCount()); } resetCrafter(); } @@ -259,7 +259,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn return true; } if (ItemUtils.isItemEqual(inventory.getStackInSlot(slot), stack, true, true, oreDic)) { - if (stack.stackSize + inventory.getStackInSlot(slot).stackSize <= stack.getMaxStackSize()) { + if (stack.getCount() + inventory.getStackInSlot(slot).getCount() <= stack.getMaxStackSize()) { return true; } } diff --git a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java index 576aa6477..083259f98 100644 --- a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java @@ -107,7 +107,7 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { - worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), + world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), getPos().getY(), getPos().getZ()); readFromNBT(packet.getNbtCompound()); } @@ -115,7 +115,7 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl @Override public void updateEntity() { super.updateEntity(); - if (!worldObj.isRemote) { + if (!world.isRemote) { FluidUtils.drainContainers(this, inventory, 0, 1); FluidUtils.fillContainers(this, inventory, 0, 1, tank.getFluidType()); if (tank.getFluidType() != null && getStackInSlot(2) == null) { diff --git a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java b/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java index b8b407ef2..e09b66a34 100644 --- a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java +++ b/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java @@ -26,8 +26,8 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha public void updateEntity() { super.updateEntity(); - if (!worldObj.isRemote) { - if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY() + 1, getPos().getZ())) + if (!world.isRemote) { + if (world.getBlockState(new BlockPos(getPos().getX(), getPos().getY() + 1, getPos().getZ())) .getBlock() == Blocks.DRAGON_EGG) { addEnergy(euTick); } diff --git a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java index cb5d9f727..e32cd1781 100644 --- a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java @@ -120,7 +120,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { - worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), + world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), getPos().getY(), getPos().getZ()); readFromNBT(packet.getNbtCompound()); } @@ -128,7 +128,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF @Override public void updateEntity() { super.updateEntity(); - if (!worldObj.isRemote) { + if (!world.isRemote) { FluidUtils.drainContainers(this, inventory, 0, 1); tank.compareAndUpdate(); } diff --git a/src/main/java/techreborn/tiles/generator/TileGenerator.java b/src/main/java/techreborn/tiles/generator/TileGenerator.java index e12656022..e2022a86a 100644 --- a/src/main/java/techreborn/tiles/generator/TileGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileGenerator.java @@ -38,7 +38,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn @Override public void updateEntity() { super.updateEntity(); - if (worldObj.isRemote) { + if (world.isRemote) { return; } if (getEnergy() < getMaxPower()) { @@ -57,7 +57,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn if (burnTime > 0) { updateState(); burnItem = getStackInSlot(fuelSlot); - if (getStackInSlot(fuelSlot).stackSize == 1) { + if (getStackInSlot(fuelSlot).getCount() == 1) { if(getStackInSlot(fuelSlot).getItem() == Items.LAVA_BUCKET || getStackInSlot(fuelSlot).getItem() == ForgeModContainer.getInstance().universalBucket){ setInventorySlotContents(fuelSlot, new ItemStack(Items.BUCKET)); } else { @@ -74,11 +74,11 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn } public void updateState() { - IBlockState BlockStateContainer = worldObj.getBlockState(pos); + IBlockState BlockStateContainer = world.getBlockState(pos); if (BlockStateContainer.getBlock() instanceof BlockMachineBase) { BlockMachineBase blockMachineBase = (BlockMachineBase) BlockStateContainer.getBlock(); if (BlockStateContainer.getValue(BlockMachineBase.ACTIVE) != burnTime > 0) - blockMachineBase.setActive(burnTime > 0, worldObj, pos); + blockMachineBase.setActive(burnTime > 0, world, pos); } } diff --git a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java index f4461e7f9..2c3cd1004 100644 --- a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java @@ -23,20 +23,20 @@ public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable public void updateEntity() { super.updateEntity(); - if (!worldObj.isRemote) { - if (worldObj.getBlockState(new BlockPos(getPos().getX() + 1, getPos().getY(), getPos().getZ())) + if (!world.isRemote) { + if (world.getBlockState(new BlockPos(getPos().getX() + 1, getPos().getY(), getPos().getZ())) .getBlock() == Blocks.LAVA) { addEnergy(euTick); - } else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() + 1)) + } else if (world.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() + 1)) .getBlock() == Blocks.LAVA) { addEnergy(euTick); - } else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() - 1)) + } else if (world.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() - 1)) .getBlock() == Blocks.LAVA) { addEnergy(euTick); - } else if (worldObj.getBlockState(new BlockPos(getPos().getX() - 1, getPos().getY(), getPos().getZ())) + } else if (world.getBlockState(new BlockPos(getPos().getX() - 1, getPos().getY(), getPos().getZ())) .getBlock() == Blocks.LAVA) { addEnergy(euTick); - } else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY() - 1, getPos().getZ())) + } else if (world.getBlockState(new BlockPos(getPos().getX(), getPos().getY() - 1, getPos().getZ())) .getBlock() == Blocks.LAVA) { addEnergy(euTick); } diff --git a/src/main/java/techreborn/tiles/generator/TileLightningRod.java b/src/main/java/techreborn/tiles/generator/TileLightningRod.java index aaa881e3c..75ee00702 100644 --- a/src/main/java/techreborn/tiles/generator/TileLightningRod.java +++ b/src/main/java/techreborn/tiles/generator/TileLightningRod.java @@ -28,24 +28,24 @@ public class TileLightningRod extends TilePowerAcceptor { if (onStatusHoldTicks == 0 || getEnergy() <= 0) { if (getBlockType() instanceof BlockMachineBase) - ((BlockMachineBase) getBlockType()).setActive(false, worldObj, pos); + ((BlockMachineBase) getBlockType()).setActive(false, world, pos); onStatusHoldTicks = -1; } - float weatherStrength = worldObj.getThunderStrength(1.0F); + float weatherStrength = world.getThunderStrength(1.0F); if (weatherStrength > 0.2F) { //lightStrikeChance = (MAX - (CHANCE * WEATHER_STRENGTH) float lightStrikeChance = ((100F - ConfigTechReborn.LightningRodChance) * 20F); float totalChance = lightStrikeChance * getLightningStrikeMultiplier() * ((1.1F - weatherStrength)); - if (worldObj.rand.nextInt((int) Math.floor(totalChance)) == 0) { - EntityLightningBolt lightningBolt = new EntityLightningBolt(worldObj, + if (world.rand.nextInt((int) Math.floor(totalChance)) == 0) { + EntityLightningBolt lightningBolt = new EntityLightningBolt(world, pos.getX() + 0.5F, - worldObj.provider.getAverageGroundLevel(), + world.provider.getAverageGroundLevel(), pos.getZ() + 0.5F, false); - worldObj.addWeatherEffect(lightningBolt); - worldObj.spawnEntityInWorld(lightningBolt); + world.addWeatherEffect(lightningBolt); + world.spawnEntity(lightningBolt); addEnergy(32768 * (0.3F + weatherStrength)); - ((BlockMachineBase) getBlockType()).setActive(true, worldObj, pos); + ((BlockMachineBase) getBlockType()).setActive(true, world, pos); onStatusHoldTicks = 400; } } @@ -53,8 +53,8 @@ public class TileLightningRod extends TilePowerAcceptor { } public float getLightningStrikeMultiplier() { - float actualHeight = worldObj.provider.getActualHeight(); - float groundLevel = worldObj.provider.getAverageGroundLevel(); + float actualHeight = world.provider.getActualHeight(); + float groundLevel = world.provider.getAverageGroundLevel(); for (int i = pos.getY() + 1; i < actualHeight; i++) { if (!isValidIronFence(i)) { if (groundLevel >= i) @@ -68,7 +68,7 @@ public class TileLightningRod extends TilePowerAcceptor { } public boolean isValidIronFence(int y) { - Item itemBlock = Item.getItemFromBlock(worldObj.getBlockState(new BlockPos(pos.getX(), y, pos.getZ())).getBlock()); + Item itemBlock = Item.getItemFromBlock(world.getBlockState(new BlockPos(pos.getX(), y, pos.getZ())).getBlock()); for (ItemStack fence : OreDictionary.getOres("fenceIron")) { if (fence.getItem() == itemBlock) return true; diff --git a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java index 9d5c20bc3..d89392557 100644 --- a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java @@ -126,7 +126,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { - worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), + world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), getPos().getY(), getPos().getZ()); readFromNBT(packet.getNbtCompound()); } @@ -134,7 +134,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench @Override public void updateEntity() { super.updateEntity(); - if (!worldObj.isRemote) + if (!world.isRemote) FluidUtils.drainContainers(this, inventory, 0, 1); if (tank.getFluidAmount() > 0 && getMaxPower() - getEnergy() >= euTick && tank.getFluidType() != null && fluids.containsKey(tank.getFluidType().getName())) { diff --git a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java index 1d20f49c4..77cbb1754 100644 --- a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java +++ b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java @@ -25,8 +25,8 @@ public class TileSolarPanel extends TilePowerAcceptor implements ITickable { @Override public void updateEntity() { super.updateEntity(); - if (!worldObj.isRemote) { - if (worldObj.getTotalWorldTime() % 60 == 0) { + if (!world.isRemote) { + if (world.getTotalWorldTime() % 60 == 0) { shouldMakePower = isSunOut(); } @@ -37,8 +37,8 @@ public class TileSolarPanel extends TilePowerAcceptor implements ITickable { powerToAdd = 0; } - worldObj.setBlockState(getPos(), - worldObj.getBlockState(this.getPos()).withProperty(BlockSolarPanel.ACTIVE, isSunOut())); + world.setBlockState(getPos(), + world.getBlockState(this.getPos()).withProperty(BlockSolarPanel.ACTIVE, isSunOut())); } } @@ -54,8 +54,8 @@ public class TileSolarPanel extends TilePowerAcceptor implements ITickable { } public boolean isSunOut() { - return worldObj.canBlockSeeSky(pos.up()) && !worldObj.isRaining() && !worldObj.isThundering() - && worldObj.isDaytime(); + return world.canBlockSeeSky(pos.up()) && !world.isRaining() && !world.isThundering() + && world.isDaytime(); } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index acad72b14..89b4b1e50 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -111,7 +111,7 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { - worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), + world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), getPos().getY(), getPos().getZ()); readFromNBT(packet.getNbtCompound()); } @@ -120,27 +120,27 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab // TODO optimise this code public void updateEntity() { super.updateEntity(); - if (!worldObj.isRemote) { + if (!world.isRemote) { FluidUtils.drainContainers(this, inventory, 0, 1); for (EnumFacing direction : EnumFacing.values()) { - if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), + if (world.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), getPos().getY() + direction.getFrontOffsetY(), getPos().getZ() + direction.getFrontOffsetZ())) .getBlock() == Blocks.LAVA) { addEnergy(1); } } - if (worldObj.getTotalWorldTime() % 40 == 0) { - BlockMachineBase bmb = (BlockMachineBase) worldObj.getBlockState(pos).getBlock(); + if (world.getTotalWorldTime() % 40 == 0) { + BlockMachineBase bmb = (BlockMachineBase) world.getBlockState(pos).getBlock(); boolean didFindLava = false; for (EnumFacing direction : EnumFacing.values()) { - if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), + if (world.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), getPos().getY() + direction.getFrontOffsetY(), getPos().getZ() + direction.getFrontOffsetZ())).getBlock() == Blocks.LAVA) { didFindLava = true; } } - bmb.setActive(didFindLava, worldObj, pos); + bmb.setActive(didFindLava, world, pos); } } if (tank.getFluidAmount() > 0 && getMaxPower() - getEnergy() >= euTick) { diff --git a/src/main/java/techreborn/tiles/generator/TileWaterMill.java b/src/main/java/techreborn/tiles/generator/TileWaterMill.java index ef561d960..c1c9567b9 100644 --- a/src/main/java/techreborn/tiles/generator/TileWaterMill.java +++ b/src/main/java/techreborn/tiles/generator/TileWaterMill.java @@ -19,7 +19,7 @@ public class TileWaterMill extends TilePowerAcceptor { @Override public void updateEntity() { super.updateEntity(); - if (worldObj.getTotalWorldTime() % 20 == 0) { + if (world.getTotalWorldTime() % 20 == 0) { checkForWater(); } if (waterblocks > 0) { @@ -30,7 +30,7 @@ public class TileWaterMill extends TilePowerAcceptor { public void checkForWater() { waterblocks = 0; for (EnumFacing facing : EnumFacing.HORIZONTALS) { - if (worldObj.getBlockState(getPos().offset(facing)).getBlock() == Blocks.WATER) { + if (world.getBlockState(getPos().offset(facing)).getBlock() == Blocks.WATER) { waterblocks++; } } diff --git a/src/main/java/techreborn/tiles/generator/TileWindMill.java b/src/main/java/techreborn/tiles/generator/TileWindMill.java index eb896a9da..ddb490039 100644 --- a/src/main/java/techreborn/tiles/generator/TileWindMill.java +++ b/src/main/java/techreborn/tiles/generator/TileWindMill.java @@ -20,7 +20,7 @@ public class TileWindMill extends TilePowerAcceptor { super.updateEntity(); if (pos.getY() > 64) { int actualPower = basePower; - if (worldObj.isThundering()) { + if (world.isThundering()) { actualPower *= 1.25; } addEnergy(actualPower); // Value taken from diff --git a/src/main/java/techreborn/tiles/idsu/TileIDSU.java b/src/main/java/techreborn/tiles/idsu/TileIDSU.java index 59a8527f3..a342d5861 100644 --- a/src/main/java/techreborn/tiles/idsu/TileIDSU.java +++ b/src/main/java/techreborn/tiles/idsu/TileIDSU.java @@ -37,7 +37,7 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable { if (ownerUdid == null && StringUtils.isBlank(ownerUdid) || StringUtils.isEmpty(ownerUdid)) { return 0.0; } - return IDSUManager.INSTANCE.getSaveDataForWorld(worldObj, ownerUdid).storedPower; + return IDSUManager.INSTANCE.getSaveDataForWorld(world, ownerUdid).storedPower; } @Override @@ -45,7 +45,7 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable { if (ownerUdid == null && StringUtils.isBlank(ownerUdid) || StringUtils.isEmpty(ownerUdid)) { return; } - IDSUManager.INSTANCE.getSaveDataForWorld(worldObj, ownerUdid).storedPower = energy; + IDSUManager.INSTANCE.getSaveDataForWorld(world, ownerUdid).storedPower = energy; } @Override diff --git a/src/main/java/techreborn/tiles/lesu/TileLesu.java b/src/main/java/techreborn/tiles/lesu/TileLesu.java index 33e4502f5..e864bc17e 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesu.java +++ b/src/main/java/techreborn/tiles/lesu/TileLesu.java @@ -27,19 +27,19 @@ public class TileLesu extends TilePowerAcceptor {// TODO wrench @Override public void updateEntity() { super.updateEntity(); - if (worldObj.isRemote) { + if (world.isRemote) { return; } countedNetworks.clear(); connectedBlocks = 0; for (EnumFacing dir : EnumFacing.values()) { - if (worldObj.getTileEntity( + if (world.getTileEntity( new BlockPos(getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(), getPos().getZ() + dir.getFrontOffsetZ())) instanceof TileLesuStorage) { - if (((TileLesuStorage) worldObj.getTileEntity( + if (((TileLesuStorage) world.getTileEntity( new BlockPos(getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(), getPos().getZ() + dir.getFrontOffsetZ()))).network != null) { - LesuNetwork network = ((TileLesuStorage) worldObj.getTileEntity(new BlockPos( + LesuNetwork network = ((TileLesuStorage) world.getTileEntity(new BlockPos( getPos().getX() + dir.getFrontOffsetX(), getPos().getY() + dir.getFrontOffsetY(), getPos().getZ() + dir.getFrontOffsetZ()))).network; if (!countedNetworks.contains(network)) { diff --git a/src/main/java/techreborn/tiles/lesu/TileLesuStorage.java b/src/main/java/techreborn/tiles/lesu/TileLesuStorage.java index 0ce9056c2..989f6bea9 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesuStorage.java +++ b/src/main/java/techreborn/tiles/lesu/TileLesuStorage.java @@ -14,7 +14,7 @@ public class TileLesuStorage extends TileLegacyMachineBase { public void updateEntity() { super.updateEntity(); if (network == null) { - findAndJoinNetwork(worldObj, getPos().getX(), getPos().getY(), getPos().getZ()); + findAndJoinNetwork(world, getPos().getX(), getPos().getY(), getPos().getZ()); } else { if (network.master != null && network.master.getWorld().getTileEntity(new BlockPos(network.master.getPos().getX(), @@ -61,6 +61,6 @@ public class TileLesuStorage extends TileLegacyMachineBase { public final void rebuildNetwork() { this.removeFromNetwork(); this.resetNetwork(); - this.findAndJoinNetwork(worldObj, getPos().getX(), getPos().getY(), getPos().getZ()); + this.findAndJoinNetwork(world, getPos().getX(), getPos().getY(), getPos().getZ()); } } diff --git a/src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java b/src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java index 01b066ea3..21296540e 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java +++ b/src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java @@ -80,7 +80,7 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, public int getHeat() { for (EnumFacing direction : EnumFacing.values()) { - TileEntity tileEntity = worldObj.getTileEntity(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), + TileEntity tileEntity = world.getTileEntity(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), getPos().getY() + direction.getFrontOffsetY(), getPos().getZ() + direction.getFrontOffsetZ())); if (tileEntity instanceof TileMachineCasing) { if (((TileMachineCasing) tileEntity).isConnected() @@ -89,22 +89,22 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, Location location = new Location(getPos().getX(), getPos().getY(), getPos().getZ(), direction); location.modifyPositionFromSide(direction, 1); int heat = 0; - if (worldObj.getBlockState(new BlockPos(location.getX(), location.getY() - 1, location.getZ())) + if (world.getBlockState(new BlockPos(location.getX(), location.getY() - 1, location.getZ())) .getBlock() == tileEntity.getBlockType()) { return 0; } for (IMultiblockPart part : casing.connectedParts) { - BlockMachineCasing casing1 = (BlockMachineCasing) worldObj.getBlockState(part.getPos()) + BlockMachineCasing casing1 = (BlockMachineCasing) world.getBlockState(part.getPos()) .getBlock(); heat += casing1 .getHeatFromState(part.getWorld().getBlockState(part.getWorldLocation().toBlockPos())); // TODO meta fix } - if (worldObj.getBlockState(new BlockPos(location.getX(), location.getY(), location.getZ())) + if (world.getBlockState(new BlockPos(location.getX(), location.getY(), location.getZ())) .getBlock().getUnlocalizedName().equals("tile.lava") - && worldObj + && world .getBlockState(new BlockPos(location.getX(), location.getY() + 1, location.getZ())) .getBlock().getUnlocalizedName().equals("tile.lava")) { heat += 500; @@ -118,7 +118,7 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { - worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), + world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), getPos().getY(), getPos().getZ()); readFromNBT(packet.getNbtCompound()); } diff --git a/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java index 41504ca08..4e3438dcb 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java @@ -35,7 +35,7 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc @Override public void validate() { super.validate(); - multiblockChecker = new MultiblockChecker(worldObj, getPos().down(3)); + multiblockChecker = new MultiblockChecker(world, getPos().down(3)); } @Override diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java index 21a84ef5e..609118650 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java @@ -94,7 +94,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor if (multiblockChecker == null) { BlockPos pos = getPos().offset(getFacing().getOpposite(), 2).down(); - multiblockChecker = new MultiblockChecker(worldObj, pos); + multiblockChecker = new MultiblockChecker(world, pos); } if (getMutliBlock()) { diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java index 357397e5e..555fa3c99 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java @@ -57,7 +57,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha canUseEnergy(128.0F) && !tank.isEmpty() && tank.getFluid().amount >= 1000) { - if (--wood.stackSize == 0) + if (--wood.getCount() == 0) setInventorySlotContents(0, null); tank.drain(1000, true); useEnergy(128.0F); @@ -66,7 +66,7 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha } } } else if (++tickTime > 100) { - Random rnd = worldObj.rand; + Random rnd = world.rand; addOutput(2, new ItemStack(Blocks.PLANKS, 6 + rnd.nextInt(4))); if (rnd.nextInt(4) != 0) { ItemStack pulp = ItemDusts.getDustByName("sawDust", 2 + rnd.nextInt(3)); @@ -85,18 +85,18 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha public void addOutput(int slot, ItemStack stack) { if (getStackInSlot(slot) == null) setInventorySlotContents(slot, stack); - getStackInSlot(slot).stackSize += stack.stackSize; + getStackInSlot(slot).getCount() += stack.getCount(); } public boolean canAddOutput(int slot, int amount) { ItemStack stack = getStackInSlot(slot); - return stack == null || getInventoryStackLimit() - stack.stackSize >= amount; + return stack == null || getInventoryStackLimit() - stack.getCount() >= amount; } @Override public void validate() { super.validate(); - multiblockChecker = new MultiblockChecker(worldObj, getPos().down(3)); + multiblockChecker = new MultiblockChecker(world, getPos().down(3)); } public boolean getMutliBlock() { diff --git a/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java b/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java index 0575a5bd2..54e89b3c5 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java +++ b/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java @@ -34,7 +34,7 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable, @Override public void validate() { super.validate(); - multiblockChecker = new MultiblockChecker(worldObj, getPos().down()); + multiblockChecker = new MultiblockChecker(world, getPos().down()); } @Override diff --git a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java index 58f56c237..ef4d61f35 100644 --- a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java +++ b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java @@ -85,7 +85,7 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable, @Override public void setFacing(EnumFacing enumFacing) { - worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BlockEnergyStorage.FACING, enumFacing)); + world.setBlockState(pos, world.getBlockState(pos).withProperty(BlockEnergyStorage.FACING, enumFacing)); } @Override @@ -111,9 +111,9 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable, @Override public EnumFacing getFacingEnum() { - Block block = worldObj.getBlockState(pos).getBlock(); + Block block = world.getBlockState(pos).getBlock(); if (block instanceof BlockEnergyStorage) { - return ((BlockEnergyStorage) block).getFacing(worldObj.getBlockState(pos)); + return ((BlockEnergyStorage) block).getFacing(world.getBlockState(pos)); } return null; } diff --git a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java index aa72e988e..2680e3b36 100644 --- a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java @@ -71,9 +71,9 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl if (getStackInSlot(output) == null) { setInventorySlotContents(output, itemstack.copy()); } else if (getStackInSlot(output).isItemEqual(itemstack)) { - getStackInSlot(output).stackSize += itemstack.stackSize; + getStackInSlot(output).grow(itemstack.getCount()); } - if (getStackInSlot(input1).stackSize > 1) { + if (getStackInSlot(input1).getCount() > 1) { this.decrStackSize(input1, 1); } else { setInventorySlotContents(input1, null); @@ -92,7 +92,7 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl return true; if (!getStackInSlot(output).isItemEqual(itemstack)) return false; - int result = getStackInSlot(output).stackSize + itemstack.stackSize; + int result = getStackInSlot(output).getCount() + itemstack.getCount(); return (result <= getInventoryStackLimit() && result <= itemstack.getMaxStackSize()); } } @@ -110,11 +110,11 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl } public void updateState() { - IBlockState BlockStateContainer = worldObj.getBlockState(pos); + IBlockState BlockStateContainer = world.getBlockState(pos); if (BlockStateContainer.getBlock() instanceof BlockMachineBase) { BlockMachineBase blockMachineBase = (BlockMachineBase) BlockStateContainer.getBlock(); if (BlockStateContainer.getValue(BlockMachineBase.ACTIVE) != progress > 0) - blockMachineBase.setActive(progress > 0, worldObj, pos); + blockMachineBase.setActive(progress > 0, world, pos); } } diff --git a/src/main/java/techreborn/tiles/teir1/TileRecycler.java b/src/main/java/techreborn/tiles/teir1/TileRecycler.java index 3a8cff2f3..825cba97c 100644 --- a/src/main/java/techreborn/tiles/teir1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/teir1/TileRecycler.java @@ -36,7 +36,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv @Override public void updateEntity() { - if (worldObj.isRemote) { + if (world.isRemote) { return; } boolean burning = isBurning(); @@ -70,7 +70,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv public void recycleItems() { if (this.canRecycle()) { ItemStack itemstack = ItemParts.getPartByName("scrap"); - int randomchance = worldObj.rand.nextInt(chance); + int randomchance = world.rand.nextInt(chance); if (getStackInSlot(output) == null) { useEnergy(cost); @@ -80,10 +80,10 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv } else if (getStackInSlot(output).isItemEqual(itemstack)) { useEnergy(cost); if (randomchance == 1) { - getStackInSlot(output).stackSize += itemstack.stackSize; + getStackInSlot(output).getCount() += itemstack.getCount(); } } - if (getStackInSlot(input1).stackSize > 1) { + if (getStackInSlot(input1).getCount() > 1) { useEnergy(cost); this.decrStackSize(input1, 1); } else { @@ -100,7 +100,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv public boolean hasSlotGotSpace(int slot) { if (getStackInSlot(slot) == null) { return true; - } else if (getStackInSlot(slot).stackSize < getStackInSlot(slot).getMaxStackSize()) { + } else if (getStackInSlot(slot).getCount() < getStackInSlot(slot).getMaxStackSize()) { return true; } return true; @@ -111,11 +111,11 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv } public void updateState() { - IBlockState BlockStateContainer = worldObj.getBlockState(pos); + IBlockState BlockStateContainer = world.getBlockState(pos); if (BlockStateContainer.getBlock() instanceof BlockMachineBase) { BlockMachineBase blockMachineBase = (BlockMachineBase) BlockStateContainer.getBlock(); if (BlockStateContainer.getValue(BlockMachineBase.ACTIVE) != progress > 0) - blockMachineBase.setActive(progress > 0, worldObj, pos); + blockMachineBase.setActive(progress > 0, world, pos); } } diff --git a/src/main/java/techreborn/tiles/transformers/TileTransformer.java b/src/main/java/techreborn/tiles/transformers/TileTransformer.java index 9c3ad0fc0..290e3fc0c 100644 --- a/src/main/java/techreborn/tiles/transformers/TileTransformer.java +++ b/src/main/java/techreborn/tiles/transformers/TileTransformer.java @@ -70,9 +70,9 @@ public class TileTransformer extends TilePowerAcceptor implements IWrenchable, I @Override public EnumFacing getFacingEnum() { - Block block = worldObj.getBlockState(pos).getBlock(); + Block block = world.getBlockState(pos).getBlock(); if (block instanceof BlockTransformer) { - return ((BlockTransformer) block).getFacing(worldObj.getBlockState(pos)); + return ((BlockTransformer) block).getFacing(world.getBlockState(pos)); } return null; } diff --git a/src/main/java/techreborn/utils/OreDictUtils.java b/src/main/java/techreborn/utils/OreDictUtils.java index 5e9b058f3..700acc768 100644 --- a/src/main/java/techreborn/utils/OreDictUtils.java +++ b/src/main/java/techreborn/utils/OreDictUtils.java @@ -57,9 +57,9 @@ public class OreDictUtils { public static ItemStack getDictOreOrNull(String name, int amount) { List ores = OreDictionary.getOres(name); if (ores.isEmpty()) - return null; + return ItemStack.EMPTY; ItemStack ore = ores.get(0); - ore.stackSize = amount; + ore.setCount(amount); return ore; } @@ -78,7 +78,7 @@ public class OreDictUtils { } public static boolean isOre(ItemStack stack, String oreName) { - if (stack != null && stack.getItem() != null && oreName != null) { + if (stack != null && !stack.isEmpty() && oreName != null) { int id = OreDictionary.getOreID(oreName); int[] ids = OreDictionary.getOreIDs(stack);