OSDN Git Service

ファイルパス色々変更。
authormozipi <mozipi_2@yahoo.co.jp>
Tue, 2 Apr 2013 03:51:28 +0000 (12:51 +0900)
committermozipi <mozipi_2@yahoo.co.jp>
Tue, 2 Apr 2013 03:51:28 +0000 (12:51 +0900)
仕様書関連をすべて仕様書フォルダへ。

1.5からのTexture仕様変更について.odtを/仕様書/に追加。

現在エラー修正中なので、エラー吐きまくってます。

28 files changed:
common/pcc/chemicraft/ChemiCraft.java
common/pcc/chemicraft/base/ChemiCraftBase.java
common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
common/pcc/chemicraft/base/ChemiCraftRegisterBlock.java
common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
common/pcc/chemicraft/base/entity/EntityAtomsGrenade.java
common/pcc/chemicraft/base/item/ItemAtomsGrenade.java
common/pcc/chemicraft/base/item/ItemBlackSmoke.java
common/pcc/chemicraft/base/item/ItemOreSerarcher.java
common/pcc/chemicraft/base/item/ItemRadiationBallet.java
resources/mods/ChemiCraft/textures/blocks/AtomsOre.png [moved from resources/pcc/chemicraft/blocks/AtomsOre.png with 100% similarity]
resources/mods/ChemiCraft/textures/blocks/cctable.png [moved from resources/pcc/chemicraft/blocks/cctable.png with 100% similarity]
resources/mods/ChemiCraft/textures/blocks/colors.txt [moved from resources/pcc/chemicraft/blocks/colors.txt with 100% similarity]
resources/mods/ChemiCraft/textures/entityParticles/dust.png [moved from resources/pcc/chemicraft/entityParticles/dust.png with 100% similarity]
resources/mods/ChemiCraft/textures/guis/ChemicalCombination.png [moved from resources/pcc/chemicraft/guis/ChemicalCombination.png with 100% similarity]
resources/mods/ChemiCraft/textures/guis/Electrolysis.png [moved from resources/pcc/chemicraft/guis/Electrolysis.png with 100% similarity]
resources/mods/ChemiCraft/textures/guis/MaterialCrafting.png [moved from resources/pcc/chemicraft/guis/MaterialCrafting.png with 100% similarity]
resources/mods/ChemiCraft/textures/guis/Pyrolysis.png [moved from resources/pcc/chemicraft/guis/Pyrolysis.png with 100% similarity]
resources/mods/ChemiCraft/textures/guis/ToolAndWeaponCrafting.png [moved from resources/pcc/chemicraft/guis/ToolAndWeaponCrafting.png with 100% similarity]
resources/mods/ChemiCraft/textures/items/Atoms.png [moved from resources/pcc/chemicraft/items/Atoms.png with 100% similarity]
resources/mods/ChemiCraft/textures/items/Compounds.png [moved from resources/pcc/chemicraft/items/Compounds.png with 100% similarity]
resources/mods/ChemiCraft/textures/items/items.png [moved from resources/pcc/chemicraft/items/items.png with 100% similarity]
仕様書/1.5からのTextureの仕様変更について.odt [new file with mode: 0644]
仕様書/ChemiCraftOres.ods [moved from ChemiCraftOres.ods with 100% similarity]
仕様書/ChemiCraft仕様書.docx [moved from ChemiCraft仕様書.docx with 100% similarity]
仕様書/ChemiCraft仕様書.html [moved from ChemiCraft仕様書.html with 100% similarity]
仕様書/ChemiCraft仕様書.odt [moved from ChemiCraft仕様書.odt with 100% similarity]
仕様書/ChemiCraft仕様書xhtml.html [moved from ChemiCraft仕様書xhtml.html with 96% similarity]

index 6515fe0..828960a 100644 (file)
@@ -39,18 +39,13 @@ public abstract class ChemiCraft implements Runnable {
        /**
         * this is Textures Path on ChemiCraft.
         */
-       public static final String ITEM_ATOMS_TEXTURE = "/pcc/chemicraft/items/Atoms.png";
-       public static final String ITEM_COMPOUNDS_TEXTURE = "/pcc/chemicraft/items/Compounds.png";
-       public static final String ITEM_VEGETABLES_TEXTURE = "/pcc/chemicraft/items/Vegetables.png";
-       public static final String ITEM_TEXTURE = "/pcc/chemicraft/items/items.png";
-       public static final String BLOCK_CHEMICAL_CRAFTING_TABLE_TEXTURE = "/pcc/chemicraft/blocks/cctable.png";
-       public static final String BLOCK_ATOMS_ORE_TEXTURE = "/pcc/chemicraft/blocks/AtomsOre.png";
-       public static final String BLOCK_VEGETABLES_TEXTURE = "/pcc/chemicraft/blocks/Vegetables.png";
-       public static final String GUI_PYROLYSIS_TEXTURE = "/pcc/chemicraft/guis/Pyrolysis.png";
-       public static final String GUI_ELECTROLYSIS_TEXTURE = "/pcc/chemicraft/guis/Electrolysis.png";
-       public static final String GUI_CHEMICALCOMBINATION_TEXTURE = "/pcc/chemicraft/guis/ChemicalCombination.png";
-       public static final String GUI_TOOLANDWEAPONCRAFTING_TEXTURE = "/pcc/chemicraft/guis/ToolAndWeaponCrafting.png";
-       public static final String GUI_CHEMICALCRAFTING_TEXTURE = "/pcc/chemicraft/guis/MaterialCrafting.png";
-       public static final String ENTITY_PARTICLE_TEXRURE = "/pcc/chemicraft/entityParticles/dust.png";
+       public static final String ITEM_TEXTURE = "ChemiCraft:";
+       public static final String BASE_PATH = "mods/ChemiCraft/textures";
+       public static final String GUI_PYROLYSIS_TEXTURE = BASE_PATH + "/guis/Pyrolysis.png";
+       public static final String GUI_ELECTROLYSIS_TEXTURE = BASE_PATH + "/guis/Electrolysis.png";
+       public static final String GUI_CHEMICALCOMBINATION_TEXTURE = BASE_PATH + "/guis/ChemicalCombination.png";
+       public static final String GUI_TOOLANDWEAPONCRAFTING_TEXTURE = BASE_PATH + "/guis/ToolAndWeaponCrafting.png";
+       public static final String GUI_CHEMICALCRAFTING_TEXTURE = BASE_PATH + "/guis/MaterialCrafting.png";
+       public static final String ENTITY_PARTICLE_TEXRURE = BASE_PATH + "/entityParticles/dust.png";
 
 }
\ No newline at end of file
index 77909d9..8e05e8e 100644 (file)
@@ -68,6 +68,7 @@ public class ChemiCraftBase extends ChemiCraft {
        public int dustID;
        public int radiationGunID;
        public int radiationBalletID;
+       public int oreSerarcherID;
 
        /**
         * the BlockID.
@@ -87,6 +88,7 @@ public class ChemiCraftBase extends ChemiCraft {
        public Item itemDust;
        public Item itemRadiationGun;
        public Item itemRadiationBallet;
+       public Item itemOreSearcher;
 
        /**
         * the Register Instances.
@@ -179,6 +181,7 @@ public class ChemiCraftBase extends ChemiCraft {
                this.radiationGunID = ccfgItem.additionID();
                this.radiationBalletID = ccfgItem.additionID();
                this.blackSmokeID = ccfgItem.additionID();
+               this.oreSerarcherID = ccfgItem.additionID();
 
                cfg.save();
        }
index bf8412e..a4a2f6c 100644 (file)
@@ -54,6 +54,10 @@ public class ChemiCraftBaseAPI {
        private ListHash<String, String> atomOresNameListHash = new ListHash<String, String>();
 
 
+       /**
+        * 鉱石の英語名リスト
+        */
+       private ArrayList<String> atomOresEnglishList = new ArrayList<String>();
 
        /**
         * 鉱石を追加します。
@@ -80,6 +84,7 @@ public class ChemiCraftBaseAPI {
                        var7 = var7.concat(" Ore");
                }
 
+               this.atomOresEnglishList.add(par1Name + " Ore");
                addAtomOresLanguage(par1Name, var7, "en_US");
        }
 
@@ -154,4 +159,10 @@ public class ChemiCraftBaseAPI {
                return atomOresNameListHash;
        }
 
+
+
+       public String getAtomOreEnglishName(int index) {
+               return this.atomOresEnglishList.get(index);
+       }
+
 }
index 733e3f9..7a217ea 100644 (file)
@@ -23,7 +23,7 @@ public class ChemiCraftRegisterBlock extends ChemiCraftBaseRegister {
                for (int i = 0; i < this.mod.blockAtomOres.length; i++) {
                        this.mod.blockAtomOres[i] = new BlockAtomOres(this.mod.atomOresID[i]).
                                        setHardness(3.0F).setResistance(0.0F).
-                                       setStepSound(Block.soundStoneFootstep).setBlockName("AtomsOre" + i);
+                                       setStepSound(Block.soundStoneFootstep).setUnlocalizedName("BlockAtomsOre");
                        //鉱石をMinecraftに登録
                        GameRegistry.registerBlock(this.mod.blockAtomOres[i], ItemAtomOres.class, "AtomsOre" + i);
                        //回収&最適に破壊できるピッケルのレベルを設定
index fc60582..d90cb71 100644 (file)
@@ -3,6 +3,7 @@ package pcc.chemicraft.base;
 import pcc.chemicraft.base.item.ItemAtomsGrenade;
 import pcc.chemicraft.base.item.ItemBlackSmoke;
 import pcc.chemicraft.base.item.ItemDust;
+import pcc.chemicraft.base.item.ItemOreSerarcher;
 import pcc.chemicraft.base.item.ItemRadiationBallet;
 import pcc.chemicraft.base.item.ItemRadiationGun;
 
@@ -19,11 +20,12 @@ public class ChemiCraftRegisterItem extends ChemiCraftBaseRegister {
        @Override
        public void start() {
                //アイテムを変数に代入
-               this.mod.itemAtomGrenade = new ItemAtomsGrenade(this.mod.atomGrenadeID).setItemName("grenade").setIconIndex(1);
-               this.mod.itemDust = new ItemDust(this.mod.dustID).setItemName("dust").setIconIndex(12);
-               this.mod.itemRadiationGun = new ItemRadiationGun(this.mod.radiationGunID).setIconIndex(4).setItemName("RadiationGun");
-               this.mod.itemRadiationBallet = new ItemRadiationBallet(this.mod.radiationBalletID).setIconIndex(5).setItemName("RadiationBallet");
-               this.mod.itemBlackSmoke = new ItemBlackSmoke(this.mod.blackSmokeID).setIconIndex(7).setItemName("BlackSmoke");
+               this.mod.itemAtomGrenade = new ItemAtomsGrenade(this.mod.atomGrenadeID).setUnlocalizedName("AtomsGrenade");
+               this.mod.itemDust = new ItemDust(this.mod.dustID).setUnlocalizedName("dust");
+               this.mod.itemRadiationGun = new ItemRadiationGun(this.mod.radiationGunID).setUnlocalizedName("RadiationGun");
+               this.mod.itemRadiationBallet = new ItemRadiationBallet(this.mod.radiationBalletID).setUnlocalizedName("RadiationBallet");
+               this.mod.itemBlackSmoke = new ItemBlackSmoke(this.mod.blackSmokeID).setUnlocalizedName("BlackSmoke");
+               this.mod.itemOreSearcher = new ItemOreSerarcher(this.mod.oreSerarcherID).setUnlocalizedName("oreSearcher");
 
                //名前を登録&Minecraftに登録
                this.mod.nameAuxiliary.addName(this.mod.itemAtomGrenade, "AtomGrenade");
@@ -36,6 +38,8 @@ public class ChemiCraftRegisterItem extends ChemiCraftBaseRegister {
                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", "黒煙");
+               this.mod.nameAuxiliary.addName(this.mod.itemOreSearcher, "OreSearcher");
+               this.mod.nameAuxiliary.addName(this.mod.itemOreSearcher, "ja_JP", "鉱石情報探知機");
        }
 
 }
index 5f5bf19..6d90d89 100644 (file)
@@ -50,7 +50,7 @@ public class EntityAtomsGrenade extends EntityThrowable {
                }
 
                if (par1MovingObjectPosition.entityHit != null) {
-                       par1MovingObjectPosition.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.func_85052_h()), 2);
+                       par1MovingObjectPosition.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), 2);
                        par1MovingObjectPosition.entityHit.setFire(5);
                }
 
index 6050964..2b522b5 100644 (file)
@@ -2,6 +2,7 @@ package pcc.chemicraft.base.item;
 
 import java.util.List;
 
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -79,8 +80,8 @@ public class ItemAtomsGrenade extends Item {
        }
 
        @Override
-       public String getTextureFile(){
-               return ChemiCraft.ITEM_TEXTURE;
+       public void updateIcons(IconRegister par1IconRegister){
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.ITEM_TEXTURE + "ItemAtomsGrenade");
        }
 
 }
index 477d30b..a3b9db5 100644 (file)
@@ -2,6 +2,7 @@ package pcc.chemicraft.base.item;
 
 import java.util.HashMap;
 
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.monster.EntityMob;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -54,8 +55,8 @@ public class ItemBlackSmoke extends Item {
        }
 
        @Override
-       public String getTextureFile() {
-               return ChemiCraft.ITEM_TEXTURE;
+       public void updateIcons(IconRegister par1IconRegister){
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.ITEM_TEXTURE + "ItemBlackSmoke");
        }
 
 }
index d7ca81a..ca38707 100644 (file)
@@ -1,50 +1,73 @@
 package pcc.chemicraft.base.item;
 
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.SideOnly;
+import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.base.ChemiCraftBase;
+import pcc.chemicraft.core.ChemiCraftCore;
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.StringTranslate;
 import net.minecraft.world.World;
 
 public class ItemOreSerarcher extends Item {
 
        public ItemOreSerarcher(int par1) {
                super(par1);
+               this.setHasSubtypes(true);
                this.setMaxStackSize(1);
+               this.setMaxDamage(0);
+               this.setCreativeTab(ChemiCraftCore.creativeTabChemiCraft);
        }
 
        @Override
        public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
                for (int i = 0; i < ChemiCraftBase.instance.atomOresID.length; i++) {
                        if (par3World.getBlockId(par4, par5, par6) == ChemiCraftBase.instance.atomOresID[i]) {
-                               if (par1ItemStack.getTagCompound() == null) par1ItemStack.stackTagCompound = new NBTTagCompound();
-                               par1ItemStack.getTagCompound().setString("OreName", ChemiCraftBase.instance.blockAtomOres[i].getBlockName());
+                               if (par1ItemStack.getTagCompound() == null) {
+                                       par1ItemStack.stackTagCompound = new NBTTagCompound();
+                               }
+                               if (par3World.isRemote) {
+                                       this.changeItem(par2EntityPlayer);
+                               }
+                               String blockName = ChemiCraftBase.instance.apiBase.getAtomOreEnglishName(
+                                               (Math.abs(ChemiCraftBase.instance.atomOresID[ChemiCraftBase.instance.atomOresID.length-1] -
+                                                               (par3World.getBlockId(par4, par5, par6) + 3))) * 16 +
+                                                               par3World.getBlockMetadata(par4, par5, par6));
+                               par1ItemStack.getTagCompound().setString("OreName", blockName);
                        }
                }
                return true;
        }
 
+       public void changeItem(EntityPlayer par1EntityPlayer) {
+               par1EntityPlayer.inventory.inventoryChanged = true;
+       }
+
        @Override
        public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
+               this.changeItem(par3EntityPlayer);
                return par1ItemStack;
        }
 
-
-
-       @Override
-       public String getItemNameIS(ItemStack par1ItemStack) {
+       public String getItemDisplayName(ItemStack par1ItemStack) {
                if (par1ItemStack.getTagCompound() != null) {
-                       return super.getItemName() + "." + par1ItemStack.getTagCompound().getString("OreName");
+                       return "OreSearcher:" + par1ItemStack.getTagCompound().getString("OreName");
                }
-               return super.getItemName();
+               return "OreSearcher";
        }
 
        @Override
        public boolean getShareTag() {
-               return super.getShareTag();
+               return true;
        }
 
-
+       @Override
+       public void updateIcons(IconRegister par1IconRegister){
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.ITEM_TEXTURE + "ItemOreSearcher");
+       }
 
 }
index 4ca241f..1af99ed 100644 (file)
@@ -1,5 +1,6 @@
 package pcc.chemicraft.base.item;
 
+import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.item.Item;
 import pcc.chemicraft.ChemiCraft;
 import pcc.chemicraft.core.ChemiCraftCore;
@@ -17,8 +18,7 @@ public class ItemRadiationBallet extends Item {
        }
 
        @Override
-       public String getTextureFile() {
-               return ChemiCraft.ITEM_TEXTURE;
+       public void updateIcons(IconRegister par1IconRegister){
+               this.iconIndex = par1IconRegister.registerIcon(ChemiCraft.ITEM_TEXTURE + "ItemRadiationBullet");
        }
-
 }
diff --git a/仕様書/1.5からのTextureの仕様変更について.odt b/仕様書/1.5からのTextureの仕様変更について.odt
new file mode 100644 (file)
index 0000000..6de139f
Binary files /dev/null and b/仕様書/1.5からのTextureの仕様変更について.odt differ
similarity index 96%
rename from ChemiCraft仕様書xhtml.html
rename to 仕様書/ChemiCraft仕様書xhtml.html
index 333d32d..8a9bf95 100644 (file)
@@ -1,61 +1,61 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">\r
-\r
-  <head>\r
-    <style type="text/css">\r
-      body{\r
-        width:640px;\r
-      }\r
-      #L{\r
-        color:blue;\r
-      }\r
-      #R{\r
-        color:black\r
-      }\r
-      #L2{\r
-                               color: blue;\r
-                               font-size: xx-large;\r
-}\r
-      #R2{\r
-                               color: black;\r
-                               font-size: xx-large;\r
-}\r
-      h2{\r
-                               color: black;\r
-                               font-size: xx-large;\r
-                               text-align: center;\r
-}\r
-   </style>\r
-  </head>\r
-  <body>\r
-      <h1>ChemiCraft仕様書</h1><br />\r
-      <div>\r
-        <span id="L">権利元:</span>\r
-        <span id="R">Project Chemi Craft</span><br />\r
-        <span id="L">ライセンス:</span>\r
-        <span id="R">newBSD</span>\r
-      </div>\r
-    <div id="body">\r
-      <h2>基本情報</h2>\r
-      <div id="1">\r
-        <span id="L2">ProjectName:</span>\r
-        <span id="R2">Project Chemi Craft</span><br/>\r
-        <span id="L2">代表:</span>\r
-        <span id="R2">ponkotate</span><br/>\r
-        <span id="L2">副代表:</span>\r
-        <span id="R2">mozipi,inaka</span><br/>\r
-        <span id="L2">ホームページ:</span>\r
-        <span id="R2"><a href="http://chemicraft.sourceforge.jp/">http://chemicraft.sourceforge.jp/</a></span><br/>\r
-        <span id="L2">Twitterアカウント:</span>\r
-        <span id="R2"><a href="https://twitter.com/chemicraft">@chemicraft</a></span><br/>\r
-      </div>\r
-      <div id="2">\r
-        <h2>開発環境(2013/01/04時点)</h2>\r
-        <span id="R2">Minecraft1.4.6</span><br/>\r
-        <span id="R2">MCP725</span><br/>\r
-        <span id="R2">MinecraftForge6.5.0.489</span><br/>\r
-        <span id="R2">IC2API v1.112</span><br/>\r
-      </div>\r
-    </div>\r
-  </body>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
+
+  <head>
+    <style type="text/css">
+      body{
+        width:640px;
+      }
+      #L{
+        color:blue;
+      }
+      #R{
+        color:black
+      }
+      #L2{
+                               color: blue;
+                               font-size: xx-large;
+}
+      #R2{
+                               color: black;
+                               font-size: xx-large;
+}
+      h2{
+                               color: black;
+                               font-size: xx-large;
+                               text-align: center;
+}
+   </style>
+  </head>
+  <body>
+      <h1>ChemiCraft仕様書</h1><br />
+      <div>
+        <span id="L">権利元:</span>
+        <span id="R">Project Chemi Craft</span><br />
+        <span id="L">ライセンス:</span>
+        <span id="R">newBSD</span>
+      </div>
+    <div id="body">
+      <h2>基本情報</h2>
+      <div id="1">
+        <span id="L2">ProjectName:</span>
+        <span id="R2">Project Chemi Craft</span><br/>
+        <span id="L2">代表:</span>
+        <span id="R2">ponkotate</span><br/>
+        <span id="L2">副代表:</span>
+        <span id="R2">mozipi,inaka</span><br/>
+        <span id="L2">ホームページ:</span>
+        <span id="R2"><a href="http://chemicraft.sourceforge.jp/">http://chemicraft.sourceforge.jp/</a></span><br/>
+        <span id="L2">Twitterアカウント:</span>
+        <span id="R2"><a href="https://twitter.com/chemicraft">@chemicraft</a></span><br/>
+      </div>
+      <div id="2">
+        <h2>開発環境(2013/01/04時点)</h2>
+        <span id="R2">Minecraft1.4.6</span><br/>
+        <span id="R2">MCP725</span><br/>
+        <span id="R2">MinecraftForge6.5.0.489</span><br/>
+        <span id="R2">IC2API v1.112</span><br/>
+      </div>
+    </div>
+  </body>
 </html>
\ No newline at end of file