From 0fe91c2d7aa017285e68eb9ba09f2039fa84e04a Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Sun, 2 Feb 2014 23:18:57 -0500 Subject: [PATCH] 35 errors left --- resources/TConstruct_at.cfg | 4 +- .../java/tconstruct/blocks/SmelteryBlock.java | 3 +- .../tconstruct/blocks/slime/SlimeGrass.java | 3 +- .../tconstruct/client/TClientTickHandler.java | 14 ++--- .../tconstruct/util/TCraftingHandler.java | 36 +++++------ .../util/player/TPlayerHandler.java | 59 ++++++++++++------- 6 files changed, 66 insertions(+), 53 deletions(-) diff --git a/resources/TConstruct_at.cfg b/resources/TConstruct_at.cfg index b6dcea58..286f55e5 100644 --- a/resources/TConstruct_at.cfg +++ b/resources/TConstruct_at.cfg @@ -8,6 +8,7 @@ public net.minecraft.entity.projectile.EntityArrow field_145791_d public net.minecraft.entity.projectile.EntityArrow field_145792_e public net.minecraft.entity.projectile.EntityArrow field_70254_i public net.minecraft.entity.projectile.EntityArrow field_70252_j +public net.minecraft.entity.projectile.EntityArrow field_70253_h public net.minecraft.entity.projectile.EntityArrow field_70257_an public net.minecraft.entity.projectile.EntityArrow field_70255_ao public net.minecraft.entity.projectile.EntityArrow field_70256_ap @@ -24,9 +25,10 @@ public net.minecraft.block.BlockRailBase$Rail func_150650_a()I public net.minecraft.client.gui.inventory.GuiContainer field_146999_f public net.minecraft.client.gui.inventory.GuiContainer field_147009_r # GuiScreen -public net.minecraft.client.gui.inventory.GuiScreen field_146292_n #buttonList +public net.minecraft.client.gui.GuiScreen field_146292_n #buttonList # ThreadDownloadImageData public net.minecraft.client.renderer.ThreadDownloadImageData field_110559_g #field_110559_g public net.minecraft.client.renderer.ThreadDownloadImageData field_110560_d #field_110560_d +public net.minecraft.potion.PotionEffect field_76460_b # needs to have a space at the end of every line or SS will derp \ No newline at end of file diff --git a/src/main/java/tconstruct/blocks/SmelteryBlock.java b/src/main/java/tconstruct/blocks/SmelteryBlock.java index 0151cdef..7e3af452 100644 --- a/src/main/java/tconstruct/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/blocks/SmelteryBlock.java @@ -227,7 +227,7 @@ public class SmelteryBlock extends InventoryBlock } @Override - public TileEntity createTileEntity (World world, int metadata) + public TileEntity func_149915_a (World world, int metadata) { switch (metadata) { @@ -304,4 +304,5 @@ public class SmelteryBlock extends InventoryBlock } super.func_149749_a(world, x, y, z, block, meta); } + } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index 7584ab0b..245f777d 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -12,6 +12,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.util.ForgeDirection; @@ -89,7 +90,7 @@ public class SlimeGrass extends MantleBlock } @Override - public boolean canSustainPlant (World world, int x, int y, int z, ForgeDirection direction, IPlantable plant) + public boolean canSustainPlant (IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plant) { EnumPlantType plantType = plant.getPlantType(world, x, y + 1, z); return plantType == EnumPlantType.Plains && plant.getPlant(world, x, y + 1, z) != Blocks.tallgrass; diff --git a/src/main/java/tconstruct/client/TClientTickHandler.java b/src/main/java/tconstruct/client/TClientTickHandler.java index 14779008..28f154fd 100644 --- a/src/main/java/tconstruct/client/TClientTickHandler.java +++ b/src/main/java/tconstruct/client/TClientTickHandler.java @@ -27,7 +27,7 @@ public class TClientTickHandler @SubscribeEvent public void onTick (ClientTickEvent event) { - + if (event.phase.equals(Phase.END) && event.type.equals(Type.RENDER)) { TRepo.oreBerry.func_150122_b(Blocks.leaves.field_150121_P); @@ -38,10 +38,10 @@ public class TClientTickHandler } } - /* @Override - public EnumSet ticks () - { - return EnumSet.of(TickType.RENDER); - } -*/ + /* @Override + public EnumSet ticks () + { + return EnumSet.of(TickType.RENDER); + } + */ } diff --git a/src/main/java/tconstruct/util/TCraftingHandler.java b/src/main/java/tconstruct/util/TCraftingHandler.java index 6cd72083..4fd060af 100644 --- a/src/main/java/tconstruct/util/TCraftingHandler.java +++ b/src/main/java/tconstruct/util/TCraftingHandler.java @@ -6,55 +6,49 @@ import tconstruct.common.TRepo; import tconstruct.library.tools.AbilityHelper; import tconstruct.util.player.TPlayerStats; import mantle.common.ComparisonHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.ICraftingHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; -public class TCraftingHandler implements ICraftingHandler +public class TCraftingHandler //implements ICraftingHandler { - @Override - public void onCrafting (EntityPlayer player, ItemStack itemstack, IInventory craftMatrix) + @SubscribeEvent + public void onCrafting (ItemCraftedEvent event)//EntityPlayer player, ItemStack itemstack, IInventory craftMatrix) { - Item item = itemstack.getItem(); - if (!player.worldObj.isRemote) + Item item = event.crafting.getItem(); + if (!event.player.worldObj.isRemote) { if (ComparisonHelper.areEquivalent(item,TRepo.toolStationWood)) { - TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName()); - NBTTagCompound tags = player.getEntityData().getCompoundTag("TConstruct"); + TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(event.player.getDisplayName()); + NBTTagCompound tags = event.player.getEntityData().getCompoundTag("TConstruct"); if (!tags.getBoolean("materialManual") || !stats.materialManual) { stats.materialManual = true; tags.setBoolean("materialManual", true); - AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TRepo.manualBook, 1, 1)); + AbilityHelper.spawnItemAtPlayer(event.player, new ItemStack(TRepo.manualBook, 1, 1)); } } if (ComparisonHelper.areEquivalent(item,TRepo.smeltery) || ComparisonHelper.areEquivalent(item,TRepo.lavaTank)) { - TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName()); - NBTTagCompound tags = player.getEntityData().getCompoundTag("TConstruct"); + TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(event.player.getDisplayName()); + NBTTagCompound tags = event.player.getEntityData().getCompoundTag("TConstruct"); if (!tags.getBoolean("smelteryManual") || !stats.smelteryManual) { stats.smelteryManual = true; tags.setBoolean("smelteryManual", true); - AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TRepo.manualBook, 1, 2)); + AbilityHelper.spawnItemAtPlayer(event.player, new ItemStack(TRepo.manualBook, 1, 2)); } - player.addStat(TAchievements.achievements.get("tconstruct.smelteryMaker"), 1); + event.player.addStat(TAchievements.achievements.get("tconstruct.smelteryMaker"), 1); } if (ComparisonHelper.areEquivalent(item,TRepo.craftingStationWood)){ - player.addStat(TAchievements.achievements.get("tconstruct.betterCrafting"), 1); + event.player.addStat(TAchievements.achievements.get("tconstruct.betterCrafting"), 1); } } } - @Override - public void onSmelting (EntityPlayer player, ItemStack item) - { - } - } diff --git a/src/main/java/tconstruct/util/player/TPlayerHandler.java b/src/main/java/tconstruct/util/player/TPlayerHandler.java index b2ac7d36..4294f746 100644 --- a/src/main/java/tconstruct/util/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/util/player/TPlayerHandler.java @@ -2,11 +2,14 @@ package tconstruct.util.player; import cpw.mods.fml.common.*; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.relauncher.Side; + import java.io.ByteArrayOutputStream; import java.lang.ref.WeakReference; import java.util.Random; import java.util.concurrent.ConcurrentHashMap; + import mantle.player.PlayerUtils; import net.minecraft.entity.*; import net.minecraft.entity.Entity.EnumEntitySize; @@ -22,13 +25,37 @@ import tconstruct.library.tools.AbilityHelper; import tconstruct.util.config.PHConstruct; import tconstruct.util.network.packet.PacketDoubleJump; -public class TPlayerHandler implements IPlayerTracker +public class TPlayerHandler { /* Player */ //public int hunger; + public ConcurrentHashMap playerStats = new ConcurrentHashMap(); - @Override + @SubscribeEvent + public void PlayerLoggedInEvent (PlayerEvent event) + { + onPlayerLogin(event.player); + } + + @SubscribeEvent + public void PlayerLoggedOutEvent (PlayerEvent event) + { + savePlayerStats(event.player, true); + } + + @SubscribeEvent + public void onPlayerChangedDimension (PlayerEvent event) + { + savePlayerStats(event.player, false); + } + @SubscribeEvent + public void onPlayerRespawn (PlayerEvent event) + { + onPlayerRespawn(event.player); + } + + public void onPlayerLogin (EntityPlayer entityplayer) { //TConstruct.logger.info("Player: "+entityplayer); @@ -108,9 +135,9 @@ public class TPlayerHandler implements IPlayerTracker PHConstruct.gregtech = false; if (PHConstruct.lavaFortuneInteraction) { - PlayerUtils.sendChatMessage(entityplayer,"Warning: Cross-mod Exploit Present!"); - PlayerUtils.sendChatMessage(entityplayer,"Solution 1: Disable Reverse Smelting recipes from GregTech."); - PlayerUtils.sendChatMessage(entityplayer,"Solution 2: Disable Auto-Smelt/Fortune interaction from TConstruct."); + PlayerUtils.sendChatMessage(entityplayer, "Warning: Cross-mod Exploit Present!"); + PlayerUtils.sendChatMessage(entityplayer, "Solution 1: Disable Reverse Smelting recipes from GregTech."); + PlayerUtils.sendChatMessage(entityplayer, "Solution 2: Disable Auto-Smelt/Fortune interaction from TConstruct."); } } @@ -131,22 +158,11 @@ public class TPlayerHandler implements IPlayerTracker PacketDispatcher.sendPacketToPlayer(packet, (Player) player); */ - //TODO find out what packet needs to be used here (and make sure that player actually is a playerMP and this gets called) - if(player instanceof EntityPlayerMP){ - TConstruct.packetPipeline.sendTo(new PacketDoubleJump(), (EntityPlayerMP)player); - } - } - - @Override - public void onPlayerLogout (EntityPlayer entityplayer) - { - savePlayerStats(entityplayer, true); - } - - @Override - public void onPlayerChangedDimension (EntityPlayer entityplayer) - { - savePlayerStats(entityplayer, false); + //TODO find out what packet needs to be used here (and make sure that player actually is a playerMP and this gets called) + if (player instanceof EntityPlayerMP) + { + TConstruct.packetPipeline.sendTo(new PacketDoubleJump(), (EntityPlayerMP) player); + } } void savePlayerStats (EntityPlayer player, boolean clean) @@ -169,7 +185,6 @@ public class TPlayerHandler implements IPlayerTracker } } - @Override public void onPlayerRespawn (EntityPlayer entityplayer) { //Boom!