From f28a06dbd563de00210dc9694ddd0b324e4b23d8 Mon Sep 17 00:00:00 2001 From: Towdium Date: Sat, 27 Feb 2016 01:06:26 +0800 Subject: [PATCH] Clean up files --- .../JustEnoughCalculation.java | 3 - .../event/PlayerEventHandler.java | 14 ----- .../gui/commom/GuiTooltipScreen.java | 1 - .../gui/commom/recipe/ContainerRecipe.java | 1 - .../gui/commom/recipe/GuiRecipe.java | 1 - .../gui/guis/calculator/GuiCalculator.java | 1 - .../guis/recipeEditor/GuiRecipeEditor.java | 2 - .../guis/recipePicker/GuiRecipePicker.java | 1 - .../item/ItemCalculator.java | 2 - .../network/PlayerHandlerServer.java | 3 - .../network/packets/PacketSlotUpdate.java | 60 ------------------- .../plugin/JEIPlugin.java | 1 - 12 files changed, 90 deletions(-) delete mode 100644 src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketSlotUpdate.java diff --git a/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java b/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java index 34a6dbe..e86159b 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java @@ -1,6 +1,5 @@ package pers.towdium.justEnoughCalculation; -import net.minecraft.block.BlockStone; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.init.Blocks; @@ -22,7 +21,6 @@ import pers.towdium.justEnoughCalculation.item.ItemCalculator; import pers.towdium.justEnoughCalculation.network.IProxy; import pers.towdium.justEnoughCalculation.network.packets.PacketCalculatorUpdate; import pers.towdium.justEnoughCalculation.network.packets.PacketRecipeUpdate; -import pers.towdium.justEnoughCalculation.network.packets.PacketSlotUpdate; import pers.towdium.justEnoughCalculation.network.packets.PacketSyncRecord; /** @@ -52,7 +50,6 @@ public class JustEnoughCalculation { public static void preInit(FMLPreInitializationEvent event){ GameRegistry.registerItem(itemCalculator,itemCalculator.getUnlocalizedName().substring(5)); networkWrapper = NetworkRegistry.INSTANCE.newSimpleChannel(Reference.MODID); - networkWrapper.registerMessage(PacketSlotUpdate.class, PacketSlotUpdate.class, 0, Side.SERVER); networkWrapper.registerMessage(PacketCalculatorUpdate.class, PacketCalculatorUpdate.class, 1, Side.SERVER); networkWrapper.registerMessage(PacketRecipeUpdate.class, PacketRecipeUpdate.class, 2, Side.SERVER); networkWrapper.registerMessage(PacketSyncRecord.class, PacketSyncRecord.class, 3, Side.CLIENT); diff --git a/src/main/java/pers/towdium/justEnoughCalculation/event/PlayerEventHandler.java b/src/main/java/pers/towdium/justEnoughCalculation/event/PlayerEventHandler.java index 76e3bb9..fdb8476 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/event/PlayerEventHandler.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/event/PlayerEventHandler.java @@ -1,12 +1,7 @@ package pers.towdium.justEnoughCalculation.event; -import net.minecraft.client.entity.AbstractClientPlayer; -import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.util.ChatComponentText; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import pers.towdium.justEnoughCalculation.JustEnoughCalculation; -import pers.towdium.justEnoughCalculation.gui.commom.recipe.ContainerRecipe; /** * @author Towdium @@ -21,13 +16,4 @@ public class PlayerEventHandler { public void onSave(net.minecraftforge.event.entity.player.PlayerEvent.SaveToFile event){ JustEnoughCalculation.proxy.getPlayerHandler().handleSave(event); } - - @SubscribeEvent - public void onTooptipRender(ItemTooltipEvent event){ - if(((EntityPlayerSP) event.entityPlayer).openContainer instanceof ContainerRecipe){ - if(event.itemStack.hasTagCompound()){ - event.toolTip.add(event.itemStack.getTagCompound().getInteger("percentage") + "%"); - } - } - } } diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java index e4bcb91..9913d38 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java @@ -10,7 +10,6 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; /** * CODE IS DONE BY Zyin055 diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java index 812fc53..a0bd2e5 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java @@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; import pers.towdium.justEnoughCalculation.core.Recipe; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java index f86449d..31d852c 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java @@ -4,7 +4,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.resources.model.ModelManager; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java index 1a000a9..6d96a01 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java @@ -2,7 +2,6 @@ package pers.towdium.justEnoughCalculation.gui.guis.calculator; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeEditor/GuiRecipeEditor.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeEditor/GuiRecipeEditor.java index 6765ad6..a980e01 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeEditor/GuiRecipeEditor.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeEditor/GuiRecipeEditor.java @@ -2,7 +2,6 @@ package pers.towdium.justEnoughCalculation.gui.guis.recipeEditor; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.inventory.Slot; import net.minecraft.util.StatCollector; import pers.towdium.justEnoughCalculation.JustEnoughCalculation; @@ -12,7 +11,6 @@ import pers.towdium.justEnoughCalculation.gui.commom.recipe.GuiRecipe; import pers.towdium.justEnoughCalculation.network.packets.PacketRecipeUpdate; import java.io.IOException; -import java.util.ArrayList; /** * @author Towdium diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipePicker/GuiRecipePicker.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipePicker/GuiRecipePicker.java index 355035c..f1c6259 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipePicker/GuiRecipePicker.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipePicker/GuiRecipePicker.java @@ -3,7 +3,6 @@ package pers.towdium.justEnoughCalculation.gui.guis.recipePicker; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import pers.towdium.justEnoughCalculation.JustEnoughCalculation; import pers.towdium.justEnoughCalculation.gui.commom.recipe.ContainerRecipe; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java b/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java index 3f31949..5f47d1e 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java @@ -1,6 +1,5 @@ package pers.towdium.justEnoughCalculation.item; -import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -8,7 +7,6 @@ import net.minecraft.world.World; import pers.towdium.justEnoughCalculation.JustEnoughCalculation; import pers.towdium.justEnoughCalculation.gui.GuiHandler; -import java.util.List; /** * @author Towdium diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerServer.java b/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerServer.java index fccb110..c4a980d 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerServer.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerServer.java @@ -1,12 +1,9 @@ package pers.towdium.justEnoughCalculation.network; import com.google.common.collect.ImmutableList; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.player.PlayerEvent; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; import pers.towdium.justEnoughCalculation.core.Recipe; -import pers.towdium.justEnoughCalculation.network.packets.PacketSyncRecord; import java.util.HashMap; import java.util.UUID; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketSlotUpdate.java b/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketSlotUpdate.java deleted file mode 100644 index 10d0abf..0000000 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketSlotUpdate.java +++ /dev/null @@ -1,60 +0,0 @@ -package pers.towdium.justEnoughCalculation.network.packets; - -import io.netty.buffer.ByteBuf; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.network.ByteBufUtils; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; - -/** - * @author Towdium - */ -public class PacketSlotUpdate implements IMessage, IMessageHandler { - int slot; - int playerId; - ItemStack itemStack=null; - - public PacketSlotUpdate(){} - - - public PacketSlotUpdate(EntityPlayer player, int index){ - playerId = player.getEntityId(); - slot = index; - this.itemStack = player.inventory.getStackInSlot(index); - } - - - - @Override - public void toBytes(ByteBuf buffer) { - buffer.writeByte(slot); - buffer.writeInt(playerId); - ByteBufUtils.writeItemStack(buffer, itemStack); - } - - @Override - public void fromBytes(ByteBuf buffer) { - slot = buffer.readByte(); - playerId = buffer.readInt(); - itemStack = ByteBufUtils.readItemStack(buffer); - } - - - - - @Override - public IMessage onMessage(PacketSlotUpdate message, MessageContext context) { - context.getServerHandler().playerEntity.inventory.setInventorySlotContents(0, message.itemStack); -// Entity player = FMLServerHandler.instance().getServer().getEntityWorld().getEntityByID(playerId); -// System.out.println("get entity"); -// -// if(player instanceof EntityPlayerMP){ -// System.out.println("get entityMP!"); -// ((EntityPlayerMP) player).getInventory()[0] = new ItemStack(new ItemCalculator(),10); -// } - return null; - } - -} diff --git a/src/main/java/pers/towdium/justEnoughCalculation/plugin/JEIPlugin.java b/src/main/java/pers/towdium/justEnoughCalculation/plugin/JEIPlugin.java index f77d63a..f75c303 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/plugin/JEIPlugin.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/plugin/JEIPlugin.java @@ -2,7 +2,6 @@ package pers.towdium.justEnoughCalculation.plugin; import mezz.jei.api.*; import mezz.jei.api.recipe.VanillaRecipeCategoryUid; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; import javax.annotation.Nonnull;