Almost done with record saving! Moved nearly all the files

This commit is contained in:
Towdium committed 2016-02-23 21:43:27 +08:00
1 parent d29aa0622d
commit e891649d92
43 files changed
+228 -191

No files matched your search

@@ -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();
}
}
@@ -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);
@@ -1,4 +1,4 @@
package pers.towdium.tudicraft.core;
package pers.towdium.justEnoughCalculation.core;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -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
@@ -1,4 +1,4 @@
package pers.towdium.tudicraft.core;
package pers.towdium.justEnoughCalculation.core;
import io.netty.buffer.ByteBuf;
import net.minecraft.item.ItemStack;
@@ -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;
@@ -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);
}
}
@@ -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
@@ -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;
@@ -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;
@@ -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());
}
}
@@ -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
@@ -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;
}
}
@@ -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);
}
@@ -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
@@ -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;
/**
@@ -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){
@@ -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
@@ -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;
}
@@ -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;
/**
@@ -0,0 +1,14 @@
package pers.towdium.justEnoughCalculation.network;
/**
* @author Towdium
*/
public interface IProxy {
IPlayerHandler getPlayerHandler();
void init();
}
@@ -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<Recipe> recipes;
public List<Recipe> 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());
}
}
@@ -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<UUID, PlayerHandlerClient> 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);
}
}
@@ -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;
}
}
@@ -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
@@ -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<PackageCalculatorUpdate, IMessage> {
public class PacketCalculatorUpdate implements IMessage, IMessageHandler<PacketCalculatorUpdate, IMessage> {
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<Packag
}
@Override
public IMessage onMessage(PackageCalculatorUpdate message, MessageContext ctx) {
public IMessage onMessage(PacketCalculatorUpdate message, MessageContext ctx) {
if(ctx.getServerHandler().playerEntity.getHeldItem().getItem() instanceof ItemCalculator){
ctx.getServerHandler().playerEntity.inventory.setInventorySlotContents(
ctx.getServerHandler().playerEntity.inventory.currentItem, message.itemStack);
@@ -1,29 +1,26 @@
package pers.towdium.tudicraft.network.packages;
package pers.towdium.justEnoughCalculation.network.packets;
import io.netty.buffer.ByteBuf;
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 net.minecraftforge.fml.relauncher.Side;
import pers.towdium.tudicraft.Tudicraft;
import pers.towdium.tudicraft.core.Recipe;
import pers.towdium.tudicraft.network.IPlayerHandler;
import pers.towdium.tudicraft.network.PlayerHandlerServer;
import pers.towdium.tudicraft.network.ProxyClient;
import pers.towdium.tudicraft.network.ProxyServer;
import pers.towdium.justEnoughCalculation.JustEnoughCalculation;
import pers.towdium.justEnoughCalculation.core.Recipe;
import pers.towdium.justEnoughCalculation.network.IPlayerHandler;
import pers.towdium.justEnoughCalculation.network.PlayerHandlerServer;
import java.util.UUID;
/**
* @author Towdium
*/
public class PackageRecipeUpdate implements IMessage, IMessageHandler<PackageRecipeUpdate, IMessage> {
public class PacketRecipeUpdate implements IMessage, IMessageHandler<PacketRecipeUpdate, IMessage> {
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<PackageRec
}
@Override
public IMessage onMessage(PackageRecipeUpdate message, MessageContext context) {
IPlayerHandler playerHandler = Tudicraft.proxy.getPlayerHandler();
public IMessage onMessage(PacketRecipeUpdate message, MessageContext context) {
IPlayerHandler playerHandler = JustEnoughCalculation.proxy.getPlayerHandler();
if(playerHandler instanceof PlayerHandlerServer){
UUID uuid = context.getServerHandler().playerEntity.getUniqueID();
if(message.index == -1){
@@ -1,4 +1,4 @@
package pers.towdium.tudicraft.network.packages;
package pers.towdium.justEnoughCalculation.network.packets;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
@@ -11,15 +11,15 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
/**
* @author Towdium
*/
public class PackageSlotUpdate implements IMessage, IMessageHandler<PackageSlotUpdate, IMessage> {
public class PacketSlotUpdate implements IMessage, IMessageHandler<PacketSlotUpdate, IMessage> {
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<PackageSlotU
@Override
public IMessage onMessage(PackageSlotUpdate message, MessageContext context) {
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");
@@ -0,0 +1,68 @@
package pers.towdium.justEnoughCalculation.network.packets;
import io.netty.buffer.ByteBuf;
import net.minecraft.nbt.NBTTagCompound;
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 net.minecraftforge.fml.relauncher.Side;
import pers.towdium.justEnoughCalculation.JustEnoughCalculation;
import pers.towdium.justEnoughCalculation.network.PlayerHandlerClient;
import pers.towdium.justEnoughCalculation.network.PlayerHandlerServer;
import pers.towdium.justEnoughCalculation.network.ProxyClient;
import pers.towdium.justEnoughCalculation.network.ProxyServer;
import java.util.UUID;
/**
* @author Towdium
*/
public class PacketSyncRecord implements IMessage, IMessageHandler<PacketSyncRecord, IMessage> {
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;
}
}
@@ -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;
}
}
@@ -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;
@@ -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();
}