* this is Textures Path on ChemiCraft.
*/
public static final String TEXTURE = "ChemiCraft:";
- public static final String BASE_PATH = "mods/ChemiCraft/textures";
+ 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";
import pcc.chemicraft.base.creativetab.CreativeTabAtomOres;
import pcc.chemicraft.base.system.CommonProxy;
import pcc.chemicraft.base.system.PacketHandler;
-import pcc.chemicraft.core.ChemiCraftAPI;
import pcc.chemicraft.core.ChemiCraftCore;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.LoaderState.ModState;
import cpw.mods.fml.common.registry.LanguageRegistry;
@Mod(modid = "ChemiCraftBase", name = "ChemiCraftBase", version = "beta1")
-@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.7", channels = "chemicraftbase", packetHandler = PacketHandler.class)
+@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.5", channels = "chemicraftbase", packetHandler = PacketHandler.class)
public class ChemiCraftBase extends ChemiCraft {
/**
String lang = langoresItr.next();
ArrayList<String> names = this.apiBase.getAtomOresName().get(lang);
for (int i = 0; i < names.size(); i++) {
- ChemiCraftCore.logger.write("AtomOresAddName:" + "Name-" + names.get(i) + "/Damage-" + (i - i / 16 * 16) + "/Lang-" + lang,
+ ChemiCraftCore.logger.write("AtomOresAddName:" + "Name-" + names.get(i) + "ID-" + (i / 16)+ "/Damage-" + (i - i / 16 * 16) + "/Lang-" + lang,
EnumLoggingType.INFO);
LanguageRegistry.instance().addNameForObject(
/**
* 鉱石の英語名リスト
*/
- private ArrayList<String> atomOresEnglishList = new ArrayList<String>();
+ private ArrayList<String> atomOresAtomList = new ArrayList<String>();
/**
* 鉱石を追加します。
par5Frequency,
par6PosY));
+ atomOresAtomList.add(par1Name);
atomOresFormulasHash.put(par1Name, par2Formula);
String var7 = par1Name;
var7 = var7.concat(" Ore");
}
- this.atomOresEnglishList.add(var7);
addAtomOresLanguage(var7, "en_US");
}
public int getAtomOresLastIndex(){
- return atomOresEnglishList.size() / 16;
+ return atomOresAtomList.size() / 16;
}
public int getAtomOresMetaOfLastIndex(){
- return atomOresEnglishList.size() - getAtomOresLastIndex() * 16;
+ return atomOresAtomList.size() - getAtomOresLastIndex() * 16;
}
- public String getAtomOreEnglishName(int index) {
- return this.atomOresEnglishList.get(index);
+ public ArrayList<String> getAtomOresAtomName() {
+ return this.atomOresAtomList;
}
}
package pcc.chemicraft.base;
-import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-import net.minecraft.util.EntityDamageSource;
import net.minecraftforge.oredict.OreDictionary;
import pcc.chemicraft.core.ChemiCraftCore;
import pcc.chemicraft.core.nbt.NBTRecipeGrenade;
new Formula("H2O"));
//鉱石分解の追加
- for (int i = 0; i < this.mod.apiBase.getAtomOresName().sizeKeysList(); i++) {
+ for (int i = 0; i < this.mod.apiBase.getAtomOresAtomName().size(); i++) {
this.mod.api.addPyrolysisDecompositionRecipe(
new ItemStack(this.mod.blockAtomOres[i / 16], 1, i - i / 16 * 16),
- this.mod.apiBase.getAtomOresFormulas().get(this.mod.apiBase.getAtomOresName().getKeyList(i)));
+ this.mod.apiBase.getAtomOresFormulas().get(this.mod.apiBase.getAtomOresAtomName().get(i)));
}
}
import net.minecraft.block.Block;
import net.minecraftforge.common.MinecraftForge;
-import pcc.chemicraft.base.gen.WorldGenAtomsOre;
import pcc.chemicraft.base.ore.BlockAtomOres;
import pcc.chemicraft.base.ore.ItemAtomOres;
import cpw.mods.fml.common.registry.GameRegistry;
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;
+import pcc.chemicraft.ChemiCraft;
+import pcc.chemicraft.base.ChemiCraftBase;
+import pcc.chemicraft.core.ChemiCraftCore;
public class ItemOreSerarcher extends Item {
if (par3World.isRemote) {
this.changeItem(par2EntityPlayer);
}
- String blockName = ChemiCraftBase.instance.apiBase.getAtomOreEnglishName(
+ String blockName = ChemiCraftBase.instance.apiBase.getAtomOresAtomName().get(
(Math.abs(ChemiCraftBase.instance.atomOresID[ChemiCraftBase.instance.atomOresID.length-1] -
(par3World.getBlockId(par4, par5, par6) + 3))) * 16 +
par3World.getBlockMetadata(par4, par5, par6));
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;
@Override
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
int var3 = this.blockID - ChemiCraftBase.instance.atomOresID[0];
- return this.iconArray[var3 - var3 / 16 * 16];
+ return this.iconArray[par2 + var3 * 16];
}
@Override
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) {
- for (int var4 = 0; var4 < 16; ++var4) {
- par3List.add(new ItemStack(par1, 1, var4));
+ int var4 = this.blockID - ChemiCraftBase.instance.atomOresID[0] + 1;
+ int var5 = 16;
+ if (var4 == ChemiCraftBase.instance.atomOresID.length){
+ var5 -= var4 * 16 - ChemiCraftBaseAPI.instance().getAtomOresAtomName().size();
+ }
+ for (int i = 0; i < var5; i++) {
+ par3List.add(new ItemStack(par1, 1, i));
}
}
package pcc.chemicraft.base.ore;
import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemDye;
import net.minecraft.item.ItemStack;
-import net.minecraft.util.Icon;
import pcc.chemicraft.base.ChemiCraftBase;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import pcc.chemicraft.base.ChemiCraftBaseAPI;
/**
* 鉱石のアイテム版です
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
- return super.getUnlocalizedName() + "." + ItemDye.dyeColorNames[BlockAtomOres.getBlockFromDye(par1ItemStack.getItemDamage())];
+ int var2 = this.itemID - (ChemiCraftBase.instance.atomOresID[0]);
+ return super.getUnlocalizedName() + "." + ChemiCraftBaseAPI.instance().getAtomOresAtomName().get(par1ItemStack.getItemDamage() + var2 * 16);
}
+
}
* @author P.C.C.
*/
@Mod(modid = "ChemiCraft", name = "ChemiCraft", version = "Beta1")
-@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.4.7", channels = "chemicraftcore", packetHandler = PacketHandler.class)
+@NetworkMod(clientSideRequired = true, serverSideRequired = true, versionBounds = "1.5", channels = "chemicraftcore", packetHandler = PacketHandler.class)
public class ChemiCraftCore extends ChemiCraft{
/**
*/
public static final ChemiCraftLogging logger = new ChemiCraftLogging(System.getProperty("user.dir"));
+ /**
+ * the Textures
+ */
+ public static final String CCTABLE = ChemiCraft.TEXTURE + "ChemiCraftTable_";
+
public ChemiCraftCore() {
ChemiCraftAPI.getCompoundsName().entrySet();
this.api.getCompoundsName().createHash("en_US");
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
-import pcc.chemicraft.ChemiCraft;
import pcc.chemicraft.core.ChemiCraftCore;
import pcc.chemicraft.core.tileentity.TileEntityChemicalCombinationTable;
@Override
public void registerIcons(IconRegister par1IconRegister) {
- this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCombinationTableTop");
- this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCombinationTableBottom");
- this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCombinationTable");
+ this.topIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "ChemicalCombinationTable");
+ this.bottomIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Bottom");
+ this.globalIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Side");
}
@Override
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
if(par1 == 0){
- return this.topIcon;
- }else if(par1 == 1){
return this.bottomIcon;
+ }else if(par1 == 1){
+ return this.topIcon;
}else{
return this.globalIcon;
}
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
-import pcc.chemicraft.ChemiCraft;
import pcc.chemicraft.core.ChemiCraftCore;
import pcc.chemicraft.core.tileentity.TileEntityChemicalCraftingTable;
@Override
public void registerIcons(IconRegister par1IconRegister) {
- this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCraftingTableTop");
- this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCraftingTableBottom");
- this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockChemicalCraftingTable");
+ this.topIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "ChemicalCraftingTable");
+ this.bottomIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Bottom");
+ this.globalIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Side");
}
@Override
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
if(par1 == 0){
- return this.topIcon;
- }else if(par1 == 1){
return this.bottomIcon;
+ }else if(par1 == 1){
+ return this.topIcon;
}else{
return this.globalIcon;
}
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
-import pcc.chemicraft.ChemiCraft;
import pcc.chemicraft.core.ChemiCraftCore;
import pcc.chemicraft.core.debug.DebugTick;
import pcc.chemicraft.core.tileentity.TileEntityElectrolysisTable;
@Override
public void registerIcons(IconRegister par1IconRegister) {
- this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockElectrolysisTableTop");
- this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockElectrolysisTableBottom");
- this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockElectrolysisTable");
+ this.topIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "ElectrolysisTable");
+ this.bottomIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Bottom");
+ this.globalIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Side");
}
@Override
@Override
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
if(par1 == 0){
- return this.topIcon;
- }else if(par1 == 1){
return this.bottomIcon;
+ }else if(par1 == 1){
+ return this.topIcon;
}else{
return this.globalIcon;
}
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
-import pcc.chemicraft.ChemiCraft;
import pcc.chemicraft.core.ChemiCraftCore;
import pcc.chemicraft.core.debug.DebugTick;
import pcc.chemicraft.core.tileentity.TileEntityPyrolysisTable;
@Override
public void registerIcons(IconRegister par1IconRegister) {
- this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockPyrolysisTableTop");
- this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockPyrolysisTableBottom");
- this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockPyrolysisTable");
+ this.topIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "PyrolysisTable");
+ this.bottomIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Bottom");
+ this.globalIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Side");
}
@Override
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
if(par1 == 0){
- return this.topIcon;
- }else if(par1 == 1){
return this.bottomIcon;
+ }else if(par1 == 1){
+ return this.topIcon;
}else{
return this.globalIcon;
}
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
-import pcc.chemicraft.ChemiCraft;
import pcc.chemicraft.core.ChemiCraftCore;
import pcc.chemicraft.core.tileentity.TileEntityToolAndWeaponCraftingTable;
@Override
public void registerIcons(IconRegister par1IconRegister) {
- this.topIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockToolAndWeaponCraftingTableTop");
- this.bottomIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockToolAndWeaponCraftingTableBottom");
- this.globalIcon = par1IconRegister.registerIcon(ChemiCraft.TEXTURE + "BlockToolAndWeaponCraftingTable");
+ this.topIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "ToolAndWeaponCraftingTable");
+ this.bottomIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Bottom");
+ this.globalIcon = par1IconRegister.registerIcon(ChemiCraftCore.CCTABLE + "Side");
}
@Override
public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) {
if(par1 == 0){
- return this.topIcon;
- }else if(par1 == 1){
return this.bottomIcon;
+ }else if(par1 == 1){
+ return this.topIcon;
}else{
return this.globalIcon;
}
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EntityDamageSource;
import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
-import pcc.chemicraft.ChemiCraft;
import pcc.chemicraft.core.ChemiCraftCore;
import pcc.chemicraft.util.AtomInfo;
import cpw.mods.fml.relauncher.Side;
- /* 一時保留。詳しいことが決まるまで変更が難しいため。 --WIP--
@SuppressWarnings({ "unchecked", "rawtypes" })
@SideOnly(Side.CLIENT)
@Override
for(int type = 0; type < ChemiCraftCore.instance.ATOMSNAME.length; type++)
{
par3List.add(new ItemStack(par1, 1, type));
- this.setIconIndex(type);
}
}
- @Override
- public String getItemNameIS(ItemStack par1ItemStack){
- return super.getItemName() + "." + ChemiCraftCore.instance.ATOMSNAME[par1ItemStack.getItemDamage()];
+ public int getMetadata(int par1)
+ {
+ return par1;
}
@Override
- public String getTextureFile(){
- return ChemiCraft.ITEM_ATOMS_TEXTURE;
+ public String getUnlocalizedName(ItemStack par1ItemStack){
+ return super.getUnlocalizedName() + "." + ChemiCraftCore.instance.ATOMSNAME[par1ItemStack.getItemDamage()];
}
- @SideOnly(Side.CLIENT)
+ /* 一時保留。詳しいことが決まるまで変更が難しいため。 --WIP--
@Override
- public int getIconFromDamage(int par1){
- return par1;
+ public String getTextureFile(){
+ return ChemiCraft.ITEM_ATOMS_TEXTURE;
}
- */
+ */
}
\ No newline at end of file
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
/**
return this.elementsHash.get(par1Key).containsAll(par2Collection);
}
- public Set<java.util.Map.Entry<K, E>> entrySet() {
- return this.entrySet();
+ public Set<Entry<K, ArrayList<E>>> entrySet() {
+ return this.elementsHash.entrySet();
}
public K getKeyList(int par1Index) {