From b4a16c03edd97b2ec732cc7e89df225504627241 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 13 Mar 2016 16:15:27 +0000 Subject: [PATCH] And 50 more errors fixed --- .../java/techreborn/items/ItemScrapBox.java | 12 ++++-- src/main/java/techreborn/lib/ModInfo.java | 2 +- src/main/java/techreborn/lib/Reference.java | 37 ++++++++++--------- .../techreborn/manual/pages/BasePage.java | 4 +- .../manual/pages/CraftingInfoPage.java | 2 +- .../manual/util/GuiButtonItemTexture.java | 2 +- .../tiles/generator/TileDieselGenerator.java | 6 +-- .../tiles/generator/TileGasTurbine.java | 6 +-- .../generator/TileSemifluidGenerator.java | 6 +-- .../tiles/generator/TileThermalGenerator.java | 6 +-- .../techreborn/world/RubberTreeGenerator.java | 27 ++++++++------ 11 files changed, 60 insertions(+), 50 deletions(-) diff --git a/src/main/java/techreborn/items/ItemScrapBox.java b/src/main/java/techreborn/items/ItemScrapBox.java index 2f8f47726..2fbc4443c 100644 --- a/src/main/java/techreborn/items/ItemScrapBox.java +++ b/src/main/java/techreborn/items/ItemScrapBox.java @@ -4,6 +4,9 @@ import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; import net.minecraft.world.World; import reborncore.RebornCore; import techreborn.api.ScrapboxList; @@ -16,9 +19,9 @@ public class ItemScrapBox extends ItemTR implements ITexturedItem{ setCreativeTab(TechRebornCreativeTabMisc.instance); RebornCore.jsonDestroyer.registerObject(this); } - + @Override - public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) { + public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) { if(!world.isRemote) { int random = world.rand.nextInt(ScrapboxList.stacks.size()); ItemStack out = ScrapboxList.stacks.get(random).copy(); @@ -29,12 +32,13 @@ public class ItemScrapBox extends ItemTR implements ITexturedItem{ entityitem.setPickupDelay(20); world.spawnEntityInWorld(entityitem); - + itemStack.stackSize--; } - return itemStack; + return new ActionResult<>(EnumActionResult.SUCCESS, itemStack); } + @Override public int getMaxMeta() { return 1; diff --git a/src/main/java/techreborn/lib/ModInfo.java b/src/main/java/techreborn/lib/ModInfo.java index 84434fcc8..ec693e629 100644 --- a/src/main/java/techreborn/lib/ModInfo.java +++ b/src/main/java/techreborn/lib/ModInfo.java @@ -28,7 +28,7 @@ public class ModInfo implements IModInfo { } @Override - public String MOD_DEPENDENCUIES() { + public String MOD_DEPENDENCIES() { return MOD_DEPENDENCUIES; } diff --git a/src/main/java/techreborn/lib/Reference.java b/src/main/java/techreborn/lib/Reference.java index 750461141..86d624cb4 100644 --- a/src/main/java/techreborn/lib/Reference.java +++ b/src/main/java/techreborn/lib/Reference.java @@ -1,23 +1,24 @@ package techreborn.lib; -import net.minecraft.util.StatCollector; + +import net.minecraft.util.text.translation.I18n; public class Reference { - public static String alloySmelteRecipe = StatCollector.translateToLocal("techreborn.recipe.alloysmelter"); - public static String assemblingMachineRecipe = StatCollector.translateToLocal("techreborn.recipe.assemblingmachine"); - public static String blastFurnaceRecipe = StatCollector.translateToLocal("techreborn.recipe.blastfurnace"); - public static String centrifugeRecipe = StatCollector.translateToLocal("techreborn.recipe.centrifuge"); - public static String chemicalReactorRecipe = StatCollector.translateToLocal("techreborn.recipe.chemicalReactor"); - public static String industrialGrinderRecipe = StatCollector.translateToLocal("techreborn.recipe.grinder"); - public static String implosionCompressorRecipe = StatCollector.translateToLocal("techreborn.recipe.implosioncompressor"); - public static String industrialElectrolyzerRecipe = StatCollector.translateToLocal("techreborn.recipe.industrialelectrolyzer"); - public static String industrialSawmillRecipe = StatCollector.translateToLocal("techreborn.recipe.industrialsawmill"); - public static String latheRecipe = StatCollector.translateToLocal("techreborn.recipe.lathe"); - public static String plateCuttingMachineRecipe = StatCollector.translateToLocal("techreborn.recipe.platecuttingmachine"); - public static String vacuumFreezerRecipe = StatCollector.translateToLocal("tile.techreborn.vacuumfreezer.name"); - public static String grinderRecipe = StatCollector.translateToLocal("tile.techreborn.grinder.name"); - public static String extractorRecipe = StatCollector.translateToLocal("tile.techreborn.extractor.name"); - public static String compressorRecipe = StatCollector.translateToLocal("tile.techreborn.compressor.name"); - public static String recyclerRecipe = StatCollector.translateToLocal("tile.techreborn.recycler.name"); - public static String scrapboxRecipe = StatCollector.translateToLocal("techreborn.recipe.scrapbox"); + public static String alloySmelteRecipe = I18n.translateToLocal("techreborn.recipe.alloysmelter"); + public static String assemblingMachineRecipe = I18n.translateToLocal("techreborn.recipe.assemblingmachine"); + public static String blastFurnaceRecipe = I18n.translateToLocal("techreborn.recipe.blastfurnace"); + public static String centrifugeRecipe = I18n.translateToLocal("techreborn.recipe.centrifuge"); + public static String chemicalReactorRecipe = I18n.translateToLocal("techreborn.recipe.chemicalReactor"); + public static String industrialGrinderRecipe = I18n.translateToLocal("techreborn.recipe.grinder"); + public static String implosionCompressorRecipe = I18n.translateToLocal("techreborn.recipe.implosioncompressor"); + public static String industrialElectrolyzerRecipe = I18n.translateToLocal("techreborn.recipe.industrialelectrolyzer"); + public static String industrialSawmillRecipe = I18n.translateToLocal("techreborn.recipe.industrialsawmill"); + public static String latheRecipe = I18n.translateToLocal("techreborn.recipe.lathe"); + public static String plateCuttingMachineRecipe = I18n.translateToLocal("techreborn.recipe.platecuttingmachine"); + public static String vacuumFreezerRecipe = I18n.translateToLocal("tile.techreborn.vacuumfreezer.name"); + public static String grinderRecipe = I18n.translateToLocal("tile.techreborn.grinder.name"); + public static String extractorRecipe = I18n.translateToLocal("tile.techreborn.extractor.name"); + public static String compressorRecipe = I18n.translateToLocal("tile.techreborn.compressor.name"); + public static String recyclerRecipe = I18n.translateToLocal("tile.techreborn.recycler.name"); + public static String scrapboxRecipe = I18n.translateToLocal("techreborn.recipe.scrapbox"); } diff --git a/src/main/java/techreborn/manual/pages/BasePage.java b/src/main/java/techreborn/manual/pages/BasePage.java index df1a7e5c2..5a867bee0 100644 --- a/src/main/java/techreborn/manual/pages/BasePage.java +++ b/src/main/java/techreborn/manual/pages/BasePage.java @@ -4,7 +4,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; import techreborn.manual.PageCollection; import techreborn.manual.Reference; @@ -92,6 +92,6 @@ public class BasePage extends GuiScreen { //Translate To Local public String ttl(String unlocalizedName) { - return StatCollector.translateToLocal(unlocalizedName); + return I18n.translateToLocal(unlocalizedName); } } diff --git a/src/main/java/techreborn/manual/pages/CraftingInfoPage.java b/src/main/java/techreborn/manual/pages/CraftingInfoPage.java index 62ddfb125..06945b597 100644 --- a/src/main/java/techreborn/manual/pages/CraftingInfoPage.java +++ b/src/main/java/techreborn/manual/pages/CraftingInfoPage.java @@ -8,7 +8,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; diff --git a/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java b/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java index 0a846bef8..56b9314a8 100644 --- a/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java +++ b/src/main/java/techreborn/manual/util/GuiButtonItemTexture.java @@ -2,7 +2,7 @@ package techreborn.manual.util; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.client.config.GuiButtonExt; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java index cc07aa841..da89cb7ea 100644 --- a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fluids.Fluid; @@ -120,12 +120,12 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl public Packet getDescriptionPacket() { NBTTagCompound nbtTag = new NBTTagCompound(); writeToNBT(nbtTag); - return new S35PacketUpdateTileEntity(this.getPos(), 1, nbtTag); + return new SPacketUpdateTileEntity(this.getPos(), 1, nbtTag); } @Override public void onDataPacket(NetworkManager net, - S35PacketUpdateTileEntity packet) { + SPacketUpdateTileEntity packet) { worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), getPos().getY(), getPos().getZ()); readFromNBT(packet.getNbtCompound()); diff --git a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java index 27678bba9..75c8dd632 100644 --- a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fluids.Fluid; @@ -135,12 +135,12 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, public Packet getDescriptionPacket() { NBTTagCompound nbtTag = new NBTTagCompound(); writeToNBT(nbtTag); - return new S35PacketUpdateTileEntity(this.getPos(), 1, nbtTag); + return new SPacketUpdateTileEntity(this.getPos(), 1, nbtTag); } @Override public void onDataPacket(NetworkManager net, - S35PacketUpdateTileEntity packet) { + SPacketUpdateTileEntity packet) { worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), getPos().getY(), getPos().getZ()); readFromNBT(packet.getNbtCompound()); diff --git a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java index f0e411167..d5ac1639c 100644 --- a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fluids.Fluid; @@ -141,12 +141,12 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench public Packet getDescriptionPacket() { NBTTagCompound nbtTag = new NBTTagCompound(); writeToNBT(nbtTag); - return new S35PacketUpdateTileEntity(this.getPos(), 1, nbtTag); + return new SPacketUpdateTileEntity(this.getPos(), 1, nbtTag); } @Override public void onDataPacket(NetworkManager net, - S35PacketUpdateTileEntity packet) { + SPacketUpdateTileEntity packet) { worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), getPos().getY(), getPos().getZ()); readFromNBT(packet.getNbtCompound()); diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index 97375bdd5..22616ad94 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; @@ -126,12 +126,12 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab public Packet getDescriptionPacket() { NBTTagCompound nbtTag = new NBTTagCompound(); writeToNBT(nbtTag); - return new S35PacketUpdateTileEntity(this.getPos(), 1, nbtTag); + return new SPacketUpdateTileEntity(this.getPos(), 1, nbtTag); } @Override public void onDataPacket(NetworkManager net, - S35PacketUpdateTileEntity packet) { + SPacketUpdateTileEntity packet) { worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(), getPos().getY(), getPos().getZ()); readFromNBT(packet.getNbtCompound()); diff --git a/src/main/java/techreborn/world/RubberTreeGenerator.java b/src/main/java/techreborn/world/RubberTreeGenerator.java index bdec2ae36..53806edf2 100644 --- a/src/main/java/techreborn/world/RubberTreeGenerator.java +++ b/src/main/java/techreborn/world/RubberTreeGenerator.java @@ -62,9 +62,10 @@ public class RubberTreeGenerator extends WorldGenerator { int xOffset; int yOffset; int zOffset; - Block baseBlock = world.getBlockState(new BlockPos(x, y - 1, z)).getBlock(); + IBlockState baseSate = world.getBlockState(new BlockPos(x, y - 1, z)); + Block baseBlock = baseSate.getBlock(); boolean hasPlacedBlock = false; - if (baseBlock != null && baseBlock.canSustainPlant(world, new BlockPos(x, y - 1, z), EnumFacing.UP, (IPlantable) ModBlocks.rubberSapling) && y < worldHeight - treeHeight - 1) { + if (baseBlock != null && baseBlock.canSustainPlant(baseSate, world, new BlockPos(x, y - 1, z), EnumFacing.UP, (IPlantable) ModBlocks.rubberSapling) && y < worldHeight - treeHeight - 1) { for (yOffset = y; yOffset <= y + 1 + treeHeight; ++yOffset) { byte radius = 1; if (yOffset == y) { @@ -76,11 +77,12 @@ public class RubberTreeGenerator extends WorldGenerator { if (yOffset >= 0 & yOffset < worldHeight) { for (xOffset = x - radius; xOffset <= x + radius; ++xOffset) { for (zOffset = z - radius; zOffset <= z + radius; ++zOffset) { - Block block = world.getBlockState(new BlockPos(xOffset, yOffset, zOffset)).getBlock(); + IBlockState state = world.getBlockState(new BlockPos(xOffset, yOffset, zOffset)); + Block block = state.getBlock(); - if (block != null && !(block.isLeaves(world, new BlockPos(xOffset, yOffset, zOffset)) || - block.isAir(world, new BlockPos(xOffset, yOffset, zOffset)) || - block.canBeReplacedByLeaves(world, new BlockPos(xOffset, yOffset, zOffset)))) { + if (block != null && !(block.isLeaves(state, world, new BlockPos(xOffset, yOffset, zOffset)) || + block.isAir(state, world, new BlockPos(xOffset, yOffset, zOffset)) || + block.canBeReplacedByLeaves(state, world, new BlockPos(xOffset, yOffset, zOffset)))) { return false; } } @@ -92,7 +94,8 @@ public class RubberTreeGenerator extends WorldGenerator { BlockPos treeBase = new BlockPos(x, y, z); BlockPos treeRoot = treeBase.down(); - world.getBlockState(treeRoot).getBlock().onPlantGrow(world, treeRoot, treeBase); + IBlockState state = world.getBlockState(treeRoot); + state.getBlock().onPlantGrow(state, world, treeRoot, treeBase); for (yOffset = y - 3 + treeHeight; yOffset <= y + treeHeight; ++yOffset) { int var12 = yOffset - (y + treeHeight), center = 1 - var12 / 2; @@ -102,8 +105,9 @@ public class RubberTreeGenerator extends WorldGenerator { for (zOffset = z - center; zOffset <= z + center; ++zOffset) { int zPos = zOffset - z; zPos = (zPos + (t = zPos >> 31)) ^ t; - Block block = world.getBlockState(new BlockPos(xOffset, yOffset, zOffset)).getBlock(); - if (((xPos != center | zPos != center) || rand.nextInt(2) != 0 && var12 != 0) && (block == null || block.isLeaves(world, new BlockPos(xOffset, yOffset, zOffset)) || block.isAir(world, new BlockPos(xOffset, yOffset, zOffset)) || block.canBeReplacedByLeaves(world, new BlockPos(xOffset, yOffset, zOffset)))) { + IBlockState state1 = world.getBlockState(new BlockPos(xOffset, yOffset, zOffset)); + Block block = state1.getBlock(); + if (((xPos != center | zPos != center) || rand.nextInt(2) != 0 && var12 != 0) && (block == null || block.isLeaves(state1, world, new BlockPos(xOffset, yOffset, zOffset)) || block.isAir(state1, world, new BlockPos(xOffset, yOffset, zOffset)) || block.canBeReplacedByLeaves(state1, world, new BlockPos(xOffset, yOffset, zOffset)))) { this.setBlockAndNotifyAdequately(world, new BlockPos(xOffset, yOffset, zOffset), ModBlocks.rubberLeaves.getDefaultState()); hasPlacedBlock = true; } @@ -114,8 +118,9 @@ public class RubberTreeGenerator extends WorldGenerator { BlockPos topLogPos = null; for (yOffset = 0; yOffset < treeHeight; ++yOffset) { BlockPos blockpos = new BlockPos(x, y + yOffset, z); - Block block = world.getBlockState(blockpos).getBlock(); - if (block == null || block.isAir(world, blockpos) || block.isLeaves(world, blockpos) || block.isReplaceable(world, blockpos)) { + IBlockState state1 = world.getBlockState(blockpos); + Block block = state1.getBlock(); + if (block == null || block.isAir(state1, world, blockpos) || block.isLeaves(state1,world, blockpos) || block.isReplaceable(world, blockpos)) { IBlockState newState = ModBlocks.rubberLog.getDefaultState(); boolean isAddingSap = false; if (rand.nextInt(Core.worldGen.config.rubberTreeConfig.sapRarity) == 0) {