Gea/TAIGA
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

added oreDict prefix

Browse Source
This commit is contained in:
Giovanni Harting
2016-05-13 18:30:31 +02:00
parent c6fa276263
commit 453f12d70f
4 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sosnitzka/ztic_addon/Blocks.java
View File

@@ -1,5 +1,6 @@
package com.sosnitzka.ztic_addon; package com.sosnitzka.ztic_addon;
import com.google.common.base.Joiner;
import com.sosnitzka.ztic_addon.blocks.BlockLigniteOre; import com.sosnitzka.ztic_addon.blocks.BlockLigniteOre;
import com.sosnitzka.ztic_addon.blocks.BlockTiberiumOre; import com.sosnitzka.ztic_addon.blocks.BlockTiberiumOre;
import com.sosnitzka.ztic_addon.generic.BasicBlockGround; import com.sosnitzka.ztic_addon.generic.BasicBlockGround;
@@ -53,7 +54,7 @@ public class Blocks {
System.out.println(); System.out.println();
if (nameParts.length > 2) { if (nameParts.length > 2) {
oreDictName = Arrays.toString(Arrays.copyOfRange(nameParts, 0, nameParts.length - 1)); oreDictName = Joiner.on("_").join(Arrays.copyOfRange(nameParts, 0, nameParts.length - 1));
} else { } else {
oreDictName = nameParts[0]; oreDictName = nameParts[0];
} }

41
src/main/java/com/sosnitzka/ztic_addon/Items.java
View File

@@ -1,6 +1,7 @@
package com.sosnitzka.ztic_addon; package com.sosnitzka.ztic_addon;
import com.google.common.base.Joiner;
import com.sosnitzka.ztic_addon.generic.BasicItem; import com.sosnitzka.ztic_addon.generic.BasicItem;
import com.sosnitzka.ztic_addon.items.ItemIronNugget; import com.sosnitzka.ztic_addon.items.ItemIronNugget;
import com.sosnitzka.ztic_addon.items.ItemLignite; import com.sosnitzka.ztic_addon.items.ItemLignite;
@@ -14,6 +15,8 @@ import org.apache.commons.lang3.StringUtils;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Arrays; import java.util.Arrays;
import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_INGOT;
public class Items { public class Items {
public static ItemSlagironIngot slagironIngot = new ItemSlagironIngot(); public static ItemSlagironIngot slagironIngot = new ItemSlagironIngot();
public static ItemLignite lignite = new ItemLignite(); public static ItemLignite lignite = new ItemLignite();
@@ -21,24 +24,24 @@ public class Items {
public static ItemSlaggoldIngot slaggoldIngot = new ItemSlaggoldIngot(); public static ItemSlaggoldIngot slaggoldIngot = new ItemSlaggoldIngot();
public static Item fuel_brick = new BasicItem("fuel_brick"); public static Item fuel_brick = new BasicItem("fuel_brick");
public static Item aardiumIngot = new BasicItem("aardium_ingot", true); public static Item aardiumIngot = new BasicItem("aardium_ingot", PREFIX_INGOT);
public static Item adamantiteIngot = new BasicItem("adamantite_ingot", true); public static Item adamantiteIngot = new BasicItem("adamantite_ingot", PREFIX_INGOT);
public static Item arcaniteIngot = new BasicItem("arcanite_ingot", true); public static Item arcaniteIngot = new BasicItem("arcanite_ingot", PREFIX_INGOT);
public static Item axiidianIngot = new BasicItem("axiidian_ingot", true); public static Item axiidianIngot = new BasicItem("axiidian_ingot", PREFIX_INGOT);
public static Item bismuthIngot = new BasicItem("bismuth_ingot", true); public static Item bismuthIngot = new BasicItem("bismuth_ingot", PREFIX_INGOT);
public static Item eterniteIngot = new BasicItem("eternite_ingot", true); public static Item eterniteIngot = new BasicItem("eternite_ingot", PREFIX_INGOT);
public static Item ignititeIngot = new BasicItem("ignitite_ingot", true); public static Item ignititeIngot = new BasicItem("ignitite_ingot", PREFIX_INGOT);
public static Item karmesineIngot = new BasicItem("karmesine_ingot", true); public static Item karmesineIngot = new BasicItem("karmesine_ingot", PREFIX_INGOT);
public static Item meteoriteIngot = new BasicItem("meteorite_ingot", true); public static Item meteoriteIngot = new BasicItem("meteorite_ingot", PREFIX_INGOT);
public static Item mindoriteIngot = new BasicItem("mindorite_ingot", true); public static Item mindoriteIngot = new BasicItem("mindorite_ingot", PREFIX_INGOT);
public static Item mythrilIngot = new BasicItem("mythril_ingot", true); public static Item mythrilIngot = new BasicItem("mythril_ingot", PREFIX_INGOT);
public static Item palladiumIngot = new BasicItem("palladium_ingot", true); public static Item palladiumIngot = new BasicItem("palladium_ingot", PREFIX_INGOT);
public static Item prometheumIngot = new BasicItem("prometheum_ingot", true); public static Item prometheumIngot = new BasicItem("prometheum_ingot", PREFIX_INGOT);
public static Item tiberiumIngot = new BasicItem("tiberium_ingot", true); public static Item tiberiumIngot = new BasicItem("tiberium_ingot", PREFIX_INGOT);
public static Item vibraniumIngot = new BasicItem("vibranium_ingot", true); public static Item vibraniumIngot = new BasicItem("vibranium_ingot", PREFIX_INGOT);
public static Item yrdeanIngot = new BasicItem("yrdean_ingot", true); public static Item yrdeanIngot = new BasicItem("yrdean_ingot", PREFIX_INGOT);
public static Item astriumIngot = new BasicItem("astrium_ingot", true); public static Item astriumIngot = new BasicItem("astrium_ingot", PREFIX_INGOT);
public static Item instableNitroniteIngot = new BasicItem("instable_nitronite_ingot"); public static Item instableNitroniteIngot = new BasicItem("instable_nitronite_ingot");
public static Item proxideumIngot = new BasicItem("proxideum_ingot"); public static Item proxideumIngot = new BasicItem("proxideum_ingot");
public static Item instablePolyniumIngot = new BasicItem("instable_polyniumingot"); public static Item instablePolyniumIngot = new BasicItem("instable_polyniumingot");
@@ -73,12 +76,12 @@ public class Items {
String[] nameParts = item.getUnlocalizedName().replace("item.", "").split("_"); String[] nameParts = item.getUnlocalizedName().replace("item.", "").split("_");
if (nameParts.length > 2) { if (nameParts.length > 2) {
oreDictName = Arrays.toString(Arrays.copyOfRange(nameParts, 0, nameParts.length - 1)); oreDictName = Joiner.on("_").join(Arrays.copyOfRange(nameParts, 0, nameParts.length - 1));
} else { } else {
oreDictName = nameParts[0]; oreDictName = nameParts[0];
} }
OreDictionary.registerOre("ingot" + StringUtils.capitalize(oreDictName), item); OreDictionary.registerOre(((BasicItem) item).getOreDictPrefix() + StringUtils.capitalize(oreDictName), item);
System.out.println(String.format("Registered OreDict: %s", "ingot" + StringUtils.capitalize(oreDictName))); System.out.println(String.format("Registered OreDict: %s", "ingot" + StringUtils.capitalize(oreDictName)));
} }
} }

14
src/main/java/com/sosnitzka/ztic_addon/generic/BasicItem.java
View File

@@ -3,19 +3,23 @@ package com.sosnitzka.ztic_addon.generic;
import net.minecraft.item.Item; import net.minecraft.item.Item;
public class BasicItem extends Item { public class BasicItem extends Item {
private boolean oreDict; private String oreDictPrefix;
public BasicItem(String name, boolean oreDict) { public BasicItem(String name, String oreDictPrefix) {
setUnlocalizedName(name); setUnlocalizedName(name);
setRegistryName(name); setRegistryName(name);
this.oreDict = oreDict; this.oreDictPrefix = oreDictPrefix;
} }
public BasicItem(String name) { public BasicItem(String name) {
this(name, false); this(name, null);
} }
public boolean isOreDict() { public boolean isOreDict() {
return this.oreDict; return this.oreDictPrefix != null;
}
public String getOreDictPrefix() {
return oreDictPrefix;
} }
} }

2
src/main/java/com/sosnitzka/ztic_addon/util/Utils.java
View File

@@ -11,6 +11,8 @@ import net.minecraftforge.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
public class Utils { public class Utils {
public static String PREFIX_INGOT = "ingot";
public static void registerBlockWithItem(Block block) { public static void registerBlockWithItem(Block block) {
System.out.println(String.format("Register Block: %s", block.getUnlocalizedName())); System.out.println(String.format("Register Block: %s", block.getUnlocalizedName()));
GameRegistry.register(block); GameRegistry.register(block);