OSDN Git Service

修正・変更
authorponkotate <ponkotate@users.sourceforge.jp>
Fri, 12 Apr 2013 11:26:06 +0000 (20:26 +0900)
committerponkotate <ponkotate@users.sourceforge.jp>
Fri, 12 Apr 2013 11:26:06 +0000 (20:26 +0900)
・名前のつづりがあっていなかったので修正
・鉱石テクスチャの実装(ランタノイド・アクチノイドは未実装)
・電解台のインベントリ名を修正
・Slotの修正
・Formulaクラスの修正

15 files changed:
common/pcc/chemicraft/base/ChemiCraftBase.java
common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
common/pcc/chemicraft/base/ore/BlockAtomOres.java
common/pcc/chemicraft/core/ChemiCraftCore.java
common/pcc/chemicraft/core/ChemiCraftRegisterItem.java
common/pcc/chemicraft/core/inventory/InventoryElectrolysisFuel.java
common/pcc/chemicraft/core/inventory/InventoryElectrolysisMaterial.java
common/pcc/chemicraft/core/inventory/InventoryElectrolysisResult.java
common/pcc/chemicraft/core/item/ItemAtoms.java
common/pcc/chemicraft/core/slot/SlotElectrolysisFuel.java
common/pcc/chemicraft/core/slot/SlotPyrolysisTableFuel.java
common/pcc/chemicraft/util/Formula.java
resources/mods/ChemiCraft/textures/blocks/AtomsOre_WIP.png [deleted file]
resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/AtomsOre.png [deleted file]
resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/colors.txt [deleted file]

index bce1fc9..cc2abdb 100644 (file)
@@ -101,7 +101,7 @@ public class ChemiCraftBase extends ChemiCraft {
        /**
         * the Textures
         */
-       public static final String ORE = ChemiCraft.TEXTURE + "AtomsOre_";
+       public static final String ORE = ChemiCraft.TEXTURE + "atoms_ore_";
 
        public ChemiCraftBase() {
                this.registerCompounds = new ChemiCraftRegisterCompounds(this);
index a9e5163..98b51e3 100644 (file)
@@ -34,7 +34,7 @@ public class ChemiCraftRegisterItem extends ChemiCraftBaseRegister {
                this.mod.nameAuxiliary.addName(this.mod.itemDust, "ja_JP", "粉塵");
                this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "RadiationGun");
                this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "ja_JP", "放射線銃");
-               this.mod.nameAuxiliary.addName(this.mod.itemRadiationBallet, "RadiationBallet");
+               this.mod.nameAuxiliary.addName(this.mod.itemRadiationBallet, "RadiationBullet");
                this.mod.nameAuxiliary.addName(this.mod.itemRadiationGun, "ja_JP", "放射線弾");
                this.mod.nameAuxiliary.addName(this.mod.itemBlackSmoke, "BlackSmoke");
                this.mod.nameAuxiliary.addName(this.mod.itemBlackSmoke, "ja_JP", "黒煙");
index 54b6613..db8b59e 100644 (file)
@@ -1,5 +1,6 @@
 package pcc.chemicraft.base.ore;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.block.Block;
@@ -10,7 +11,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import pcc.chemicraft.base.ChemiCraftBase;
 import pcc.chemicraft.base.ChemiCraftBaseAPI;
-import pcc.chemicraft.core.ChemiCraftCore;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -31,11 +31,16 @@ public class BlockAtomOres extends Block {
        @Override
        @SideOnly(Side.CLIENT)
        public void registerIcons(IconRegister par1IconRegister) {
-               this.iconArray = new Icon[ChemiCraftCore.ATOMSNAME.length];
+               ArrayList<String> atomNames = ChemiCraftBaseAPI.instance().getAtomOresAtomName();
+               this.iconArray = new Icon[atomNames.size()];
 
                for (int i = 0; i < this.iconArray.length; i++){
-                       this.iconArray[i] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + "WIP");
+                       this.iconArray[i] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + atomNames.get(i));
                }
+
+               // WIP
+               this.iconArray[iconArray.length - 1] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + "WIP");
+               this.iconArray[iconArray.length - 2] = par1IconRegister.registerIcon(ChemiCraftBase.ORE + "WIP");
        }
 
        @Override
index 1c27401..5c7c043 100644 (file)
@@ -66,7 +66,7 @@ public class ChemiCraftCore extends ChemiCraft{
         * 元素名日本語版配列
         */
        public static final String[] ATOMSNAMEJP = {
-               "水素", "ヘリウム", "リチウム", "ベリウム", "ホウ素", "炭素", "窒素", "酸素", "フッ素", "ネオン", "ナトリウム", "マグネシウム", "アルミニウム", "ケイ素", "リン", "硫黄", "塩素", "アルゴン", "カリウム", "カルシウム", "スカンジウム",
+               "æ°´ç´ ", "ã\83\98ã\83ªã\82¦ã\83 ", "ã\83ªã\83\81ã\82¦ã\83 ", "ã\83\99ã\83ªã\83ªã\82¦ã\83 ", "ã\83\9bã\82¦ç´ ", "ç\82­ç´ ", "çª\92ç´ ", "é\85¸ç´ ", "ã\83\95ã\83\83ç´ ", "ã\83\8dã\82ªã\83³", "ã\83\8aã\83\88ã\83ªã\82¦ã\83 ", "ã\83\9eã\82°ã\83\8dã\82·ã\82¦ã\83 ", "ã\82¢ã\83«ã\83\9fã\83\8bã\82¦ã\83 ", "ã\82±ã\82¤ç´ ", "ã\83ªã\83³", "ç¡«é»\84", "å¡©ç´ ", "ã\82¢ã\83«ã\82´ã\83³", "ã\82«ã\83ªã\82¦ã\83 ", "ã\82«ã\83«ã\82·ã\82¦ã\83 ", "ã\82¹ã\82«ã\83³ã\82¸ã\82¦ã\83 ",
                "チタン", "バナジウム", "クロム", "マンガン", "鉄", "コバルト", "ニッケル", "銅", "亜鉛", "ガリウム", "ゲルマニウム", "ヒ素", "セレン", "臭素", "クリプトン", "ルビジウム", "ストロンチウム", "イットリウム", "ジルコニウム", "ニオブ", "モリブデン", "テクネチウム", "ルテニウム",
                "ロジウム", "パラジウム", "銀", "カドミウム", "インジウム", "スズ", "アンチモン", "テルル", "ヨウ素", "キセノン", "セシウム", "バリウム", "ランタン", "セリウム", "プラセオジム", "ネオジム", "プロメチウム", "サマリウム", "ユウロビウム", "ガドリニウム", "テルビウム", "ジスプロニウム",
                "ホルミウム", "エルビウム", "ツリウム", "イッテルビウム", "ルテチウム", "ハフニウム", "タンタル", "タングステン", "レニウム", "オスミウム", "イリジウム", "白金", "金", "水銀", "タリウム", "鉛", "ビスマス", "ポロニウム", "アスタチン", "ラドン", "フランシウム", "ラジウム",
@@ -277,6 +277,7 @@ public class ChemiCraftCore extends ChemiCraft{
                NetworkRegistry.instance().registerGuiHandler(instance, proxy);
 
                this.api.addPyrolysisDecompositionFuel(new ItemStack(Item.coal), 2000*8);
+               this.api.addElectrolysisDecompositionFuel(new ItemStack(this.itemChemicalCells), 1000*8);
        }
 
 
index 6d26999..1863941 100644 (file)
@@ -32,14 +32,13 @@ public class ChemiCraftRegisterItem extends ChemiCraftCoreRegister {
                                }
                        }.setCreativeTab(CreativeTabs.tabFood).setUnlocalizedName(ChemiCraft.TEXTURE + "Pear");
 
-                       //名前登録&Minecraftに登録
+               //名前登録&Minecraftに登録
                this.mod.nameAuxiliary.addName(this.mod.itemAtoms, ChemiCraftCore.ATOMSNAME);
                this.mod.nameAuxiliary.addName(this.mod.itemAtoms, "ja_JP", ChemiCraftCore.ATOMSNAMEJP);
                this.mod.nameAuxiliary.addName(this.mod.itemGasCollectingBottle, "GasCollectingBottle");
                this.mod.nameAuxiliary.addName(this.mod.itemGasCollectingBottle, "ja_JP", "集気瓶");
                this.mod.nameAuxiliary.addName(this.mod.itemChemicalCells, "ChemicalCell");
                this.mod.nameAuxiliary.addName(this.mod.itemChemicalCells, "ja_JP",  "化学電池");
-               this.mod.api.addElectrolysisDecompositionFuel(new ItemStack(this.mod.itemChemicalCells), 1000);
                this.mod.nameAuxiliary.addName(this.mod.itemPear, "Pear");
                this.mod.nameAuxiliary.addName(this.mod.itemPear, "ja_JP",  "梨");
 
index 3a0f57c..ff8e369 100644 (file)
@@ -62,7 +62,7 @@ public class InventoryElectrolysisFuel implements IInventory
        @Override
        public String getInvName()
        {
-               return "ChemicalCraftingInventory";
+               return "ElectrolysisTableInventory";
        }
 
        @Override
index b4fbd1f..65ffc5b 100644 (file)
@@ -62,7 +62,7 @@ public class InventoryElectrolysisMaterial implements IInventory
        @Override
        public String getInvName()
        {
-               return "ChemicalCraftingInventory";
+               return "ElectrolysisTableInventory";
        }
 
        @Override
index dbf35f8..4475c98 100644 (file)
@@ -62,7 +62,7 @@ public class InventoryElectrolysisResult implements IInventory
        @Override
        public String getInvName()
        {
-               return "ChemicalCraftingInventory";
+               return "ElectrolysisTableInventory";
        }
 
        @Override
index da85e5e..9962ffc 100644 (file)
@@ -74,16 +74,7 @@ public class ItemAtoms extends Item {
 
        @Override
        public String getUnlocalizedName(ItemStack par1ItemStack){
-               return super.getUnlocalizedName() + "." + ChemiCraftCore.instance.ATOMSNAME[par1ItemStack.getItemDamage()];
+               return super.getUnlocalizedName() + ChemiCraftCore.instance.ATOMSNAME[par1ItemStack.getItemDamage()];
        }
 
-
-
-       /* 一時保留。詳しいことが決まるまで変更が難しいため。 --WIP--
-       @Override
-       public String getTextureFile(){
-               return ChemiCraft.ITEM_ATOMS_TEXTURE;
-       }
-        */
-
 }
\ No newline at end of file
index c3b633d..aa14479 100644 (file)
@@ -1,7 +1,11 @@
 package pcc.chemicraft.core.slot;
 
+import java.util.Iterator;
+
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import pcc.chemicraft.core.ChemiCraftAPI;
 
 public class SlotElectrolysisFuel extends Slot
 {
@@ -10,4 +14,16 @@ public class SlotElectrolysisFuel extends Slot
                super(par1iInventory, par2, par3, par4);
        }
 
+       @Override
+       public boolean isItemValid(ItemStack par1ItemStack) {
+               Iterator<ItemStack> itFuel = ChemiCraftAPI.getElectrolysisFuelList().keySet().iterator();
+               while (itFuel.hasNext()) {
+                       ItemStack fuel = itFuel.next();
+                       if (par1ItemStack != null && par1ItemStack.itemID == fuel.itemID) {
+                               return true;
+                       }
+               }
+               return false;
+       }
+
 }
index 72fbb99..3ab1389 100644 (file)
@@ -1,7 +1,11 @@
 package pcc.chemicraft.core.slot;
 
+import java.util.Iterator;
+
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import pcc.chemicraft.core.ChemiCraftAPI;
 
 public class SlotPyrolysisTableFuel extends Slot {
 
@@ -9,4 +13,16 @@ public class SlotPyrolysisTableFuel extends Slot {
                super(par1IInventory, par2, par3, par4);
        }
 
+       @Override
+       public boolean isItemValid(ItemStack par1ItemStack) {
+               Iterator<ItemStack> itFuel = ChemiCraftAPI.getPyrolysisFuelList().keySet().iterator();
+               while (itFuel.hasNext()) {
+                       ItemStack fuel = itFuel.next();
+                       if (par1ItemStack != null && par1ItemStack.itemID == fuel.itemID) {
+                               return true;
+                       }
+               }
+               return false;
+       }
+
 }
index 2a9faba..148c7cd 100644 (file)
@@ -26,12 +26,13 @@ public class Formula {
                this.amonts = par2;
        }
 
+       // 今後ソースの整頓をする予定 -WIP-
        public void run(String par1) {
-               char[] var2 = par1.toCharArray();
-               String var3 = null;
-               int var4 = 0;
-               int var5 = 1;
-               Formula var6 = null;
+               char[] var2 = par1.toCharArray(); // par1のchar配列
+               String var3 = null; // setAtomの第一引数に送る
+               int var4 = 0; // setAtomの第二引数に送る
+               int var5 = 1; // 倍率
+               Formula var6 = null; // Formula格納用
 
                for (int i = 0; i < var2.length; i++) {
                        if (Character.isLetter(var2[i])) {
@@ -81,6 +82,9 @@ public class Formula {
                        }
                }
                if (var3 != null) {
+                       if (var4 < 0) {
+                               var4 = 1;
+                       }
                        this.setAtom(var3,  var4 * var5);
                }
        }
diff --git a/resources/mods/ChemiCraft/textures/blocks/AtomsOre_WIP.png b/resources/mods/ChemiCraft/textures/blocks/AtomsOre_WIP.png
deleted file mode 100644 (file)
index dc85615..0000000
Binary files a/resources/mods/ChemiCraft/textures/blocks/AtomsOre_WIP.png and /dev/null differ
diff --git a/resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/AtomsOre.png b/resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/AtomsOre.png
deleted file mode 100644 (file)
index 91bed07..0000000
Binary files a/resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/AtomsOre.png and /dev/null differ
diff --git a/resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/colors.txt b/resources/mods/ChemiCraft/textures/blocks/AtomsOre_未カット/colors.txt
deleted file mode 100644 (file)
index 1a62e54..0000000
+++ /dev/null
@@ -1 +0,0 @@
-\8bâ\94\92 \93º \90Ô \8d\95 \8aD\94\92 \88Ã\8a\89© \89©\8bà \8bâ\8aD
\ No newline at end of file