From: mozipi Date: Mon, 4 Feb 2013 10:42:11 +0000 (+0900) Subject: ChemiCraft.java修正 X-Git-Url: http://git.sourceforge.jp/view?p=chemicraft%2Fchemicraft.git;a=commitdiff_plain;h=3924dbb7140652e69bfc4a5e99d81af846679f52 ChemiCraft.java修正 --- diff --git a/common/chemicraft/ChemiCraft.java b/common/chemicraft/ChemiCraft.java index c2b7b7f..7f8829a 100644 --- a/common/chemicraft/ChemiCraft.java +++ b/common/chemicraft/ChemiCraft.java @@ -180,6 +180,7 @@ public class ChemiCraft { this.chemicalConbinationTableID = chemicalCombinationTableIDProp.getInt(); this.toolAndWeaponCraftingTableID = toolAndWeaponCraftingTableIDProp.getInt(); this.chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt(); + this.electrolysisTableID = electrolysisTableIDProp.getInt(); this.atomsID = atomsIDProp.getInt(); this.compoundsID = compoundsIDProp.getInt(); this.gasCollectingBottleID = gasCollectingBottleIDProp.getInt(); @@ -225,12 +226,12 @@ public class ChemiCraft { setResistance(0.0F). setStepSound(Block.soundStoneFootstep). setBlockName("ToolAndWeaponCraftingTable"); - this.blockChemicalCraftingTable = new BlockChemicalCraftingTable(chemicalCraftingTableID, 0, Material.ground). + this.blockChemicalCraftingTable = new BlockChemicalCraftingTable(this.chemicalCraftingTableID, 0, Material.ground). setHardness(2.0F). setResistance(0.0F). setStepSound(Block.soundStoneFootstep). setBlockName("ChemicalCraftingTable"); - this.blockElectrolysisTable = new BlockElectrolysisTable(electrolysisTableID, 0, Material.ground). + this.blockElectrolysisTable = new BlockElectrolysisTable(this.electrolysisTableID, 0, Material.ground). setHardness(2.0F). setResistance(0.0F). setStepSound(Block.soundStoneFootstep). @@ -247,6 +248,7 @@ public class ChemiCraft { GameRegistry.registerBlock(this.blockChemicalCombinationTable, "BlockChemicalCombinationTable"); GameRegistry.registerBlock(this.blockToolAndWeaponCraftingTable, "BlockToolAndWeaponCraftingTable"); GameRegistry.registerBlock(this.blockChemicalCraftingTable, "BlockMaterialCraftingTable"); + GameRegistry.registerBlock(this.blockElectrolysisTable, "BlockElectrolysisTable"); // Blockの名前を設定します this.nameAuxiliary.addName(this.blockPyrolysisTable, "PyrolysisTable"); diff --git a/common/chemicraft/client/ClientProxy.java b/common/chemicraft/client/ClientProxy.java index d001c82..5ec9032 100644 --- a/common/chemicraft/client/ClientProxy.java +++ b/common/chemicraft/client/ClientProxy.java @@ -6,8 +6,19 @@ import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import chemicraft.ChemiCraft; import chemicraft.debug.DebugTick; +import chemicraft.entity.EntityAtomsGrenade; +import chemicraft.gui.GuiChemicalCombinationTable; +import chemicraft.gui.GuiChemicalCraftingTable; +import chemicraft.gui.GuiElectrolysisTable; import chemicraft.gui.GuiPyrolysisTable; +import chemicraft.gui.GuiToolAndWeaponCraftingTable; +import chemicraft.render.RenderAtomsGrenade; +import chemicraft.system.CommonProxy; +import chemicraft.tileentity.TileEntityChemicalCombinationTable; +import chemicraft.tileentity.TileEntityChemicalCraftingTable; +import chemicraft.tileentity.TileEntityElectrolysisTable; import chemicraft.tileentity.TileEntityPyrolysisTable; +import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.registry.TickRegistry; @@ -17,14 +28,14 @@ public class ClientProxy extends CommonProxy { @Override public void registerRenderInformation() { - MinecraftForgeClient.preloadTexture(ChemiCraft.instance.blockChemicalCraftingTableTexture); - MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemAtomsTexture); - MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemCompoundsTexture); - MinecraftForgeClient.preloadTexture(ChemiCraft.instance.itemTexture); - MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCombinationTexture); - MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiPyrolysisTexture); - MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiChemicalCraftingTexture); - MinecraftForgeClient.preloadTexture(ChemiCraft.instance.guiToolAndWeaponCraftingTexture); + MinecraftForgeClient.preloadTexture(ChemiCraft.instance.BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE); + MinecraftForgeClient.preloadTexture(ChemiCraft.instance.ITEM_ATOMS_TEXTURE); + MinecraftForgeClient.preloadTexture(ChemiCraft.instance.ITEM_COMPOUNDS_TEXTURE); + MinecraftForgeClient.preloadTexture(ChemiCraft.instance.ITEM_TEXTURE); + MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUI_CHEMICALCOMBINATION_TEXTURE); + MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUI_PYROLYSIS_TEXTURE); + MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUI_CHEMICALCRAFTING_TEXTURE); + MinecraftForgeClient.preloadTexture(ChemiCraft.instance.GUI_TOOLANDWEAPONCRAFTING_TEXTURE); RenderingRegistry.registerEntityRenderingHandler(EntityAtomsGrenade.class, new RenderAtomsGrenade(0.5F)); } @@ -43,6 +54,8 @@ public class ClientProxy extends CommonProxy { return new GuiToolAndWeaponCraftingTable(player, (TileEntityToolAndWeaponCraftingTable) tileEntity); }else if(tileEntity instanceof TileEntityChemicalCraftingTable){ return new GuiChemicalCraftingTable(player, (TileEntityChemicalCraftingTable) tileEntity); + } else if (tileEntity instanceof TileEntityElectrolysisTable) { + return new GuiElectrolysisTable(player, (TileEntityElectrolysisTable) tileEntity); } return null; } diff --git a/common/chemicraft/system/PacketHandler.java b/common/chemicraft/system/PacketHandler.java index b7c7b1a..59945b4 100644 --- a/common/chemicraft/system/PacketHandler.java +++ b/common/chemicraft/system/PacketHandler.java @@ -13,6 +13,7 @@ import net.minecraft.world.World; import chemicraft.ChemiCraft; import chemicraft.tileentity.TileEntityChemicalCombinationTable; import chemicraft.tileentity.TileEntityChemicalCraftingTable; +import chemicraft.tileentity.TileEntityElectrolysisTable; import chemicraft.tileentity.TileEntityPyrolysisTable; import chemicraft.tileentity.TileEntityToolAndWeaponCraftingTable; @@ -100,6 +101,37 @@ public class PacketHandler implements IPacketHandler { return packet; } + public static Packet getPacket(TileEntityElectrolysisTable tileEntity) { + ByteArrayOutputStream var1 = new ByteArrayOutputStream(128); + DataOutputStream var2 = new DataOutputStream(var1); + + // Blockのx, y, z座標 + int x, y, z; + + // x, y, z座標を代入 + x = tileEntity.xCoord; + y = tileEntity.yCoord; + z = tileEntity.zCoord; + + try { + // 座標書き込み + var2.writeInt(x); + var2.writeInt(y); + var2.writeInt(z); + tileEntity.writePacket(var2); + } catch (IOException e) { + e.printStackTrace(); + } + + // パケットの作成 + Packet250CustomPayload packet = new Packet250CustomPayload(); + packet.channel = "chemicraft"; + packet.data = var1.toByteArray(); + packet.length = var1.size(); + packet.isChunkDataPacket = true; + return packet; + } + public static Packet getPacket(TileEntityChemicalCombinationTable tileEntity) { ByteArrayOutputStream var1 = new ByteArrayOutputStream(128); DataOutputStream var2 = new DataOutputStream(var1); diff --git a/common/chemicraft/tileentity/TileEntityElectrolysisTable.java b/common/chemicraft/tileentity/TileEntityElectrolysisTable.java index aab7b14..726b1ae 100644 --- a/common/chemicraft/tileentity/TileEntityElectrolysisTable.java +++ b/common/chemicraft/tileentity/TileEntityElectrolysisTable.java @@ -1,5 +1,7 @@ package chemicraft.tileentity; +import java.io.DataOutputStream; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.packet.Packet; import net.minecraft.tileentity.TileEntity; @@ -15,7 +17,7 @@ public class TileEntityElectrolysisTable extends TileEntity private InventoryElectrolysisFuel invf = new InventoryElectrolysisFuel(); public TileEntityElectrolysisTable() { - + } @Override @@ -33,13 +35,13 @@ public class TileEntityElectrolysisTable extends TileEntity @Override public void updateEntity() { - + } @Override public Packet getDescriptionPacket() { - return super.getDescriptionPacket(); + return this.getDescriptionPacket(); } public InventoryElectrolysisMaterial getInvMaterial(){ @@ -54,4 +56,8 @@ public class TileEntityElectrolysisTable extends TileEntity return this.invf; } + public void writePacket(DataOutputStream var2) { + + } + }