X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=common%2Fchemicraft%2FChemiCraft.java;h=67993adf8e45b0533f4c8a43b463d2f3ad81cfdb;hb=a0ab3df38eac4d521c0a9fcaa23f71006a753fa1;hp=2220c75724077d156caffa904d272267573aa70e;hpb=de52e09542a4ea631a26f1ef11ba39b1a15186b9;p=chemicraft%2Fchemicraft.git

diff --git a/common/chemicraft/ChemiCraft.java b/common/chemicraft/ChemiCraft.java
index 2220c75..67993ad 100644
--- a/common/chemicraft/ChemiCraft.java
+++ b/common/chemicraft/ChemiCraft.java
@@ -83,19 +83,19 @@ public class ChemiCraft {
 	/**
 	 * BlockID
 	 */
-	public static int scienceCraftingTableID;
+	public static int chemicalCraftingTableID;
 
 
 	/**
 	 * GUIID
 	 */
-	public static int guiScienceCraftingTableID;
+	public static int guiChemicalCraftingTableID;
 
 
 	/**
 	 * Block型変数
 	 */
-	public static Block blockScienceCraftingTable;
+	public static Block blockChemicalCraftingTable;
 
 
 	/**
@@ -119,17 +119,17 @@ public class ChemiCraft {
 		Configuration cfg = new Configuration(event.getSuggestedConfigurationFile());
 		cfg.load();
 
-		Property scienceCraftingTableIDProp = cfg.getBlock("scienceCraftingTable", 200);
+		Property chemicalCraftingTableIDProp = cfg.getBlock("chemicalCraftingTable", 200);
 		Property atomsIDProp = cfg.getItem("atomsID", 25000);
 		Property compoundsIDProp = cfg.getItem("compoundsID", 25001);
 		Property gasCollectingBottleIDProp = cfg.getItem("gasCollectingBottleID", 25002);
-		Property guiScienceCraftingTableIDProp = cfg.get("GUI", "GUIScienceCraftingTableID", 1000);
+		Property guiChemicalCraftingTableIDProp = cfg.get("GUI", "GUIChemicalCraftingTableID", 1000);
 
-		scienceCraftingTableID = scienceCraftingTableIDProp.getInt();
+		chemicalCraftingTableID = chemicalCraftingTableIDProp.getInt();
 		atomsID = atomsIDProp.getInt();
 		compoundsID = compoundsIDProp.getInt();
 		gasCollectingBottleID = gasCollectingBottleIDProp.getInt();
-		guiScienceCraftingTableID = guiScienceCraftingTableIDProp.getInt();
+		guiChemicalCraftingTableID = guiChemicalCraftingTableIDProp.getInt();
 
 		cfg.save();
 	}
@@ -143,8 +143,8 @@ public class ChemiCraft {
 		NameAuxiliary.addName(itemCompounds, "ja_JP", ChemiCraftAPI.getCompoundsLangName().toArray());
 
 		// Blockを追加します
-		blockScienceCraftingTable = new BlockScienceCraftingTable(scienceCraftingTableID, Block.workbench.blockIndexInTexture, Material.ground)
-		.setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ScienceCraftingTable");
+		blockChemicalCraftingTable = new BlockChemicalCraftingTable(chemicalCraftingTableID, Block.workbench.blockIndexInTexture, Material.ground)
+		.setHardness(2.0F).setResistance(0.0F).setStepSound(Block.soundStoneFootstep).setBlockName("ChemicalCraftingTable");
 
 		// Itemを追加します
 		itemAtoms = new ItemAtoms(atomsID).setItemName("atoms");
@@ -152,11 +152,11 @@ public class ChemiCraft {
 		itemGasCollectingBottle = new ItemGasCollectingBottle(gasCollectingBottleID).setItemName("gasCollectingBottle");
 
 		// BlockをMinecraftに登録します
-		GameRegistry.registerBlock(blockScienceCraftingTable);
+		GameRegistry.registerBlock(blockChemicalCraftingTable);
 
 		// Blockの名前を設定します
-		NameAuxiliary.addName(blockScienceCraftingTable, "ScienceCraftingTable");
-		NameAuxiliary.addName(blockScienceCraftingTable, "ja_JP", "科学作業台");
+		NameAuxiliary.addName(blockChemicalCraftingTable, "ChemicalCraftingTable");
+		NameAuxiliary.addName(blockChemicalCraftingTable, "ja_JP", "科学作業台");
 
 		// Itemの名前を設定します
 		NameAuxiliary.addName(itemAtoms, atomsName);
@@ -168,7 +168,7 @@ public class ChemiCraft {
 		ChemiCraftAPI.addLangCompound("ja_JP", "Salt", "å¡©");
 
 		// TileEntityを追加します
-		GameRegistry.registerTileEntity(TileEntityScienceCraftingTable.class, "TileEntityScienceCraftingTable");
+		GameRegistry.registerTileEntity(TileEntityChemicalCraftingTable.class, "TileEntityChemicalCraftingTable");
 
 		// GUIを追加します
 		NetworkRegistry.instance().registerGuiHandler(instance, proxy);