Move dusts and smalldusts to json

This commit is contained in:
ProfessorProspector 2016-12-11 11:34:56 -08:00
parent 3da6083c68
commit 8012abee3b
133 changed files with 700 additions and 77 deletions

View file

@ -7,10 +7,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoader;
import techreborn.init.ModBlocks; import techreborn.init.ModBlocks;
import techreborn.init.ModItems; import techreborn.init.ModItems;
import techreborn.items.ItemGems; import techreborn.items.*;
import techreborn.items.ItemIngots;
import techreborn.items.ItemNuggets;
import techreborn.items.ItemPlates;
public class RegisterItemJsons { public class RegisterItemJsons {
public static void registerModels() { public static void registerModels() {
@ -59,6 +56,16 @@ public class RegisterItemJsons {
String[] name = ItemNuggets.types.clone(); String[] name = ItemNuggets.types.clone();
registerBlockstate(ModItems.nuggets, i, name[i]); registerBlockstate(ModItems.nuggets, i, name[i]);
} }
for (int i = 0; i < ItemDusts.types.length; ++i) {
String[] name = ItemDusts.types.clone();
registerBlockstate(ModItems.dusts, i, name[i]);
}
for (int i = 0; i < ItemDustsSmall.types.length; ++i) {
String[] name = ItemDustsSmall.types.clone();
registerBlockstate(ModItems.smallDusts, i, name[i]);
}
} }
private static void registerBlocks() { private static void registerBlocks() {

View file

@ -1222,7 +1222,7 @@ public class ModRecipes {
new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), new ItemStack(Items.ENDER_PEARL, 1), new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), new ItemStack(Items.ENDER_PEARL, 1),
pulsatingIronStack, 200, 16)); pulsatingIronStack, 200, 16));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), ItemDusts.getDustByName("enderPearl", 1), new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), ItemDusts.getDustByName("ender_pearl", 1),
pulsatingIronStack, 200, 16)); pulsatingIronStack, 200, 16));
} }
@ -1236,7 +1236,7 @@ public class ModRecipes {
new AlloySmelterRecipe(energeticAlloyStack, new ItemStack(Items.ENDER_PEARL, 1), vibrantAlloyStack, new AlloySmelterRecipe(energeticAlloyStack, new ItemStack(Items.ENDER_PEARL, 1), vibrantAlloyStack,
200, 16)); 200, 16));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new AlloySmelterRecipe(energeticAlloyStack, ItemDusts.getDustByName("enderPearl", 1), new AlloySmelterRecipe(energeticAlloyStack, ItemDusts.getDustByName("ender_pearl", 1),
vibrantAlloyStack, 200, 16)); vibrantAlloyStack, 200, 16));
} }
@ -1300,20 +1300,20 @@ public class ModRecipes {
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new BlastFurnaceRecipe(new ItemStack(Items.IRON_INGOT), ItemDusts.getDustByName("coal", 2), new BlastFurnaceRecipe(new ItemStack(Items.IRON_INGOT), ItemDusts.getDustByName("coal", 2),
ItemIngots.getIngotByName("steel"), ItemDusts.getDustByName("darkAshes", 2), 500, 120, 1000)); ItemIngots.getIngotByName("steel"), ItemDusts.getDustByName("dark_ashes", 2), 500, 120, 1000));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new BlastFurnaceRecipe(ItemIngots.getIngotByName("tungsten"), ItemIngots.getIngotByName("steel"), new BlastFurnaceRecipe(ItemIngots.getIngotByName("tungsten"), ItemIngots.getIngotByName("steel"),
ItemIngots.getIngotByName("hot_tungstensteel"), ItemDusts.getDustByName("darkAshes", 4), 500, ItemIngots.getIngotByName("hot_tungstensteel"), ItemDusts.getDustByName("dark_ashes", 4), 500,
500, 3000)); 500, 3000));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new BlastFurnaceRecipe(new ItemStack(Blocks.IRON_ORE), ItemDusts.getDustByName("calcite"), new BlastFurnaceRecipe(new ItemStack(Blocks.IRON_ORE), ItemDusts.getDustByName("calcite"),
new ItemStack(Items.IRON_INGOT, 3), ItemDusts.getDustByName("darkAshes"), 140, 120, 1000)); new ItemStack(Items.IRON_INGOT, 3), ItemDusts.getDustByName("dark_ashes"), 140, 120, 1000));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new BlastFurnaceRecipe(BlockOre.getOreByName("Pyrite"), ItemDusts.getDustByName("calcite"), new BlastFurnaceRecipe(BlockOre.getOreByName("Pyrite"), ItemDusts.getDustByName("calcite"),
new ItemStack(Items.IRON_INGOT, 2), ItemDusts.getDustByName("darkAshes"), 140, 120, 1000)); new ItemStack(Items.IRON_INGOT, 2), ItemDusts.getDustByName("dark_ashes"), 140, 120, 1000));
} }
static void addUUrecipes() { static void addUUrecipes() {
@ -1472,7 +1472,7 @@ public class ModRecipes {
// Blaze Powder Byproducts // Blaze Powder Byproducts
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.BLAZE_POWDER), null, ItemDusts.getDustByName("darkAshes", 1), new CentrifugeRecipe(new ItemStack(Items.BLAZE_POWDER), null, ItemDusts.getDustByName("dark_ashes", 1),
ItemDusts.getDustByName("sulfur", 1), null, null, 1240, 5)); ItemDusts.getDustByName("sulfur", 1), null, null, 1240, 5));
// Magma Cream Products // Magma Cream Products
@ -1501,15 +1501,15 @@ public class ModRecipes {
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new CentrifugeRecipe(ItemDusts.getDustByName("basalt", 16), null, ItemDusts.getDustByName("peridot", 1), new CentrifugeRecipe(ItemDusts.getDustByName("basalt", 16), null, ItemDusts.getDustByName("peridot", 1),
ItemDusts.getDustByName("calcite", 3), ItemDusts.getDustByName("magnesium", 8), ItemDusts.getDustByName("calcite", 3), ItemDusts.getDustByName("magnesium", 8),
ItemDusts.getDustByName("darkAshes", 4), 2680, 5)); ItemDusts.getDustByName("dark_ashes", 4), 2680, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("yellowGarnet", 16), null, RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("yellow_garnet", 16), null,
ItemDusts.getDustByName("andradite", 5), ItemDusts.getDustByName("grossular", 8), ItemDusts.getDustByName("andradite", 5), ItemDusts.getDustByName("grossular", 8),
ItemDusts.getDustByName("uvarovite", 3), null, 2940, 5)); ItemDusts.getDustByName("uvarovite", 3), null, 2940, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("redGarnet", 16), null, RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("red_garnet", 16), null,
ItemDusts.getDustByName("pyrope", 3), ItemDusts.getDustByName("almandine", 5), ItemDusts.getDustByName("pyrope", 3), ItemDusts.getDustByName("almandine", 5),
ItemDusts.getDustByName("spessartine", 8), null, 2940, 5)); ItemDusts.getDustByName("spessartine", 8), null, 2940, 5));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new CentrifugeRecipe(ItemDusts.getDustByName("darkAshes", 2), null, ItemDusts.getDustByName("ashes", 2), new CentrifugeRecipe(ItemDusts.getDustByName("dark_ashes", 2), null, ItemDusts.getDustByName("ashes", 2),
null, null, null, 240, 5)); null, null, null, 240, 5));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new CentrifugeRecipe(ItemDusts.getDustByName("brass", 4), null, ItemDusts.getDustByName("zinc", 1), new CentrifugeRecipe(ItemDusts.getDustByName("brass", 4), null, ItemDusts.getDustByName("zinc", 1),
@ -1521,8 +1521,8 @@ public class ModRecipes {
new CentrifugeRecipe(ItemDusts.getDustByName("netherrack", 16), null, new ItemStack(Items.REDSTONE, 1), new CentrifugeRecipe(ItemDusts.getDustByName("netherrack", 16), null, new ItemStack(Items.REDSTONE, 1),
ItemDusts.getDustByName("sulfur", 4), ItemDusts.getDustByName("basalt", 1), ItemDusts.getDustByName("sulfur", 4), ItemDusts.getDustByName("basalt", 1),
new ItemStack(Items.GOLD_NUGGET, 1), 2400, 5)); new ItemStack(Items.GOLD_NUGGET, 1), 2400, 5));
RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("enderEye", 1), null, RecipeHandler.addRecipe(new CentrifugeRecipe(ItemDusts.getDustByName("ender_eye", 1), null,
ItemDusts.getDustByName("enderPearl", 1), new ItemStack(Items.BLAZE_POWDER, 1), null, null, 1280, 5)); ItemDusts.getDustByName("ender_pearl", 1), new ItemStack(Items.BLAZE_POWDER, 1), null, null, 1280, 5));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new CentrifugeRecipe(new ItemStack(Items.GLOWSTONE_DUST, 16), RecipeUtils.getEmptyCell(1), new CentrifugeRecipe(new ItemStack(Items.GLOWSTONE_DUST, 16), RecipeUtils.getEmptyCell(1),
@ -1886,12 +1886,12 @@ public class ModRecipes {
// Sphalerite Ore // Sphalerite Ore
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7), RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7),
new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("sphalerite", 2), new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("sphalerite", 2),
ItemDustsSmall.getSmallDustByName("Zinc", 1), ItemDustsSmall.getSmallDustByName("YellowGarnet", 1), ItemDustsSmall.getSmallDustByName("Zinc", 1), ItemDustsSmall.getSmallDustByName("yellow_garnet", 1),
null, 100, 120)); null, 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7), RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7),
new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("sphalerite", 2), new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("sphalerite", 2),
ItemDusts.getDustByName("zinc", 1), ItemDustsSmall.getSmallDustByName("YellowGarnet", 1), null, 100, ItemDusts.getDustByName("zinc", 1), ItemDustsSmall.getSmallDustByName("yellow_garnet", 1), null, 100,
120)); 120));
// Tungsten Ore // Tungsten Ore
@ -2852,29 +2852,29 @@ public class ModRecipes {
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemIngots.getIngotByName("iridium_alloy"), RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemIngots.getIngotByName("iridium_alloy"),
new ItemStack(Blocks.TNT, 8), new ItemStack(Blocks.TNT, 8),
OreDictionary.getOres("plateIridium").get(0).copy(), ItemDusts.getDustByName("darkAshes", 4), 20, 30)); OreDictionary.getOres("plateIridium").get(0).copy(), ItemDusts.getDustByName("dark_ashes", 4), 20, 30));
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("diamond", 4), RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("diamond", 4),
new ItemStack(Blocks.TNT, 32), new ItemStack(Blocks.TNT, 32),
new ItemStack(Items.DIAMOND, 3), new ItemStack(Items.DIAMOND, 3),
ItemDusts.getDustByName("darkAshes", 16), 20, 30)); ItemDusts.getDustByName("dark_ashes", 16), 20, 30));
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("emerald", 4), RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("emerald", 4),
new ItemStack(Blocks.TNT, 24), new ItemStack(Blocks.TNT, 24),
new ItemStack(Items.EMERALD, 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); new ItemStack(Items.EMERALD, 3), ItemDusts.getDustByName("dark_ashes", 12), 20, 30));
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("sapphire", 4), RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("sapphire", 4),
new ItemStack(Blocks.TNT, 24), new ItemStack(Blocks.TNT, 24),
ItemGems.getGemByName("sapphire", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); ItemGems.getGemByName("sapphire", 3), ItemDusts.getDustByName("dark_ashes", 12), 20, 30));
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("ruby", 4), RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("ruby", 4),
new ItemStack(Blocks.TNT, 24), new ItemStack(Blocks.TNT, 24),
ItemGems.getGemByName("ruby", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); ItemGems.getGemByName("ruby", 3), ItemDusts.getDustByName("dark_ashes", 12), 20, 30));
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("yellowGarnet", 4), RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("yellow_garnet", 4),
new ItemStack(Blocks.TNT, 24), new ItemStack(Blocks.TNT, 24),
ItemGems.getGemByName("yellow_garnet", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); ItemGems.getGemByName("yellow_garnet", 3), ItemDusts.getDustByName("dark_ashes", 12), 20, 30));
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("redGarnet", 4), RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("red_garnet", 4),
new ItemStack(Blocks.TNT, 24), new ItemStack(Blocks.TNT, 24),
ItemGems.getGemByName("red_garnet", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); ItemGems.getGemByName("red_garnet", 3), ItemDusts.getDustByName("dark_ashes", 12), 20, 30));
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("peridot", 4), RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemDusts.getDustByName("peridot", 4),
new ItemStack(Blocks.TNT, 24), new ItemStack(Blocks.TNT, 24),
ItemGems.getGemByName("peridot", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30)); ItemGems.getGemByName("peridot", 3), ItemDusts.getDustByName("dark_ashes", 12), 20, 30));
// grinder // grinder
@ -2953,7 +2953,7 @@ public class ModRecipes {
new FluidStack(FluidRegistry.WATER, 1000), new FluidStack(FluidRegistry.WATER, 1000),
ItemDusts.getDustByName("sphalerite", 2), ItemDusts.getDustByName("sphalerite", 2),
ItemDustsSmall.getSmallDustByName("Zinc", 1), ItemDustsSmall.getSmallDustByName("Zinc", 1),
ItemDustsSmall.getSmallDustByName("YellowGarnet", 1), ItemDustsSmall.getSmallDustByName("yellow_garnet", 1),
null, 100, 120)); null, 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe( RecipeHandler.addRecipe(new IndustrialGrinderRecipe(
@ -2961,7 +2961,7 @@ public class ModRecipes {
new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), new FluidStack(ModFluids.fluidSodiumpersulfate, 1000),
ItemDusts.getDustByName("sphalerite", 2), ItemDusts.getDustByName("sphalerite", 2),
ItemDusts.getDustByName("zinc", 1), ItemDusts.getDustByName("zinc", 1),
ItemDustsSmall.getSmallDustByName("YellowGarnet", 1), ItemDustsSmall.getSmallDustByName("yellow_garnet", 1),
null, 100, 120)); null, 100, 120));
RecipeHandler.addRecipe(new IndustrialGrinderRecipe( RecipeHandler.addRecipe(new IndustrialGrinderRecipe(
@ -3134,7 +3134,7 @@ public class ModRecipes {
// ItemCells.getCellByName("hydrogen", 4), ItemCells.getCellByName("empty", 5), // ItemCells.getCellByName("hydrogen", 4), ItemCells.getCellByName("empty", 5),
// ItemCells.getCellByName("empty", 1), null, 100, 30)); // ItemCells.getCellByName("empty", 1), null, 100, 30));
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("darkAshes"), RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemDusts.getDustByName("dark_ashes"),
ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("carbon", 2), null, null, null, 20, 30)); ItemCells.getCellByName("empty", 2), ItemCells.getCellByName("carbon", 2), null, null, null, 20, 30));
if (OreUtil.doesOreExistAndValid("dustSalt")) { if (OreUtil.doesOreExistAndValid("dustSalt")) {

View file

@ -11,7 +11,6 @@ import techreborn.Core;
import techreborn.blocks.BlockMachineFrame; import techreborn.blocks.BlockMachineFrame;
import techreborn.items.*; import techreborn.items.*;
import techreborn.parts.powerCables.ItemStandaloneCables; import techreborn.parts.powerCables.ItemStandaloneCables;
import techreborn.utils.OreDictUtils;
public class OreDict { public class OreDict {
@ -76,9 +75,8 @@ public class OreDict {
OreDictionary.registerOre("materialResin", ItemParts.getPartByName("rubberSap")); OreDictionary.registerOre("materialResin", ItemParts.getPartByName("rubberSap"));
OreDictionary.registerOre("materialRubber", ItemParts.getPartByName("rubber")); OreDictionary.registerOre("materialRubber", ItemParts.getPartByName("rubber"));
OreDictionary.registerOre("pulpWood", ItemDusts.getDustByName("sawDust")); OreDictionary.registerOre("pulpWood", ItemDusts.getDustByName("saw_dust"));
//Gems registration
for (String type : ItemGems.types) { for (String type : ItemGems.types) {
if (type.equals(ModItems.META_PLACEHOLDER)) if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders! continue; //Aware of placeholders!
@ -91,7 +89,6 @@ public class OreDict {
ItemPlates.registerType(type); ItemPlates.registerType(type);
} }
//Ingots registration
for (String type : ItemIngots.types) { for (String type : ItemIngots.types) {
if (type.equals(ModItems.META_PLACEHOLDER)) if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders! continue; //Aware of placeholders!
@ -104,20 +101,23 @@ public class OreDict {
ItemPlates.registerType(type); ItemPlates.registerType(type);
} }
//Dusts, nuggets and plates auto-registration
for (String type : ItemPlates.types) { for (String type : ItemPlates.types) {
if (type.equals(ModItems.META_PLACEHOLDER)) if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders! continue; //Aware of placeholders!
OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type)); OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type));
} }
//still need to switch these to snake_case and json
for (String type : ItemDusts.types) { for (String type : ItemDusts.types) {
if (type.equals(ModItems.META_PLACEHOLDER)) if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders! continue; //Aware of placeholders!
String oreDictName = "dust" + OreDictUtils.toFirstUpper(type); OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_" + type), ItemDusts.getDustByName(type));
OreDictionary.registerOre(oreDictName, ItemDusts.getDustByName(type)); }
for (String type : ItemDustsSmall.types) {
if (type.equals(ModItems.META_PLACEHOLDER))
continue; //Aware of placeholders!
OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_tiny_" + type), ItemDustsSmall.getSmallDustByName(type));
OreDictionary.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_small_" + type), ItemDustsSmall.getSmallDustByName(type));
} }
for (String type : ItemNuggets.types) { for (String type : ItemNuggets.types) {

View file

@ -11,14 +11,14 @@ import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
public class ItemDusts extends ItemTextureBase { public class ItemDusts extends ItemTRNoDestroy {
public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt", public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt",
"bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper", "bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper",
"darkAshes", "diamond", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena", "dark_ashes", "diamond", "electrum", "emerald", "ender_eye", "ender_pearl", "endstone", "flint", "galena",
"gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack", "gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack",
"nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "redGarnet", ModItems.META_PLACEHOLDER, "nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "red_garnet", ModItems.META_PLACEHOLDER,
"ruby", "saltpeter", "sapphire", "sawDust", "silver", "sodalite", "spessartine", "sphalerite", "steel", "ruby", "saltpeter", "sapphire", "saw_dust", "silver", "sodalite", "spessartine", "sphalerite", "steel",
"sulfur", "tin", "titanium", "tungsten", "uvarovite", ModItems.META_PLACEHOLDER, "yellowGarnet", "zinc", "sulfur", "tin", "titanium", "tungsten", "uvarovite", ModItems.META_PLACEHOLDER, "yellow_garnet", "zinc",
"olivine", "andesite", "diorite", "granite" }; "olivine", "andesite", "diorite", "granite" };
public ItemDusts() { public ItemDusts() {
@ -74,17 +74,4 @@ public class ItemDusts extends ItemTextureBase {
} }
} }
@Override
public String getTextureName(int damage) {
if (types[damage].equals("%NULL%")) {
damage = 0;
}
return ModInfo.MOD_ID + ":items/dust/" + types[damage] + "Dust";
}
@Override
public int getMaxMeta() {
return types.length;
}
} }

View file

@ -11,15 +11,15 @@ import techreborn.lib.ModInfo;
import java.security.InvalidParameterException; import java.security.InvalidParameterException;
public class ItemDustsSmall extends ItemTextureBase { public class ItemDustsSmall extends ItemTRNoDestroy {
public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt", public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt",
"bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper", "bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper",
"darkAshes", "diamond", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena", "dark_ashes", "diamond", "electrum", "emerald", "ender_eye", "ender_pearl", "endstone", "flint", "galena",
"gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack", "gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack",
"nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "redGarnet", ModItems.META_PLACEHOLDER, "nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "red_garnet", ModItems.META_PLACEHOLDER,
"ruby", "saltpeter", "sapphire", "sawDust", "silver", "sodalite", "spessartine", "sphalerite", "steel", "ruby", "saltpeter", "sapphire", "saw_dust", "silver", "sodalite", "spessartine", "sphalerite", "steel",
"sulfur", "tin", "titanium", "tungsten", "uvarovite", ModItems.META_PLACEHOLDER, "yellowGarnet", "zinc", "sulfur", "tin", "titanium", "tungsten", "uvarovite", ModItems.META_PLACEHOLDER, "yellow_garnet", "zinc",
"olivine", "redstone", "glowstone", "andesite", "diorite", "granite" }; "olivine", "redstone", "glowstone", "andesite", "diorite", "granite" };
public ItemDustsSmall() { public ItemDustsSmall() {
@ -64,17 +64,4 @@ public class ItemDustsSmall extends ItemTextureBase {
} }
} }
@Override
public String getTextureName(int damage) {
if (types[damage].equals(ModItems.META_PLACEHOLDER)) {
damage = 0;
}
return ModInfo.MOD_ID + ":items/smallDust/small" + StringUtils.toFirstCapital(types[damage]) + "Dust";
}
@Override
public int getMaxMeta() {
return types.length;
}
} }

View file

@ -0,0 +1,316 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item"
},
"variants": {
"type": {
"almandine": {
"textures": {
"layer0": "techreborn:items/dust/almandine_dust"
}
},
"aluminum": {
"textures": {
"layer0": "techreborn:items/dust/aluminum_dust"
}
},
"andradite": {
"textures": {
"layer0": "techreborn:items/dust/andradite_dust"
}
},
"ashes": {
"textures": {
"layer0": "techreborn:items/dust/ashes_dust"
}
},
"basalt": {
"textures": {
"layer0": "techreborn:items/dust/basalt_dust"
}
},
"bauxite": {
"textures": {
"layer0": "techreborn:items/dust/bauxite_dust"
}
},
"brass": {
"textures": {
"layer0": "techreborn:items/dust/brass_dust"
}
},
"bronze": {
"textures": {
"layer0": "techreborn:items/dust/bronze_dust"
}
},
"calcite": {
"textures": {
"layer0": "techreborn:items/dust/calcite_dust"
}
},
"charcoal": {
"textures": {
"layer0": "techreborn:items/dust/charcoal_dust"
}
},
"chrome": {
"textures": {
"layer0": "techreborn:items/dust/chrome_dust"
}
},
"cinnabar": {
"textures": {
"layer0": "techreborn:items/dust/cinnabar_dust"
}
},
"clay": {
"textures": {
"layer0": "techreborn:items/dust/clay_dust"
}
},
"coal": {
"textures": {
"layer0": "techreborn:items/dust/coal_dust"
}
},
"copper": {
"textures": {
"layer0": "techreborn:items/dust/copper_dust"
}
},
"dark_ashes": {
"textures": {
"layer0": "techreborn:items/dust/dark_ashes_dust"
}
},
"diamond": {
"textures": {
"layer0": "techreborn:items/dust/diamond_dust"
}
},
"electrum": {
"textures": {
"layer0": "techreborn:items/dust/electrum_dust"
}
},
"emerald": {
"textures": {
"layer0": "techreborn:items/dust/emerald_dust"
}
},
"ender_eye": {
"textures": {
"layer0": "techreborn:items/dust/ender_eye_dust"
}
},
"ender_pearl": {
"textures": {
"layer0": "techreborn:items/dust/ender_pearl_dust"
}
},
"endstone": {
"textures": {
"layer0": "techreborn:items/dust/endstone_dust"
}
},
"flint": {
"textures": {
"layer0": "techreborn:items/dust/flint_dust"
}
},
"galena": {
"textures": {
"layer0": "techreborn:items/dust/galena_dust"
}
},
"gold": {
"textures": {
"layer0": "techreborn:items/dust/gold_dust"
}
},
"grossular": {
"textures": {
"layer0": "techreborn:items/dust/grossular_dust"
}
},
"invar": {
"textures": {
"layer0": "techreborn:items/dust/invar_dust"
}
},
"iron": {
"textures": {
"layer0": "techreborn:items/dust/iron_dust"
}
},
"lazurite": {
"textures": {
"layer0": "techreborn:items/dust/lazurite_dust"
}
},
"lead": {
"textures": {
"layer0": "techreborn:items/dust/lead_dust"
}
},
"magnesium": {
"textures": {
"layer0": "techreborn:items/dust/magnesium_dust"
}
},
"manganese": {
"textures": {
"layer0": "techreborn:items/dust/manganese_dust"
}
},
"marble": {
"textures": {
"layer0": "techreborn:items/dust/marble_dust"
}
},
"netherrack": {
"textures": {
"layer0": "techreborn:items/dust/netherrack_dust"
}
},
"nickel": {
"textures": {
"layer0": "techreborn:items/dust/nickel_dust"
}
},
"obsidian": {
"textures": {
"layer0": "techreborn:items/dust/obsidian_dust"
}
},
"peridot": {
"textures": {
"layer0": "techreborn:items/dust/peridot_dust"
}
},
"phosphorous": {
"textures": {
"layer0": "techreborn:items/dust/phosphorous_dust"
}
},
"platinum": {
"textures": {
"layer0": "techreborn:items/dust/platinum_dust"
}
},
"pyrite": {
"textures": {
"layer0": "techreborn:items/dust/pyrite_dust"
}
},
"red_garnet": {
"textures": {
"layer0": "techreborn:items/dust/red_garnet_dust"
}
},
"ruby": {
"textures": {
"layer0": "techreborn:items/dust/ruby_dust"
}
},
"saltpeter": {
"textures": {
"layer0": "techreborn:items/dust/saltpeter_dust"
}
},
"sapphire": {
"textures": {
"layer0": "techreborn:items/dust/sapphire_dust"
}
},
"saw_dust": {
"textures": {
"layer0": "techreborn:items/dust/saw_dust_dust"
}
},
"silver": {
"textures": {
"layer0": "techreborn:items/dust/silver_dust"
}
},
"sodalite": {
"textures": {
"layer0": "techreborn:items/dust/sodalite_dust"
}
},
"spessartine": {
"textures": {
"layer0": "techreborn:items/dust/spessartine_dust"
}
},
"sphalerite": {
"textures": {
"layer0": "techreborn:items/dust/sphalerite_dust"
}
},
"steel": {
"textures": {
"layer0": "techreborn:items/dust/steel_dust"
}
},
"sulfur": {
"textures": {
"layer0": "techreborn:items/dust/sulfur_dust"
}
},
"tin": {
"textures": {
"layer0": "techreborn:items/dust/tin_dust"
}
},
"titanium": {
"textures": {
"layer0": "techreborn:items/dust/titanium_dust"
}
},
"tungsten": {
"textures": {
"layer0": "techreborn:items/dust/tungsten_dust"
}
},
"uvarovite": {
"textures": {
"layer0": "techreborn:items/dust/uvarovite_dust"
}
},
"yellow_garnet": {
"textures": {
"layer0": "techreborn:items/dust/yellow_garnet_dust"
}
},
"zinc": {
"textures": {
"layer0": "techreborn:items/dust/zinc_dust"
}
},
"olivine": {
"textures": {
"layer0": "techreborn:items/dust/olivine_dust"
}
},
"andesite": {
"textures": {
"layer0": "techreborn:items/dust/andesite_dust"
}
},
"diorite": {
"textures": {
"layer0": "techreborn:items/dust/diorite_dust"
}
},
"granite": {
"textures": {
"layer0": "techreborn:items/dust/granite_dust"
}
}
}
}
}

View file

@ -0,0 +1,326 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item"
},
"variants": {
"type": {
"almandine": {
"textures": {
"layer0": "techreborn:items/smalldust/almandine_smalldust"
}
},
"aluminum": {
"textures": {
"layer0": "techreborn:items/smalldust/aluminum_smalldust"
}
},
"andradite": {
"textures": {
"layer0": "techreborn:items/smalldust/andradite_smalldust"
}
},
"ashes": {
"textures": {
"layer0": "techreborn:items/smalldust/ashes_smalldust"
}
},
"basalt": {
"textures": {
"layer0": "techreborn:items/smalldust/basalt_smalldust"
}
},
"bauxite": {
"textures": {
"layer0": "techreborn:items/smalldust/bauxite_smalldust"
}
},
"brass": {
"textures": {
"layer0": "techreborn:items/smalldust/brass_smalldust"
}
},
"bronze": {
"textures": {
"layer0": "techreborn:items/smalldust/bronze_smalldust"
}
},
"calcite": {
"textures": {
"layer0": "techreborn:items/smalldust/calcite_smalldust"
}
},
"charcoal": {
"textures": {
"layer0": "techreborn:items/smalldust/charcoal_smalldust"
}
},
"chrome": {
"textures": {
"layer0": "techreborn:items/smalldust/chrome_smalldust"
}
},
"cinnabar": {
"textures": {
"layer0": "techreborn:items/smalldust/cinnabar_smalldust"
}
},
"clay": {
"textures": {
"layer0": "techreborn:items/smalldust/clay_smalldust"
}
},
"coal": {
"textures": {
"layer0": "techreborn:items/smalldust/coal_smalldust"
}
},
"copper": {
"textures": {
"layer0": "techreborn:items/smalldust/copper_smalldust"
}
},
"dark_ashes": {
"textures": {
"layer0": "techreborn:items/smalldust/dark_ashes_smalldust"
}
},
"diamond": {
"textures": {
"layer0": "techreborn:items/smalldust/diamond_smalldust"
}
},
"electrum": {
"textures": {
"layer0": "techreborn:items/smalldust/electrum_smalldust"
}
},
"emerald": {
"textures": {
"layer0": "techreborn:items/smalldust/emerald_smalldust"
}
},
"ender_eye": {
"textures": {
"layer0": "techreborn:items/smalldust/ender_eye_smalldust"
}
},
"ender_pearl": {
"textures": {
"layer0": "techreborn:items/smalldust/ender_pearl_smalldust"
}
},
"endstone": {
"textures": {
"layer0": "techreborn:items/smalldust/endstone_smalldust"
}
},
"flint": {
"textures": {
"layer0": "techreborn:items/smalldust/flint_smalldust"
}
},
"galena": {
"textures": {
"layer0": "techreborn:items/smalldust/galena_smalldust"
}
},
"gold": {
"textures": {
"layer0": "techreborn:items/smalldust/gold_smalldust"
}
},
"grossular": {
"textures": {
"layer0": "techreborn:items/smalldust/grossular_smalldust"
}
},
"invar": {
"textures": {
"layer0": "techreborn:items/smalldust/invar_smalldust"
}
},
"iron": {
"textures": {
"layer0": "techreborn:items/smalldust/iron_smalldust"
}
},
"lazurite": {
"textures": {
"layer0": "techreborn:items/smalldust/lazurite_smalldust"
}
},
"lead": {
"textures": {
"layer0": "techreborn:items/smalldust/lead_smalldust"
}
},
"magnesium": {
"textures": {
"layer0": "techreborn:items/smalldust/magnesium_smalldust"
}
},
"manganese": {
"textures": {
"layer0": "techreborn:items/smalldust/manganese_smalldust"
}
},
"marble": {
"textures": {
"layer0": "techreborn:items/smalldust/marble_smalldust"
}
},
"netherrack": {
"textures": {
"layer0": "techreborn:items/smalldust/netherrack_smalldust"
}
},
"nickel": {
"textures": {
"layer0": "techreborn:items/smalldust/nickel_smalldust"
}
},
"obsidian": {
"textures": {
"layer0": "techreborn:items/smalldust/obsidian_smalldust"
}
},
"peridot": {
"textures": {
"layer0": "techreborn:items/smalldust/peridot_smalldust"
}
},
"phosphorous": {
"textures": {
"layer0": "techreborn:items/smalldust/phosphorous_smalldust"
}
},
"platinum": {
"textures": {
"layer0": "techreborn:items/smalldust/platinum_smalldust"
}
},
"pyrite": {
"textures": {
"layer0": "techreborn:items/smalldust/pyrite_smalldust"
}
},
"red_garnet": {
"textures": {
"layer0": "techreborn:items/smalldust/red_garnet_smalldust"
}
},
"ruby": {
"textures": {
"layer0": "techreborn:items/smalldust/ruby_smalldust"
}
},
"saltpeter": {
"textures": {
"layer0": "techreborn:items/smalldust/saltpeter_smalldust"
}
},
"sapphire": {
"textures": {
"layer0": "techreborn:items/smalldust/sapphire_smalldust"
}
},
"saw_smalldust": {
"textures": {
"layer0": "techreborn:items/smalldust/saw_smalldust_smalldust"
}
},
"silver": {
"textures": {
"layer0": "techreborn:items/smalldust/silver_smalldust"
}
},
"sodalite": {
"textures": {
"layer0": "techreborn:items/smalldust/sodalite_smalldust"
}
},
"spessartine": {
"textures": {
"layer0": "techreborn:items/smalldust/spessartine_smalldust"
}
},
"sphalerite": {
"textures": {
"layer0": "techreborn:items/smalldust/sphalerite_smalldust"
}
},
"steel": {
"textures": {
"layer0": "techreborn:items/smalldust/steel_smalldust"
}
},
"sulfur": {
"textures": {
"layer0": "techreborn:items/smalldust/sulfur_smalldust"
}
},
"tin": {
"textures": {
"layer0": "techreborn:items/smalldust/tin_smalldust"
}
},
"titanium": {
"textures": {
"layer0": "techreborn:items/smalldust/titanium_smalldust"
}
},
"tungsten": {
"textures": {
"layer0": "techreborn:items/smalldust/tungsten_smalldust"
}
},
"uvarovite": {
"textures": {
"layer0": "techreborn:items/smalldust/uvarovite_smalldust"
}
},
"yellow_garnet": {
"textures": {
"layer0": "techreborn:items/smalldust/yellow_garnet_smalldust"
}
},
"zinc": {
"textures": {
"layer0": "techreborn:items/smalldust/zinc_smalldust"
}
},
"olivine": {
"textures": {
"layer0": "techreborn:items/smalldust/olivine_smalldust"
}
},
"andesite": {
"textures": {
"layer0": "techreborn:items/smalldust/andesite_smalldust"
}
},
"diorite": {
"textures": {
"layer0": "techreborn:items/smalldust/diorite_smalldust"
}
},
"granite": {
"textures": {
"layer0": "techreborn:items/smalldust/granite_smalldust"
}
},
"redstone": {
"textures": {
"layer0": "techreborn:items/smalldust/redstone_smalldust"
}
},
"glowstone": {
"textures": {
"layer0": "techreborn:items/smalldust/glowstone_smalldust"
}
}
}
}
}

Some files were not shown because too many files have changed in this diff Show more