From e891649d92e13b5d68e4926bbe906499589c79b1 Mon Sep 17 00:00:00 2001 From: Towdium Date: Tue, 23 Feb 2016 21:43:27 +0800 Subject: [PATCH] Almost done with record saving! Moved nearly all the files --- .../JustEnoughCalculation.java} | 44 +++++------- .../core/Calculator.java | 7 +- .../core/ItemRecord.java | 2 +- .../core/ItemStackWrapper.java | 3 +- .../core/Recipe.java | 2 +- .../event/GuiEventHandler.java | 12 ++-- .../event/PlayerEventHandler.java | 11 ++- .../gui/GuiHandler.java | 17 ++--- .../gui/GuiTooltipScreen.java | 4 +- .../gui/calculator/ContainerCalculator.java | 2 +- .../gui/calculator/GuiCalculator.java | 28 ++++---- .../gui/calculator/InventoryCalculator.java | 5 +- .../gui/itemPicker/ContainerItemPicker.java | 6 +- .../gui/itemPicker/GuiItemPicker.java | 10 +-- .../gui/itemPicker/InventoryItemPicker.java | 4 +- .../recipeEditor/ContainerRecipeEditor.java | 4 +- .../gui/recipeEditor/GuiRecipeEditor.java | 16 ++--- .../recipeEditor/InventoryRecipeEditor.java | 4 +- .../item/ItemCalculator.java | 8 +-- .../network/IPlayerHandler.java | 5 +- .../justEnoughCalculation/network/IProxy.java | 14 ++++ .../network/PlayerHandlerClient.java | 21 +++--- .../network/PlayerHandlerServer.java | 24 +++---- .../network/ProxyClient.java | 15 ++-- .../network/ProxyServer.java | 4 +- .../packets/PacketCalculatorUpdate.java} | 12 ++-- .../network/packets/PacketRecipeUpdate.java} | 23 +++--- .../network/packets/PacketSlotUpdate.java} | 10 +-- .../network/packets/PacketSyncRecord.java | 68 ++++++++++++++++++ .../plugin/JEIPlugin.java | 9 +-- .../plugin/NormalRecipeTransferHandler.java | 6 +- .../towdium/tudicraft/network/IProxy.java | 17 ----- .../lang/en_US.lang | 0 .../models/item/itemCalculator.json | 2 +- .../textures/gui/containerCalculator.png | Bin .../textures/gui/guiCalculator.png | Bin .../textures/gui/guiItemPicker.png | Bin .../textures/gui/guiRecipeEditor.png | Bin .../textures/gui/slotActive.png | Bin .../textures/gui/slotInput.png | Bin .../textures/gui/slotOutput.png | Bin .../textures/gui/slots.png | Bin .../textures/items/itemCalculator.png | Bin 43 files changed, 228 insertions(+), 191 deletions(-) rename src/main/java/pers/towdium/{tudicraft/Tudicraft.java => justEnoughCalculation/JustEnoughCalculation.java} (52%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/core/Calculator.java (97%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/core/ItemRecord.java (97%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/core/ItemStackWrapper.java (97%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/core/Recipe.java (99%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/event/GuiEventHandler.java (91%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/event/PlayerEventHandler.java (54%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/gui/GuiHandler.java (65%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/gui/GuiTooltipScreen.java (99%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/gui/calculator/ContainerCalculator.java (95%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/gui/calculator/GuiCalculator.java (87%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/gui/calculator/InventoryCalculator.java (60%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/gui/itemPicker/ContainerItemPicker.java (83%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/gui/itemPicker/GuiItemPicker.java (88%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/gui/itemPicker/InventoryItemPicker.java (63%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/gui/recipeEditor/ContainerRecipeEditor.java (96%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/gui/recipeEditor/GuiRecipeEditor.java (88%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/gui/recipeEditor/InventoryRecipeEditor.java (63%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/item/ItemCalculator.java (71%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/network/IPlayerHandler.java (89%) create mode 100644 src/main/java/pers/towdium/justEnoughCalculation/network/IProxy.java rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/network/PlayerHandlerClient.java (87%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/network/PlayerHandlerServer.java (69%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/network/ProxyClient.java (50%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/network/ProxyServer.java (77%) rename src/main/java/pers/towdium/{tudicraft/network/packages/PackageCalculatorUpdate.java => justEnoughCalculation/network/packets/PacketCalculatorUpdate.java} (70%) rename src/main/java/pers/towdium/{tudicraft/network/packages/PackageRecipeUpdate.java => justEnoughCalculation/network/packets/PacketRecipeUpdate.java} (61%) rename src/main/java/pers/towdium/{tudicraft/network/packages/PackageSlotUpdate.java => justEnoughCalculation/network/packets/PacketSlotUpdate.java} (82%) create mode 100644 src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketSyncRecord.java rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/plugin/JEIPlugin.java (78%) rename src/main/java/pers/towdium/{tudicraft => justEnoughCalculation}/plugin/NormalRecipeTransferHandler.java (93%) delete mode 100644 src/main/java/pers/towdium/tudicraft/network/IProxy.java rename src/main/resources/assets/{tudicraft => je_calculation}/lang/en_US.lang (100%) rename src/main/resources/assets/{tudicraft => je_calculation}/models/item/itemCalculator.json (87%) rename src/main/resources/assets/{tudicraft => je_calculation}/textures/gui/containerCalculator.png (100%) rename src/main/resources/assets/{tudicraft => je_calculation}/textures/gui/guiCalculator.png (100%) rename src/main/resources/assets/{tudicraft => je_calculation}/textures/gui/guiItemPicker.png (100%) rename src/main/resources/assets/{tudicraft => je_calculation}/textures/gui/guiRecipeEditor.png (100%) rename src/main/resources/assets/{tudicraft => je_calculation}/textures/gui/slotActive.png (100%) rename src/main/resources/assets/{tudicraft => je_calculation}/textures/gui/slotInput.png (100%) rename src/main/resources/assets/{tudicraft => je_calculation}/textures/gui/slotOutput.png (100%) rename src/main/resources/assets/{tudicraft => je_calculation}/textures/gui/slots.png (100%) rename src/main/resources/assets/{tudicraft => je_calculation}/textures/items/itemCalculator.png (100%) diff --git a/src/main/java/pers/towdium/tudicraft/Tudicraft.java b/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java similarity index 52% rename from src/main/java/pers/towdium/tudicraft/Tudicraft.java rename to src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java index 2be42d9..df174ad 100644 --- a/src/main/java/pers/towdium/tudicraft/Tudicraft.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java @@ -1,9 +1,8 @@ -package pers.towdium.tudicraft; +package pers.towdium.justEnoughCalculation; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; @@ -14,34 +13,32 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import pers.towdium.tudicraft.event.GuiEventHandler; -import pers.towdium.tudicraft.event.PlayerEventHandler; -import pers.towdium.tudicraft.gui.GuiHandler; -import pers.towdium.tudicraft.item.ItemCalculator; -import pers.towdium.tudicraft.network.IProxy; -import pers.towdium.tudicraft.network.packages.PackageCalculatorUpdate; -import pers.towdium.tudicraft.network.packages.PackageRecipeUpdate; -import pers.towdium.tudicraft.network.packages.PackageSlotUpdate; +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; /** * @author Towdium */ -@Mod(modid = Tudicraft.Reference.MODID, name = Tudicraft.Reference.MODNAME, version = Tudicraft.Reference.VERSION) -public class Tudicraft { +@Mod(modid = JustEnoughCalculation.Reference.MODID, name = JustEnoughCalculation.Reference.MODNAME, version = JustEnoughCalculation.Reference.VERSION) +public class JustEnoughCalculation { public static Item itemCalculator = new ItemCalculator().setUnlocalizedName("itemCalculator"); public static SimpleNetworkWrapper networkWrapper; public static Logger log = LogManager.getLogger(Reference.MODID); - @SidedProxy(clientSide = "pers.towdium.tudicraft.network.ProxyClient", serverSide = "pers.towdium.tudicraft.network.ProxyServer") + @SidedProxy(clientSide = "pers.towdium.justEnoughCalculation.network.ProxyClient", serverSide = "pers.towdium.justEnoughCalculation.network.ProxyServer") public static IProxy proxy; - @Mod.Instance(Tudicraft.Reference.MODID) - public static Tudicraft instance; + @Mod.Instance(JustEnoughCalculation.Reference.MODID) + public static JustEnoughCalculation instance; public static class Reference { - public static final String MODID = "tudicraft"; - public static final String MODNAME = "Tudicraft"; + public static final String MODID = "je_calculation"; + public static final String MODNAME = "JustEnoughCalculation"; public static final String VERSION = "0.0.1"; } @@ -49,9 +46,11 @@ public class Tudicraft { public static void preInit(FMLPreInitializationEvent event){ GameRegistry.registerItem(itemCalculator,itemCalculator.getUnlocalizedName().substring(5)); networkWrapper = NetworkRegistry.INSTANCE.newSimpleChannel(Reference.MODID); - networkWrapper.registerMessage(PackageSlotUpdate.class, PackageSlotUpdate.class, 0, Side.SERVER); - networkWrapper.registerMessage(PackageCalculatorUpdate.class, PackageCalculatorUpdate.class, 1, Side.SERVER); - networkWrapper.registerMessage(PackageRecipeUpdate.class, PackageRecipeUpdate.class, 2, Side.SERVER); + 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); + networkWrapper.registerMessage(PacketSyncRecord.class, PacketSyncRecord.class, 4, Side.SERVER); } @Mod.EventHandler @@ -61,10 +60,5 @@ public class Tudicraft { register(itemCalculator, 0, new ModelResourceLocation(Reference.MODID + ":" + itemCalculator.getUnlocalizedName().substring(5), "inventory")); } proxy.init(); - - } - - - } diff --git a/src/main/java/pers/towdium/tudicraft/core/Calculator.java b/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java similarity index 97% rename from src/main/java/pers/towdium/tudicraft/core/Calculator.java rename to src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java index 9999008..69e4038 100644 --- a/src/main/java/pers/towdium/tudicraft/core/Calculator.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java @@ -1,9 +1,8 @@ -package pers.towdium.tudicraft.core; +package pers.towdium.justEnoughCalculation.core; import com.google.common.collect.ImmutableList; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import pers.towdium.tudicraft.Tudicraft; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; import java.util.ArrayList; import java.util.LinkedList; @@ -28,7 +27,7 @@ public class Calculator { this.catalystBuffer = catalystBuffer; this.itemRecord = itemRecord; this.operateRecords = operateRecords; - for (Recipe recipe : Tudicraft.proxy.getPlayerHandler().getAllRecipeOf(new ItemStack(itemRecord.item, itemRecord.meta), null)){ + for (Recipe recipe : JustEnoughCalculation.proxy.getPlayerHandler().getAllRecipeOf(new ItemStack(itemRecord.item, itemRecord.meta), null)){ if(checkRecipeValid(recipe)){ long count = getOperateCount(recipe, exceedMode); this.currentOperate = new OperateRecord(recipe, count); diff --git a/src/main/java/pers/towdium/tudicraft/core/ItemRecord.java b/src/main/java/pers/towdium/justEnoughCalculation/core/ItemRecord.java similarity index 97% rename from src/main/java/pers/towdium/tudicraft/core/ItemRecord.java rename to src/main/java/pers/towdium/justEnoughCalculation/core/ItemRecord.java index 81edebd..d2a5f39 100644 --- a/src/main/java/pers/towdium/tudicraft/core/ItemRecord.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/ItemRecord.java @@ -1,4 +1,4 @@ -package pers.towdium.tudicraft.core; +package pers.towdium.justEnoughCalculation.core; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/pers/towdium/tudicraft/core/ItemStackWrapper.java b/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java similarity index 97% rename from src/main/java/pers/towdium/tudicraft/core/ItemStackWrapper.java rename to src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java index 076a3b1..b8cfeaa 100644 --- a/src/main/java/pers/towdium/tudicraft/core/ItemStackWrapper.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java @@ -1,8 +1,7 @@ -package pers.towdium.tudicraft.core; +package pers.towdium.justEnoughCalculation.core; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.Constants; /** * @author Towdium diff --git a/src/main/java/pers/towdium/tudicraft/core/Recipe.java b/src/main/java/pers/towdium/justEnoughCalculation/core/Recipe.java similarity index 99% rename from src/main/java/pers/towdium/tudicraft/core/Recipe.java rename to src/main/java/pers/towdium/justEnoughCalculation/core/Recipe.java index 0a2a634..ccd3b6f 100644 --- a/src/main/java/pers/towdium/tudicraft/core/Recipe.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/Recipe.java @@ -1,4 +1,4 @@ -package pers.towdium.tudicraft.core; +package pers.towdium.justEnoughCalculation.core; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; diff --git a/src/main/java/pers/towdium/tudicraft/event/GuiEventHandler.java b/src/main/java/pers/towdium/justEnoughCalculation/event/GuiEventHandler.java similarity index 91% rename from src/main/java/pers/towdium/tudicraft/event/GuiEventHandler.java rename to src/main/java/pers/towdium/justEnoughCalculation/event/GuiEventHandler.java index 074711d..5cbe78d 100644 --- a/src/main/java/pers/towdium/tudicraft/event/GuiEventHandler.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/event/GuiEventHandler.java @@ -1,4 +1,4 @@ -package pers.towdium.tudicraft.event; +package pers.towdium.justEnoughCalculation.event; import mezz.jei.gui.ItemListOverlay; @@ -8,11 +8,11 @@ import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.input.Mouse; -import pers.towdium.tudicraft.gui.calculator.ContainerCalculator; -import pers.towdium.tudicraft.gui.calculator.GuiCalculator; -import pers.towdium.tudicraft.gui.recipeEditor.ContainerRecipeEditor; -import pers.towdium.tudicraft.gui.recipeEditor.GuiRecipeEditor; -import pers.towdium.tudicraft.plugin.JEIPlugin; +import pers.towdium.justEnoughCalculation.gui.calculator.ContainerCalculator; +import pers.towdium.justEnoughCalculation.gui.calculator.GuiCalculator; +import pers.towdium.justEnoughCalculation.gui.recipeEditor.ContainerRecipeEditor; +import pers.towdium.justEnoughCalculation.gui.recipeEditor.GuiRecipeEditor; +import pers.towdium.justEnoughCalculation.plugin.JEIPlugin; import java.util.Date; diff --git a/src/main/java/pers/towdium/tudicraft/event/PlayerEventHandler.java b/src/main/java/pers/towdium/justEnoughCalculation/event/PlayerEventHandler.java similarity index 54% rename from src/main/java/pers/towdium/tudicraft/event/PlayerEventHandler.java rename to src/main/java/pers/towdium/justEnoughCalculation/event/PlayerEventHandler.java index 079b1fd..1094964 100644 --- a/src/main/java/pers/towdium/tudicraft/event/PlayerEventHandler.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/event/PlayerEventHandler.java @@ -1,9 +1,8 @@ -package pers.towdium.tudicraft.event; +package pers.towdium.justEnoughCalculation.event; +import net.minecraft.util.ChatComponentText; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import pers.towdium.tudicraft.Tudicraft; - -import java.util.UUID; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; /** * @author Towdium @@ -11,11 +10,11 @@ import java.util.UUID; public class PlayerEventHandler { @SubscribeEvent public void onLogin(net.minecraftforge.event.entity.player.PlayerEvent.LoadFromFile event){ - Tudicraft.proxy.getPlayerHandler().handleLogin(event); + JustEnoughCalculation.proxy.getPlayerHandler().handleLogin(event); } @SubscribeEvent public void onSave(net.minecraftforge.event.entity.player.PlayerEvent.SaveToFile event){ - Tudicraft.proxy.getPlayerHandler().handleSave(event); + JustEnoughCalculation.proxy.getPlayerHandler().handleSave(event); } } diff --git a/src/main/java/pers/towdium/tudicraft/gui/GuiHandler.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/GuiHandler.java similarity index 65% rename from src/main/java/pers/towdium/tudicraft/gui/GuiHandler.java rename to src/main/java/pers/towdium/justEnoughCalculation/gui/GuiHandler.java index bcf5b2d..718678d 100644 --- a/src/main/java/pers/towdium/tudicraft/gui/GuiHandler.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/GuiHandler.java @@ -1,17 +1,14 @@ -package pers.towdium.tudicraft.gui; +package pers.towdium.justEnoughCalculation.gui; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; -import pers.towdium.tudicraft.Tudicraft; -import pers.towdium.tudicraft.gui.calculator.ContainerCalculator; -import pers.towdium.tudicraft.gui.calculator.GuiCalculator; -import pers.towdium.tudicraft.gui.itemPicker.ContainerItemPicker; -import pers.towdium.tudicraft.gui.itemPicker.GuiItemPicker; -import pers.towdium.tudicraft.gui.recipeEditor.ContainerRecipeEditor; -import pers.towdium.tudicraft.gui.recipeEditor.GuiRecipeEditor; +import pers.towdium.justEnoughCalculation.gui.calculator.ContainerCalculator; +import pers.towdium.justEnoughCalculation.gui.calculator.GuiCalculator; +import pers.towdium.justEnoughCalculation.gui.itemPicker.ContainerItemPicker; +import pers.towdium.justEnoughCalculation.gui.itemPicker.GuiItemPicker; +import pers.towdium.justEnoughCalculation.gui.recipeEditor.ContainerRecipeEditor; +import pers.towdium.justEnoughCalculation.gui.recipeEditor.GuiRecipeEditor; /** * @author Towdium diff --git a/src/main/java/pers/towdium/tudicraft/gui/GuiTooltipScreen.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/GuiTooltipScreen.java similarity index 99% rename from src/main/java/pers/towdium/tudicraft/gui/GuiTooltipScreen.java rename to src/main/java/pers/towdium/justEnoughCalculation/gui/GuiTooltipScreen.java index 4c03615..89ac4a4 100644 --- a/src/main/java/pers/towdium/tudicraft/gui/GuiTooltipScreen.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/GuiTooltipScreen.java @@ -1,10 +1,8 @@ -package pers.towdium.tudicraft.gui; +package pers.towdium.justEnoughCalculation.gui; -import java.lang.reflect.Field; import java.util.ArrayList; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.inventory.Container; diff --git a/src/main/java/pers/towdium/tudicraft/gui/calculator/ContainerCalculator.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/calculator/ContainerCalculator.java similarity index 95% rename from src/main/java/pers/towdium/tudicraft/gui/calculator/ContainerCalculator.java rename to src/main/java/pers/towdium/justEnoughCalculation/gui/calculator/ContainerCalculator.java index fa1f0b2..cd96305 100644 --- a/src/main/java/pers/towdium/tudicraft/gui/calculator/ContainerCalculator.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/calculator/ContainerCalculator.java @@ -1,4 +1,4 @@ -package pers.towdium.tudicraft.gui.calculator; +package pers.towdium.justEnoughCalculation.gui.calculator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/pers/towdium/tudicraft/gui/calculator/GuiCalculator.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/calculator/GuiCalculator.java similarity index 87% rename from src/main/java/pers/towdium/tudicraft/gui/calculator/GuiCalculator.java rename to src/main/java/pers/towdium/justEnoughCalculation/gui/calculator/GuiCalculator.java index 2f641dc..f357377 100644 --- a/src/main/java/pers/towdium/tudicraft/gui/calculator/GuiCalculator.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/calculator/GuiCalculator.java @@ -1,4 +1,4 @@ -package pers.towdium.tudicraft.gui.calculator; +package pers.towdium.justEnoughCalculation.gui.calculator; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -11,12 +11,15 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import pers.towdium.tudicraft.Tudicraft; -import pers.towdium.tudicraft.core.Calculator; -import pers.towdium.tudicraft.core.ItemStackWrapper; -import pers.towdium.tudicraft.gui.GuiTooltipScreen; -import pers.towdium.tudicraft.gui.recipeEditor.ContainerRecipeEditor; -import pers.towdium.tudicraft.gui.recipeEditor.GuiRecipeEditor; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; +import pers.towdium.justEnoughCalculation.core.Calculator; +import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; +import pers.towdium.justEnoughCalculation.gui.GuiTooltipScreen; +import pers.towdium.justEnoughCalculation.gui.recipeEditor.ContainerRecipeEditor; +import pers.towdium.justEnoughCalculation.gui.recipeEditor.GuiRecipeEditor; +import pers.towdium.justEnoughCalculation.network.PlayerHandlerClient; +import pers.towdium.justEnoughCalculation.network.PlayerHandlerServer; +import pers.towdium.justEnoughCalculation.network.packets.PacketSyncRecord; import java.io.IOException; import java.lang.reflect.Field; @@ -40,6 +43,7 @@ public class GuiCalculator extends GuiTooltipScreen{ public GuiCalculator(ContainerCalculator containerCalculator){ super(containerCalculator); + JustEnoughCalculation.networkWrapper.sendToServer(new PacketSyncRecord()); } @Override @@ -64,7 +68,7 @@ public class GuiCalculator extends GuiTooltipScreen{ @Override protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(new ResourceLocation(Tudicraft.Reference.MODID,"textures/gui/guiCalculator.png")); + this.mc.getTextureManager().bindTexture(new ResourceLocation(JustEnoughCalculation.Reference.MODID,"textures/gui/guiCalculator.png")); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); if(activeSlot == 0){ Slot slot = inventorySlots.getSlot(activeSlot); @@ -118,7 +122,7 @@ public class GuiCalculator extends GuiTooltipScreen{ } break; case 2: - Tudicraft.proxy.getPlayerHandler().syncItemCalculator(inventorySlots.getSlot(0).getStack(), textFieldAmount.getText()); + JustEnoughCalculation.proxy.getPlayerHandler().syncItemCalculator(inventorySlots.getSlot(0).getStack(), textFieldAmount.getText()); mc.displayGuiScreen(new GuiRecipeEditor(new ContainerRecipeEditor(((ContainerCalculator)inventorySlots).getPlayer()), this)); break; case 6: @@ -153,7 +157,7 @@ public class GuiCalculator extends GuiTooltipScreen{ if (!this.textFieldAmount.textboxKeyTyped(typedChar, keyCode)){ if(keyCode == 1){ - Tudicraft.proxy.getPlayerHandler().syncItemCalculator(inventorySlots.getSlot(0).getStack(), textFieldAmount.getText()); + JustEnoughCalculation.proxy.getPlayerHandler().syncItemCalculator(inventorySlots.getSlot(0).getStack(), textFieldAmount.getText()); ((ContainerCalculator)inventorySlots).getPlayer().closeScreen(); } } @@ -210,7 +214,7 @@ public class GuiCalculator extends GuiTooltipScreen{ modeButton.displayString = StatCollector.translateToLocal("gui.calculator.catalyst"); break; } - editButton.enabled = Tudicraft.proxy.getPlayerHandler().getHasRecipeOf(inventorySlots.getSlot(0).getStack(), null); + editButton.enabled = JustEnoughCalculation.proxy.getPlayerHandler().getHasRecipeOf(inventorySlots.getSlot(0).getStack(), null); if(costRecord != null){ switch (mode){ case OUTPUT: @@ -230,7 +234,7 @@ public class GuiCalculator extends GuiTooltipScreen{ public void setActiveSlot(int activeSlot) { this.activeSlot = activeSlot; if(activeSlot == -1){ - Tudicraft.proxy.getPlayerHandler().syncItemCalculator(inventorySlots.getSlot(0).getStack(), textFieldAmount.getText()); + JustEnoughCalculation.proxy.getPlayerHandler().syncItemCalculator(inventorySlots.getSlot(0).getStack(), textFieldAmount.getText()); } } diff --git a/src/main/java/pers/towdium/tudicraft/gui/calculator/InventoryCalculator.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/calculator/InventoryCalculator.java similarity index 60% rename from src/main/java/pers/towdium/tudicraft/gui/calculator/InventoryCalculator.java rename to src/main/java/pers/towdium/justEnoughCalculation/gui/calculator/InventoryCalculator.java index 9f46565..4f56a16 100644 --- a/src/main/java/pers/towdium/tudicraft/gui/calculator/InventoryCalculator.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/calculator/InventoryCalculator.java @@ -1,10 +1,7 @@ -package pers.towdium.tudicraft.gui.calculator; +package pers.towdium.justEnoughCalculation.gui.calculator; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryBasic; import net.minecraft.item.ItemStack; -import net.minecraft.util.IChatComponent; /** * @author Towdium diff --git a/src/main/java/pers/towdium/tudicraft/gui/itemPicker/ContainerItemPicker.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/itemPicker/ContainerItemPicker.java similarity index 83% rename from src/main/java/pers/towdium/tudicraft/gui/itemPicker/ContainerItemPicker.java rename to src/main/java/pers/towdium/justEnoughCalculation/gui/itemPicker/ContainerItemPicker.java index f6e73c6..a9a960b 100644 --- a/src/main/java/pers/towdium/tudicraft/gui/itemPicker/ContainerItemPicker.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/itemPicker/ContainerItemPicker.java @@ -1,10 +1,10 @@ -package pers.towdium.tudicraft.gui.itemPicker; +package pers.towdium.justEnoughCalculation.gui.itemPicker; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import pers.towdium.tudicraft.Tudicraft; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; /** @@ -33,7 +33,7 @@ public class ContainerItemPicker extends Container { @Override public ItemStack slotClick(int slotId, int clickedButton, int mode, EntityPlayer playerIn) { - Tudicraft.log.info("Activated"); + JustEnoughCalculation.log.info("Activated"); return null; } } diff --git a/src/main/java/pers/towdium/tudicraft/gui/itemPicker/GuiItemPicker.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/itemPicker/GuiItemPicker.java similarity index 88% rename from src/main/java/pers/towdium/tudicraft/gui/itemPicker/GuiItemPicker.java rename to src/main/java/pers/towdium/justEnoughCalculation/gui/itemPicker/GuiItemPicker.java index 62a2004..9fdb7fd 100644 --- a/src/main/java/pers/towdium/tudicraft/gui/itemPicker/GuiItemPicker.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/itemPicker/GuiItemPicker.java @@ -1,4 +1,4 @@ -package pers.towdium.tudicraft.gui.itemPicker; +package pers.towdium.justEnoughCalculation.gui.itemPicker; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; @@ -6,8 +6,8 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import pers.towdium.tudicraft.Tudicraft; -import pers.towdium.tudicraft.plugin.JEIPlugin; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; +import pers.towdium.justEnoughCalculation.plugin.JEIPlugin; import java.io.IOException; @@ -33,7 +33,7 @@ public class GuiItemPicker extends GuiContainer{ @Override public boolean textboxKeyTyped(char p_146201_1_, int p_146201_2_) { boolean b = super.textboxKeyTyped(p_146201_1_, p_146201_2_); - Tudicraft.log.info("执行了!"+JEIPlugin.runtime.getItemListOverlay().getFilterText()); + JustEnoughCalculation.log.info("执行了!"+JEIPlugin.runtime.getItemListOverlay().getFilterText()); JEIPlugin.runtime.getItemListOverlay().setFilterText("apple"); return b; } @@ -43,7 +43,7 @@ public class GuiItemPicker extends GuiContainer{ @Override protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(new ResourceLocation(Tudicraft.Reference.MODID,"textures/gui/guiItemPicker.png")); + this.mc.getTextureManager().bindTexture(new ResourceLocation(JustEnoughCalculation.Reference.MODID,"textures/gui/guiItemPicker.png")); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); } diff --git a/src/main/java/pers/towdium/tudicraft/gui/itemPicker/InventoryItemPicker.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/itemPicker/InventoryItemPicker.java similarity index 63% rename from src/main/java/pers/towdium/tudicraft/gui/itemPicker/InventoryItemPicker.java rename to src/main/java/pers/towdium/justEnoughCalculation/gui/itemPicker/InventoryItemPicker.java index 971d8c1..7c98fa3 100644 --- a/src/main/java/pers/towdium/tudicraft/gui/itemPicker/InventoryItemPicker.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/itemPicker/InventoryItemPicker.java @@ -1,8 +1,6 @@ -package pers.towdium.tudicraft.gui.itemPicker; +package pers.towdium.justEnoughCalculation.gui.itemPicker; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryBasic; -import net.minecraft.item.ItemStack; /** * @author Towdium diff --git a/src/main/java/pers/towdium/tudicraft/gui/recipeEditor/ContainerRecipeEditor.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/recipeEditor/ContainerRecipeEditor.java similarity index 96% rename from src/main/java/pers/towdium/tudicraft/gui/recipeEditor/ContainerRecipeEditor.java rename to src/main/java/pers/towdium/justEnoughCalculation/gui/recipeEditor/ContainerRecipeEditor.java index b99dd6a..7111b3f 100644 --- a/src/main/java/pers/towdium/tudicraft/gui/recipeEditor/ContainerRecipeEditor.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/recipeEditor/ContainerRecipeEditor.java @@ -1,10 +1,10 @@ -package pers.towdium.tudicraft.gui.recipeEditor; +package pers.towdium.justEnoughCalculation.gui.recipeEditor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import pers.towdium.tudicraft.core.Recipe; +import pers.towdium.justEnoughCalculation.core.Recipe; /** diff --git a/src/main/java/pers/towdium/tudicraft/gui/recipeEditor/GuiRecipeEditor.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/recipeEditor/GuiRecipeEditor.java similarity index 88% rename from src/main/java/pers/towdium/tudicraft/gui/recipeEditor/GuiRecipeEditor.java rename to src/main/java/pers/towdium/justEnoughCalculation/gui/recipeEditor/GuiRecipeEditor.java index 40f55b9..12b0c12 100644 --- a/src/main/java/pers/towdium/tudicraft/gui/recipeEditor/GuiRecipeEditor.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/recipeEditor/GuiRecipeEditor.java @@ -1,19 +1,17 @@ -package pers.towdium.tudicraft.gui.recipeEditor; +package pers.towdium.justEnoughCalculation.gui.recipeEditor; 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.inventory.Slot; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import pers.towdium.tudicraft.Tudicraft; -import pers.towdium.tudicraft.core.Recipe; -import pers.towdium.tudicraft.network.packages.PackageRecipeUpdate; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; +import pers.towdium.justEnoughCalculation.core.Recipe; +import pers.towdium.justEnoughCalculation.network.packets.PacketRecipeUpdate; import java.io.IOException; -import java.sql.Time; /** * @author Towdium @@ -54,7 +52,7 @@ public class GuiRecipeEditor extends GuiContainer{ @Override protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(new ResourceLocation(Tudicraft.Reference.MODID,"textures/gui/guiRecipeEditor.png")); + this.mc.getTextureManager().bindTexture(new ResourceLocation(JustEnoughCalculation.Reference.MODID,"textures/gui/guiRecipeEditor.png")); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); if(activeSlot != -1){ Slot slot = inventorySlots.getSlot(activeSlot); @@ -70,8 +68,8 @@ public class GuiRecipeEditor extends GuiContainer{ slot.inventory.setInventorySlotContents(slot.getSlotIndex(), null); }else if(buttonId == 16) { Recipe recipe = ((ContainerRecipeEditor)inventorySlots).buildRecipe(); - Tudicraft.proxy.getPlayerHandler().addRecipe(recipe, null); - Tudicraft.networkWrapper.sendToServer(new PackageRecipeUpdate(recipe, -1)); + JustEnoughCalculation.proxy.getPlayerHandler().addRecipe(recipe, null); + JustEnoughCalculation.networkWrapper.sendToServer(new PacketRecipeUpdate(recipe, -1)); mc.displayGuiScreen(parent); }else if(buttonId == 17) { for(Slot slot : inventorySlots.inventorySlots){ diff --git a/src/main/java/pers/towdium/tudicraft/gui/recipeEditor/InventoryRecipeEditor.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/recipeEditor/InventoryRecipeEditor.java similarity index 63% rename from src/main/java/pers/towdium/tudicraft/gui/recipeEditor/InventoryRecipeEditor.java rename to src/main/java/pers/towdium/justEnoughCalculation/gui/recipeEditor/InventoryRecipeEditor.java index f97b468..7f35943 100644 --- a/src/main/java/pers/towdium/tudicraft/gui/recipeEditor/InventoryRecipeEditor.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/recipeEditor/InventoryRecipeEditor.java @@ -1,8 +1,6 @@ -package pers.towdium.tudicraft.gui.recipeEditor; +package pers.towdium.justEnoughCalculation.gui.recipeEditor; import net.minecraft.inventory.InventoryBasic; -import net.minecraft.item.ItemStack; -import pers.towdium.tudicraft.core.Recipe; /** * @author Towdium diff --git a/src/main/java/pers/towdium/tudicraft/item/ItemCalculator.java b/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java similarity index 71% rename from src/main/java/pers/towdium/tudicraft/item/ItemCalculator.java rename to src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java index cdc7299..04b6ee8 100644 --- a/src/main/java/pers/towdium/tudicraft/item/ItemCalculator.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java @@ -1,11 +1,11 @@ -package pers.towdium.tudicraft.item; +package pers.towdium.justEnoughCalculation.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import pers.towdium.tudicraft.Tudicraft; -import pers.towdium.tudicraft.gui.GuiHandler; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; +import pers.towdium.justEnoughCalculation.gui.GuiHandler; import java.util.List; @@ -20,7 +20,7 @@ public class ItemCalculator extends Item { @Override public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn) { - playerIn.openGui(Tudicraft.instance, GuiHandler.GuiId.CALCULATOR, worldIn, 0, 0, 0); + playerIn.openGui(JustEnoughCalculation.instance, GuiHandler.GuiId.CALCULATOR, worldIn, 0, 0, 0); return itemStackIn; } diff --git a/src/main/java/pers/towdium/tudicraft/network/IPlayerHandler.java b/src/main/java/pers/towdium/justEnoughCalculation/network/IPlayerHandler.java similarity index 89% rename from src/main/java/pers/towdium/tudicraft/network/IPlayerHandler.java rename to src/main/java/pers/towdium/justEnoughCalculation/network/IPlayerHandler.java index 5c670a0..6733a6c 100644 --- a/src/main/java/pers/towdium/tudicraft/network/IPlayerHandler.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/network/IPlayerHandler.java @@ -1,10 +1,9 @@ -package pers.towdium.tudicraft.network; +package pers.towdium.justEnoughCalculation.network; import com.google.common.collect.ImmutableList; import net.minecraft.item.ItemStack; -import pers.towdium.tudicraft.core.Recipe; +import pers.towdium.justEnoughCalculation.core.Recipe; -import java.util.List; import java.util.UUID; /** diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/IProxy.java b/src/main/java/pers/towdium/justEnoughCalculation/network/IProxy.java new file mode 100644 index 0000000..8c8f966 --- /dev/null +++ b/src/main/java/pers/towdium/justEnoughCalculation/network/IProxy.java @@ -0,0 +1,14 @@ +package pers.towdium.justEnoughCalculation.network; + +/** + * @author Towdium + */ + + +public interface IProxy { + IPlayerHandler getPlayerHandler(); + + void init(); + + +} diff --git a/src/main/java/pers/towdium/tudicraft/network/PlayerHandlerClient.java b/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerClient.java similarity index 87% rename from src/main/java/pers/towdium/tudicraft/network/PlayerHandlerClient.java rename to src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerClient.java index aa0ad40..2bc03b6 100644 --- a/src/main/java/pers/towdium/tudicraft/network/PlayerHandlerClient.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerClient.java @@ -1,23 +1,18 @@ -package pers.towdium.tudicraft.network; +package pers.towdium.justEnoughCalculation.network; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.play.server.S42PacketCombatEvent; import net.minecraftforge.event.entity.player.PlayerEvent; -import pers.towdium.tudicraft.Tudicraft; -import pers.towdium.tudicraft.core.ItemStackWrapper; -import pers.towdium.tudicraft.core.Recipe; -import pers.towdium.tudicraft.gui.calculator.ContainerCalculator; -import pers.towdium.tudicraft.network.packages.PackageCalculatorUpdate; -import pers.towdium.tudicraft.network.packages.PackageRecipeUpdate; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; +import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; +import pers.towdium.justEnoughCalculation.core.Recipe; +import pers.towdium.justEnoughCalculation.network.packets.PacketCalculatorUpdate; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.util.ArrayList; import java.util.List; @@ -27,7 +22,7 @@ import java.util.UUID; * @author Towdium */ public class PlayerHandlerClient implements IPlayerHandler { - List recipes; + public List recipes; @Override public void addRecipe(Recipe recipe, UUID uuid) { @@ -121,7 +116,7 @@ public class PlayerHandlerClient implements IPlayerHandler { ItemStack itemStack = Minecraft.getMinecraft().thePlayer.getHeldItem(); ItemStackWrapper.NBT.setItem(itemStack, "dest",itemIn ); ItemStackWrapper.NBT.setString(itemStack, "text", string); - Tudicraft.networkWrapper.sendToServer(new PackageCalculatorUpdate(itemStack)); + JustEnoughCalculation.networkWrapper.sendToServer(new PacketCalculatorUpdate(itemStack)); } @Override @@ -144,7 +139,7 @@ public class PlayerHandlerClient implements IPlayerHandler { FileOutputStream fileoutputstream = new FileOutputStream(file); CompressedStreamTools.writeCompressed(compound, fileoutputstream); }catch (Exception e){ - Tudicraft.log.warn("Fail to save records for"+event.entityPlayer.getDisplayName()); + JustEnoughCalculation.log.warn("Fail to save records for"+event.entityPlayer.getDisplayName()); } } diff --git a/src/main/java/pers/towdium/tudicraft/network/PlayerHandlerServer.java b/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerServer.java similarity index 69% rename from src/main/java/pers/towdium/tudicraft/network/PlayerHandlerServer.java rename to src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerServer.java index 1339764..a095719 100644 --- a/src/main/java/pers/towdium/tudicraft/network/PlayerHandlerServer.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerServer.java @@ -1,12 +1,13 @@ -package pers.towdium.tudicraft.network; +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 net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import pers.towdium.tudicraft.core.Recipe; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; +import pers.towdium.justEnoughCalculation.core.Recipe; +import pers.towdium.justEnoughCalculation.network.packets.PacketSyncRecord; -import java.io.File; import java.util.HashMap; import java.util.UUID; @@ -16,10 +17,6 @@ import java.util.UUID; public class PlayerHandlerServer implements IPlayerHandler { HashMap players = new HashMap<>(); - - - - @Override public boolean getHasRecipeOf(ItemStack itemStack, UUID uuid) { return false; @@ -72,15 +69,18 @@ public class PlayerHandlerServer implements IPlayerHandler { @Override public void handleLogin(PlayerEvent.LoadFromFile event) { - + PlayerHandlerClient client = new PlayerHandlerClient(); + client.handleLogin(event); + players.put(event.entityPlayer.getUniqueID(), client); + //JustEnoughCalculation.networkWrapper.sendTo(new PacketSyncRecord(client), ((EntityPlayerMP) event.entityPlayer)); } @Override public void handleSave(PlayerEvent.SaveToFile event) { - + players.get(UUID.fromString(event.playerUUID)).handleSave(event); } - public void addPlayer(UUID uuid){ - players.put(uuid , new PlayerHandlerClient()); + public PlayerHandlerClient getClient(UUID uuid){ + return players.get(uuid); } } diff --git a/src/main/java/pers/towdium/tudicraft/network/ProxyClient.java b/src/main/java/pers/towdium/justEnoughCalculation/network/ProxyClient.java similarity index 50% rename from src/main/java/pers/towdium/tudicraft/network/ProxyClient.java rename to src/main/java/pers/towdium/justEnoughCalculation/network/ProxyClient.java index a527f43..0b4e814 100644 --- a/src/main/java/pers/towdium/tudicraft/network/ProxyClient.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/network/ProxyClient.java @@ -1,11 +1,11 @@ -package pers.towdium.tudicraft.network; +package pers.towdium.justEnoughCalculation.network; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.network.NetworkRegistry; -import pers.towdium.tudicraft.Tudicraft; -import pers.towdium.tudicraft.event.GuiEventHandler; -import pers.towdium.tudicraft.event.PlayerEventHandler; -import pers.towdium.tudicraft.gui.GuiHandler; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; +import pers.towdium.justEnoughCalculation.event.GuiEventHandler; +import pers.towdium.justEnoughCalculation.event.PlayerEventHandler; +import pers.towdium.justEnoughCalculation.gui.GuiHandler; /** * @author Towdium @@ -20,9 +20,12 @@ public class ProxyClient implements IProxy { @Override public void init() { - NetworkRegistry.INSTANCE.registerGuiHandler(Tudicraft.instance, new GuiHandler()); + NetworkRegistry.INSTANCE.registerGuiHandler(JustEnoughCalculation.instance, new GuiHandler()); MinecraftForge.EVENT_BUS.register(new GuiEventHandler()); MinecraftForge.EVENT_BUS.register(new PlayerEventHandler()); } + public void setPlayerHandler(PlayerHandlerClient playerHandler) { + this.playerHandler = playerHandler; + } } diff --git a/src/main/java/pers/towdium/tudicraft/network/ProxyServer.java b/src/main/java/pers/towdium/justEnoughCalculation/network/ProxyServer.java similarity index 77% rename from src/main/java/pers/towdium/tudicraft/network/ProxyServer.java rename to src/main/java/pers/towdium/justEnoughCalculation/network/ProxyServer.java index c7ff5c1..86fd6e0 100644 --- a/src/main/java/pers/towdium/tudicraft/network/ProxyServer.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/network/ProxyServer.java @@ -1,7 +1,7 @@ -package pers.towdium.tudicraft.network; +package pers.towdium.justEnoughCalculation.network; import net.minecraftforge.common.MinecraftForge; -import pers.towdium.tudicraft.event.PlayerEventHandler; +import pers.towdium.justEnoughCalculation.event.PlayerEventHandler; /** * @author Towdium diff --git a/src/main/java/pers/towdium/tudicraft/network/packages/PackageCalculatorUpdate.java b/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketCalculatorUpdate.java similarity index 70% rename from src/main/java/pers/towdium/tudicraft/network/packages/PackageCalculatorUpdate.java rename to src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketCalculatorUpdate.java index 9bd1608..984b192 100644 --- a/src/main/java/pers/towdium/tudicraft/network/packages/PackageCalculatorUpdate.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketCalculatorUpdate.java @@ -1,4 +1,4 @@ -package pers.towdium.tudicraft.network.packages; +package pers.towdium.justEnoughCalculation.network.packets; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; @@ -6,17 +6,17 @@ 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; -import pers.towdium.tudicraft.item.ItemCalculator; +import pers.towdium.justEnoughCalculation.item.ItemCalculator; /** * @author Towdium */ -public class PackageCalculatorUpdate implements IMessage, IMessageHandler { +public class PacketCalculatorUpdate implements IMessage, IMessageHandler { ItemStack itemStack; - public PackageCalculatorUpdate(){} + public PacketCalculatorUpdate(){} - public PackageCalculatorUpdate(ItemStack itemStack) { + public PacketCalculatorUpdate(ItemStack itemStack) { this.itemStack = itemStack; } @@ -31,7 +31,7 @@ public class PackageCalculatorUpdate implements IMessage, IMessageHandler { +public class PacketRecipeUpdate implements IMessage, IMessageHandler { Recipe recipe; int index; - public PackageRecipeUpdate(){} + public PacketRecipeUpdate(){} - public PackageRecipeUpdate(Recipe recipe, int index){ + public PacketRecipeUpdate(Recipe recipe, int index){ this.recipe = recipe; this.index = index; } @@ -41,8 +38,8 @@ public class PackageRecipeUpdate implements IMessage, IMessageHandler { +public class PacketSlotUpdate implements IMessage, IMessageHandler { int slot; int playerId; ItemStack itemStack=null; - public PackageSlotUpdate(){} + public PacketSlotUpdate(){} - public PackageSlotUpdate(EntityPlayer player, int index){ + public PacketSlotUpdate(EntityPlayer player, int index){ playerId = player.getEntityId(); slot = index; this.itemStack = player.inventory.getStackInSlot(index); @@ -45,7 +45,7 @@ public class PackageSlotUpdate implements IMessage, IMessageHandler { + PlayerHandlerClient client; + + public PacketSyncRecord(){} + + public PacketSyncRecord(PlayerHandlerClient client){ + this.client = client; + } + + @Override + public void toBytes(ByteBuf buf) { + if (client == null){ + buf.writeShort(-1); + return; + } + buf.writeShort(0); + NBTTagCompound tagCompound = new NBTTagCompound(); + client.writeToNBT(tagCompound); + ByteBufUtils.writeTag(buf, tagCompound); + } + + @Override + public void fromBytes(ByteBuf buf) { + short s = buf.readShort(); + if(s == -1){ + return; + } + this.client = new PlayerHandlerClient(); + NBTTagCompound tagCompound = ByteBufUtils.readTag(buf); + client.readFromNBT(tagCompound); + } + + @Override + public IMessage onMessage(PacketSyncRecord message, MessageContext ctx) { + if(message.client == null && JustEnoughCalculation.proxy instanceof ProxyServer){ + //JustEnoughCalculation.proxy.getPlayerHandler().handleLogin(ctx.getServerHandler().playerEntity.getDisplayNameString()); + UUID uuida = ctx.getServerHandler().playerEntity.getUniqueID(); + UUID uuidb = ctx.getServerHandler().playerEntity.getPersistentID(); + return new PacketSyncRecord(((PlayerHandlerServer) JustEnoughCalculation.proxy.getPlayerHandler()).getClient(uuida)); + }if(message.client == null && JustEnoughCalculation.proxy instanceof ProxyClient){ + return null; + } + + + ((ProxyClient) JustEnoughCalculation.proxy).setPlayerHandler(message.client); + return null; + } +} diff --git a/src/main/java/pers/towdium/tudicraft/plugin/JEIPlugin.java b/src/main/java/pers/towdium/justEnoughCalculation/plugin/JEIPlugin.java similarity index 78% rename from src/main/java/pers/towdium/tudicraft/plugin/JEIPlugin.java rename to src/main/java/pers/towdium/justEnoughCalculation/plugin/JEIPlugin.java index a7e960a..55add54 100644 --- a/src/main/java/pers/towdium/tudicraft/plugin/JEIPlugin.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/plugin/JEIPlugin.java @@ -1,13 +1,10 @@ -package pers.towdium.tudicraft.plugin; +package pers.towdium.justEnoughCalculation.plugin; -import mezz.jei.JeiRuntime; import mezz.jei.api.*; import mezz.jei.api.recipe.VanillaRecipeCategoryUid; -import mezz.jei.transfer.BasicRecipeTransferHandler; -import pers.towdium.tudicraft.Tudicraft; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; import javax.annotation.Nonnull; -import javax.swing.plaf.TableUI; /** * @author Towdium @@ -38,7 +35,7 @@ public class JEIPlugin implements IModPlugin{ @Override public void onRuntimeAvailable(@Nonnull IJeiRuntime jeiRuntime) { - Tudicraft.log.info("载入了!"); + JustEnoughCalculation.log.info("载入了!"); runtime = jeiRuntime; } } diff --git a/src/main/java/pers/towdium/tudicraft/plugin/NormalRecipeTransferHandler.java b/src/main/java/pers/towdium/justEnoughCalculation/plugin/NormalRecipeTransferHandler.java similarity index 93% rename from src/main/java/pers/towdium/tudicraft/plugin/NormalRecipeTransferHandler.java rename to src/main/java/pers/towdium/justEnoughCalculation/plugin/NormalRecipeTransferHandler.java index 8d05d38..b1043ce 100644 --- a/src/main/java/pers/towdium/tudicraft/plugin/NormalRecipeTransferHandler.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/plugin/NormalRecipeTransferHandler.java @@ -1,4 +1,4 @@ -package pers.towdium.tudicraft.plugin; +package pers.towdium.justEnoughCalculation.plugin; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.transfer.IRecipeTransferError; @@ -7,8 +7,8 @@ import mezz.jei.gui.ingredients.IGuiIngredient; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; -import pers.towdium.tudicraft.core.ItemStackWrapper; -import pers.towdium.tudicraft.gui.recipeEditor.ContainerRecipeEditor; +import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; +import pers.towdium.justEnoughCalculation.gui.recipeEditor.ContainerRecipeEditor; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/pers/towdium/tudicraft/network/IProxy.java b/src/main/java/pers/towdium/tudicraft/network/IProxy.java deleted file mode 100644 index e1f08c9..0000000 --- a/src/main/java/pers/towdium/tudicraft/network/IProxy.java +++ /dev/null @@ -1,17 +0,0 @@ -package pers.towdium.tudicraft.network; - -import net.minecraft.item.ItemStack; -import pers.towdium.tudicraft.core.Recipe; - -/** - * @author Towdium - */ - - -public interface IProxy { - IPlayerHandler getPlayerHandler(); - - void init(); - - -} diff --git a/src/main/resources/assets/tudicraft/lang/en_US.lang b/src/main/resources/assets/je_calculation/lang/en_US.lang similarity index 100% rename from src/main/resources/assets/tudicraft/lang/en_US.lang rename to src/main/resources/assets/je_calculation/lang/en_US.lang diff --git a/src/main/resources/assets/tudicraft/models/item/itemCalculator.json b/src/main/resources/assets/je_calculation/models/item/itemCalculator.json similarity index 87% rename from src/main/resources/assets/tudicraft/models/item/itemCalculator.json rename to src/main/resources/assets/je_calculation/models/item/itemCalculator.json index d1726f2..7101f8c 100644 --- a/src/main/resources/assets/tudicraft/models/item/itemCalculator.json +++ b/src/main/resources/assets/je_calculation/models/item/itemCalculator.json @@ -1,7 +1,7 @@ { "parent": "builtin/generated", "textures": { - "layer0": "tudicraft:items/itemCalculator" + "layer0": "je_calculation:items/itemCalculator" }, "display": { "thirdperson": { diff --git a/src/main/resources/assets/tudicraft/textures/gui/containerCalculator.png b/src/main/resources/assets/je_calculation/textures/gui/containerCalculator.png similarity index 100% rename from src/main/resources/assets/tudicraft/textures/gui/containerCalculator.png rename to src/main/resources/assets/je_calculation/textures/gui/containerCalculator.png diff --git a/src/main/resources/assets/tudicraft/textures/gui/guiCalculator.png b/src/main/resources/assets/je_calculation/textures/gui/guiCalculator.png similarity index 100% rename from src/main/resources/assets/tudicraft/textures/gui/guiCalculator.png rename to src/main/resources/assets/je_calculation/textures/gui/guiCalculator.png diff --git a/src/main/resources/assets/tudicraft/textures/gui/guiItemPicker.png b/src/main/resources/assets/je_calculation/textures/gui/guiItemPicker.png similarity index 100% rename from src/main/resources/assets/tudicraft/textures/gui/guiItemPicker.png rename to src/main/resources/assets/je_calculation/textures/gui/guiItemPicker.png diff --git a/src/main/resources/assets/tudicraft/textures/gui/guiRecipeEditor.png b/src/main/resources/assets/je_calculation/textures/gui/guiRecipeEditor.png similarity index 100% rename from src/main/resources/assets/tudicraft/textures/gui/guiRecipeEditor.png rename to src/main/resources/assets/je_calculation/textures/gui/guiRecipeEditor.png diff --git a/src/main/resources/assets/tudicraft/textures/gui/slotActive.png b/src/main/resources/assets/je_calculation/textures/gui/slotActive.png similarity index 100% rename from src/main/resources/assets/tudicraft/textures/gui/slotActive.png rename to src/main/resources/assets/je_calculation/textures/gui/slotActive.png diff --git a/src/main/resources/assets/tudicraft/textures/gui/slotInput.png b/src/main/resources/assets/je_calculation/textures/gui/slotInput.png similarity index 100% rename from src/main/resources/assets/tudicraft/textures/gui/slotInput.png rename to src/main/resources/assets/je_calculation/textures/gui/slotInput.png diff --git a/src/main/resources/assets/tudicraft/textures/gui/slotOutput.png b/src/main/resources/assets/je_calculation/textures/gui/slotOutput.png similarity index 100% rename from src/main/resources/assets/tudicraft/textures/gui/slotOutput.png rename to src/main/resources/assets/je_calculation/textures/gui/slotOutput.png diff --git a/src/main/resources/assets/tudicraft/textures/gui/slots.png b/src/main/resources/assets/je_calculation/textures/gui/slots.png similarity index 100% rename from src/main/resources/assets/tudicraft/textures/gui/slots.png rename to src/main/resources/assets/je_calculation/textures/gui/slots.png diff --git a/src/main/resources/assets/tudicraft/textures/items/itemCalculator.png b/src/main/resources/assets/je_calculation/textures/items/itemCalculator.png similarity index 100% rename from src/main/resources/assets/tudicraft/textures/items/itemCalculator.png rename to src/main/resources/assets/je_calculation/textures/items/itemCalculator.png