Try to make things make more sense

This commit is contained in:
ProfessorProspector 2018-09-15 19:36:37 -07:00
parent f6c143dce3
commit 874559c21e
22 changed files with 656 additions and 672 deletions

View file

@ -49,27 +49,25 @@ public class OreDict {
OreUtil.registerOre("glassReinforced", ModBlocks.REINFORCED_GLASS);
OreUtil.registerOre("treeSapling", ModBlocks.RUBBER_SAPLING);
OreUtil.registerOre("saplingRubber", ModBlocks.RUBBER_SAPLING);
// OreUtil.registerOre("logWood", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("logRubber", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("plankWood", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("slabWood", new ItemStack(RUBBER_LOG_SLAB_HALF, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("stairWood", new ItemStack(RUBBER_LOG_STAIR, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("plankRubber", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("treeLeaves", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("leavesRubber", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("logWood", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("logRubber", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("plankWood", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("slabWood", new ItemStack(RUBBER_LOG_SLAB_HALF, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("stairWood", new ItemStack(RUBBER_LOG_STAIR, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("plankRubber", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("treeLeaves", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("leavesRubber", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE));
// Parts
OreUtil.registerOre("circuitBasic", TRIngredients.Parts.CIRCUIT_BASIC.getStack());
OreUtil.registerOre("circuitAdvanced", TRIngredients.Parts.CIRCUIT_ADVANCED.getStack());
OreUtil.registerOre("circuitElite", TRIngredients.Parts.CIRCUIT_ELITE.getStack());
OreUtil.registerOre("circuitStorage", TRIngredients.Parts.DATA_STORAGE_CIRCUIT.getStack());
OreUtil.registerOre("circuitMaster", TRIngredients.Parts.ENERGY_FLOW_CIRCUIT.getStack());
OreUtil.registerOre("circuitBasic", TRIngredients.Parts.ELECTRONIC_CIRCUIT.getStack());
OreUtil.registerOre("circuitAdvanced", TRIngredients.Parts.ADVANCED_CIRCUIT.getStack());
OreUtil.registerOre("circuitElite", TRIngredients.Parts.INDUSTRIAL_CIRCUIT.getStack());
OreUtil.registerOre("circuitStorage", TRIngredients.Parts.DATA_STORAGE_CHIP.getStack());
OreUtil.registerOre("circuitMaster", TRIngredients.Parts.ENERGY_FLOW_CHIP.getStack());
OreUtil.registerOre("craftingDiamondGrinder", TRIngredients.Parts.DIAMOND_GRINDING_HEAD.getStack());
OreUtil.registerOre("craftingTungstenGrinder", TRIngredients.Parts.TUNGSTEN_GRINDING_HEAD.getStack());
OreUtil.registerOre("craftingSuperconductor", TRIngredients.Parts.SUPER_CONDUCTOR.getStack());
OreUtil.registerOre("craftingSuperconductor", TRIngredients.Parts.SUPERCONDUCTOR.getStack());
OreUtil.registerOre("materialResin", TRIngredients.Parts.SAP.getStack());
OreUtil.registerOre("materialRubber", TRIngredients.Parts.RUBBER.getStack());
OreUtil.registerOre("itemRubber", TRIngredients.Parts.RUBBER.getStack());
@ -100,74 +98,72 @@ public class OreDict {
//OreUtil.registerOre("uran235", nothing);
//OreUtil.registerOre("uran238", nothing);
//OreUtil.registerOre("smallUran235", nothing);
// for (String ore : BlockOre.ores) {
// OreUtil.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre.getOreByName(ore));
// }
// for (String ore : BlockOre.ores) {
// OreUtil.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre.getOreByName(ore));
// }
// OreUtil.registerOre("blockSilver", BlockStorage.getStorageBlockByName("silver"));
// OreUtil.registerOre("blockAluminum", BlockStorage.getStorageBlockByName("aluminum"));
// OreUtil.registerOre("blockAluminium", BlockStorage.getStorageBlockByName("aluminum"));
// OreUtil.registerOre("blockTitanium", BlockStorage.getStorageBlockByName("titanium"));
// OreUtil.registerOre("blockChrome", BlockStorage.getStorageBlockByName("chrome"));
// OreUtil.registerOre("blockSteel", BlockStorage.getStorageBlockByName("steel"));
// OreUtil.registerOre("blockBrass", BlockStorage.getStorageBlockByName("brass"));
// OreUtil.registerOre("blockLead", BlockStorage.getStorageBlockByName("lead"));
// OreUtil.registerOre("blockElectrum", BlockStorage.getStorageBlockByName("electrum"));
// OreUtil.registerOre("blockZinc", BlockStorage.getStorageBlockByName("zinc"));
// OreUtil.registerOre("blockPlatinum", BlockStorage.getStorageBlockByName("platinum"));
// OreUtil.registerOre("blockTungsten", BlockStorage.getStorageBlockByName("tungsten"));
// OreUtil.registerOre("blockNickel", BlockStorage.getStorageBlockByName("nickel"));
// OreUtil.registerOre("blockInvar", BlockStorage.getStorageBlockByName("invar"));
// OreUtil.registerOre("blockIridium", BlockStorage.getStorageBlockByName("iridium"));
// OreUtil.registerOre("blockBronze", BlockStorage.getStorageBlockByName("bronze"));
// OreUtil.registerOre("blockCopper", BlockStorage2.getStorageBlockByName("copper", 1));
// OreUtil.registerOre("blockTin", BlockStorage2.getStorageBlockByName("tin", 1));
// OreUtil.registerOre("blockTungstensteel", BlockStorage2.getStorageBlockByName("tungstensteel", 1));
// OreUtil.registerOre("blockRuby", BlockStorage2.getStorageBlockByName("ruby", 1));
// OreUtil.registerOre("blockSapphire", BlockStorage2.getStorageBlockByName("sapphire", 1));
// OreUtil.registerOre("blockPeridot", BlockStorage2.getStorageBlockByName("peridot", 1));
// OreUtil.registerOre("blockYellowGarnet", BlockStorage2.getStorageBlockByName("yellowGarnet", 1));
// OreUtil.registerOre("blockRedGarnet", BlockStorage2.getStorageBlockByName("redGarnet", 1));
// OreUtil.registerOre("blockSilver", BlockStorage.getStorageBlockByName("silver"));
// OreUtil.registerOre("blockAluminum", BlockStorage.getStorageBlockByName("aluminum"));
// OreUtil.registerOre("blockAluminium", BlockStorage.getStorageBlockByName("aluminum"));
// OreUtil.registerOre("blockTitanium", BlockStorage.getStorageBlockByName("titanium"));
// OreUtil.registerOre("blockChrome", BlockStorage.getStorageBlockByName("chrome"));
// OreUtil.registerOre("blockSteel", BlockStorage.getStorageBlockByName("steel"));
// OreUtil.registerOre("blockBrass", BlockStorage.getStorageBlockByName("brass"));
// OreUtil.registerOre("blockLead", BlockStorage.getStorageBlockByName("lead"));
// OreUtil.registerOre("blockElectrum", BlockStorage.getStorageBlockByName("electrum"));
// OreUtil.registerOre("blockZinc", BlockStorage.getStorageBlockByName("zinc"));
// OreUtil.registerOre("blockPlatinum", BlockStorage.getStorageBlockByName("platinum"));
// OreUtil.registerOre("blockTungsten", BlockStorage.getStorageBlockByName("tungsten"));
// OreUtil.registerOre("blockNickel", BlockStorage.getStorageBlockByName("nickel"));
// OreUtil.registerOre("blockInvar", BlockStorage.getStorageBlockByName("invar"));
// OreUtil.registerOre("blockIridium", BlockStorage.getStorageBlockByName("iridium"));
// OreUtil.registerOre("blockBronze", BlockStorage.getStorageBlockByName("bronze"));
// OreUtil.registerOre("blockCopper", BlockStorage2.getStorageBlockByName("copper", 1));
// OreUtil.registerOre("blockTin", BlockStorage2.getStorageBlockByName("tin", 1));
// OreUtil.registerOre("blockTungstensteel", BlockStorage2.getStorageBlockByName("tungstensteel", 1));
// OreUtil.registerOre("blockRuby", BlockStorage2.getStorageBlockByName("ruby", 1));
// OreUtil.registerOre("blockSapphire", BlockStorage2.getStorageBlockByName("sapphire", 1));
// OreUtil.registerOre("blockPeridot", BlockStorage2.getStorageBlockByName("peridot", 1));
// OreUtil.registerOre("blockYellowGarnet", BlockStorage2.getStorageBlockByName("yellowGarnet", 1));
// OreUtil.registerOre("blockRedGarnet", BlockStorage2.getStorageBlockByName("redGarnet", 1));
// TODO: fix recipe
// for (String type : ItemGems.types) {
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "gem_" + type), ItemGems.getGemByName(type));
// boolean ignoreIt = false;
// for (String ignore : plateGenIgnores)
// if (type.startsWith(ignore))
// ignoreIt = true;
// if (!ignoreIt)
// ItemPlates.registerType(type);
// }
// TODO: fix recipe
// for (String type : ItemGems.types) {
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "gem_" + type), ItemGems.getGemByName(type));
// boolean ignoreIt = false;
// for (String ignore : plateGenIgnores)
// if (type.startsWith(ignore))
// ignoreIt = true;
// if (!ignoreIt)
// ItemPlates.registerType(type);
// }
// for (String type : ItemIngots.types) {
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "ingot_" + type), ItemIngots.getIngotByName(type));
// boolean ignoreIt = false;
// for (String ignore : plateGenIgnores)
// if (type.startsWith(ignore))
// ignoreIt = true;
// if (!ignoreIt)
// ItemPlates.registerType(type);
// }
// for (String type : ItemIngots.types) {
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "ingot_" + type), ItemIngots.getIngotByName(type));
// boolean ignoreIt = false;
// for (String ignore : plateGenIgnores)
// if (type.startsWith(ignore))
// ignoreIt = true;
// if (!ignoreIt)
// ItemPlates.registerType(type);
// }
// for (String type : ItemPlates.types) {
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type));
// }
// for (String type : ItemDusts.types) {
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_" + type), ItemDusts.getDustByName(type));
// }
//
// for (String type : ItemDustsSmall.types) {
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_small_" + type), ItemDustsSmall.getSmallDustByName(type));
// }
// for (String type : ItemPlates.types) {
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type));
// }
// for (String type : ItemNuggets.types) {
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "nugget_" + type), ItemNuggets.getNuggetByName(type));
// }
// for (String type : ItemDusts.types) {
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_" + type), ItemDusts.getDustByName(type));
// }
//
// for (String type : ItemDustsSmall.types) {
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_small_" + type), ItemDustsSmall.getSmallDustByName(type));
// }
// for (String type : ItemNuggets.types) {
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "nugget_" + type), ItemNuggets.getNuggetByName(type));
// }
}

View file

@ -21,10 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package techreborn.init;
import java.util.Arrays;
import com.google.common.base.CaseFormat;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@ -43,89 +42,92 @@ import techreborn.events.TRRecipeHandler;
import techreborn.items.ItemTR;
import techreborn.lib.ModInfo;
import java.util.Arrays;
/**
* @author drcrazy
*
*/
public class TRIngredients {
public static void registerBlocks() {
Arrays.stream(Ores.values()).forEach(value -> RebornRegistry.registerBlock(value.block));
Arrays.stream(Storage.values()).forEach(value -> RebornRegistry.registerBlock(value.block));
Arrays.stream(StorageBlocks.values()).forEach(value -> RebornRegistry.registerBlock(value.block));
}
public static void registerItems() {
Arrays.stream(Dusts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(DustsSmall.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Gems.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Ingots.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Nuggets.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Parts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Plates.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Dusts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(SmallDusts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Gems.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Ingots.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Nuggets.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Parts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Plates.values()).forEach(value -> RebornRegistry.registerItem(value.item));
}
@SideOnly(Side.CLIENT)
public static void registerModel() {
ResourceLocation dustsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/dusts");
ResourceLocation dustsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/dust");
Arrays.stream(Dusts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(dustsRL, "type=" + value.name)));
ResourceLocation dustsSmallRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/dustssmall");
Arrays.stream(DustsSmall.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(dustsSmallRL, "type=" + value.name)));
ResourceLocation gemsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/gems");
Arrays.stream(Gems.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(gemsRL, "type=" + value.name)));
ResourceLocation ingotsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/ingots");
Arrays.stream(Ingots.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(ingotsRL, "type=" + value.name)));
ResourceLocation nuggetsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/nuggets");
Arrays.stream(Nuggets.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(nuggetsRL, "type=" + value.name)));
ResourceLocation partsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/parts");
Arrays.stream(Parts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(partsRL, "type=" + value.name)));
ResourceLocation platesRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/plates");
Arrays.stream(Plates.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(platesRL, "type=" + value.name)));
new ModelResourceLocation(dustsRL, "type=" + value.unsuffixedName)));
ResourceLocation oresRL = new ResourceLocation(ModInfo.MOD_ID, "ores");
ResourceLocation dustsSmallRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/small_dust");
Arrays.stream(SmallDusts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(dustsSmallRL, "type=" + value.unsuffixedName)));
ResourceLocation gemsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/gem");
Arrays.stream(Gems.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(gemsRL, "type=" + value.unsuffixedName)));
ResourceLocation ingotsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/ingot");
Arrays.stream(Ingots.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(ingotsRL, "type=" + value.unsuffixedName)));
ResourceLocation nuggetsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/nugget");
Arrays.stream(Nuggets.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(nuggetsRL, "type=" + value.unsuffixedName)));
ResourceLocation partsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/part");
Arrays.stream(Parts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(partsRL, "type=" + value.name)));
ResourceLocation platesRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/plate");
Arrays.stream(Plates.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(platesRL, "type=" + value.unsuffixedName)));
ResourceLocation oresRL = new ResourceLocation(ModInfo.MOD_ID, "ore");
for (Ores value : Ores.values()) {
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(oresRL, "type=" + value.name));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(oresRL, "type=" + value.unsuffixedName));
ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() {
@Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
return new ModelResourceLocation(oresRL, "type=" + value.name);
return new ModelResourceLocation(oresRL, "type=" + value.unsuffixedName);
}
});
}
ResourceLocation storageRL = new ResourceLocation(ModInfo.MOD_ID, "storage");
for (Storage value : Storage.values()) {
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(storageRL, "type=" + value.name));
ResourceLocation storageRL = new ResourceLocation(ModInfo.MOD_ID, "storage_block");
for (StorageBlocks value : StorageBlocks.values()) {
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(storageRL, "type=" + value.unsuffixedName));
ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() {
@Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
return new ModelResourceLocation(storageRL, "type=" + value.name);
return new ModelResourceLocation(storageRL, "type=" + value.unsuffixedName);
}
});
}
}
}
public static enum Ores implements IStringSerializable {
BAUXITE, CINNABAR, COPPER, GALENA, IRIDIUM, LEAD, PERIDOT, PYRITE, RUBY, SAPPHIRE, SHELDONITE, SILVER, SODALITE,
SPHALERITE, TIN, TUNGSTEN;
public final String unsuffixedName;
public final String name;
public final Block block;
private Ores() {
name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "ORE_" + this.toString());
unsuffixedName = this.toString().toLowerCase();
name = this.toString().toLowerCase() + "_ore";
block = new BlockOre();
block.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
block.setTranslationKey(ModInfo.MOD_ID + ".ore." + this.toString().toLowerCase());
@ -138,20 +140,22 @@ public class TRIngredients {
}
}
public static enum Storage implements IStringSerializable {
public static enum StorageBlocks implements IStringSerializable {
ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, INVAR, IRIDIUM, IRIDIUM_REINFORCED_STONE,
IRIDIUM_REINFORCED_TUNGSTENSTEEL, LEAD, NICKEL, OSMIUM, PERIDOT, PLATINUM, RED_GARNET, REFINED_IRON, RUBY,
SAPPHIRE, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, YELLOW_GARNET, ZINC;
public final String unsuffixedName;
public final String name;
public final Block block;
private Storage() {
name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "BLOCK_" + this.toString());
private StorageBlocks() {
unsuffixedName = this.toString().toLowerCase();
name = this.toString().toLowerCase() + "_block";
block = new BlockStorage();
block.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
block.setTranslationKey(ModInfo.MOD_ID + ".storage." + this.toString().toLowerCase());
block.setTranslationKey(ModInfo.MOD_ID + ".storage_block." + this.toString().toLowerCase());
TRRecipeHandler.hideEntry(block);
}
@ -169,11 +173,13 @@ public class TRIngredients {
SAPPHIRE, SAW, SILVER, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TIN, TITANIUM, TUNGSTEN, UVAROVITE,
YELLOW_GARNET, ZINC;
public final String unsuffixedName;
public final String name;
public final Item item;
private Dusts() {
name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "DUST_" + this.toString());
unsuffixedName = this.toString().toLowerCase();
name = this.toString().toLowerCase() + "_dust";
item = new ItemTR();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
item.setTranslationKey(ModInfo.MOD_ID + ".dust." + this.toString().toLowerCase());
@ -194,7 +200,7 @@ public class TRIngredients {
}
}
public static enum DustsSmall implements IStringSerializable {
public static enum SmallDusts implements IStringSerializable {
ALMANDINE, ALUMINUM, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME,
CINNABAR, CLAY, COAL, COPPER, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE,
FLINT, GALENA, GLOWSTONE, GOLD, GRANITE, GROSSULAR, INVAR, IRON, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE,
@ -202,14 +208,16 @@ public class TRIngredients {
RUBY, SALTPETER, SAPPHIRE, SAW, SILVER, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TIN, TITANIUM,
TUNGSTEN, UVAROVITE, YELLOW_GARNET, ZINC;
public final String unsuffixedName;
public final String name;
public final Item item;
private DustsSmall() {
name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "DUST_SMALL_" + this.toString());
private SmallDusts() {
unsuffixedName = this.toString().toLowerCase();
name = this.toString().toLowerCase() + "_small_dust";
item = new ItemTR();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
item.setTranslationKey(ModInfo.MOD_ID + ".dustsmall." + this.toString().toLowerCase());
item.setTranslationKey(ModInfo.MOD_ID + ".small_dust." + this.toString().toLowerCase());
TRRecipeHandler.hideEntry(item);
}
@ -226,25 +234,27 @@ public class TRIngredients {
return name;
}
}
public static enum Gems implements IStringSerializable {
PERIDOT, RED_GARNET, RUBY, SAPPHIRE, YELLOW_GARNET;
public final String unsuffixedName;
public final String name;
public final Item item;
private Gems() {
name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "GEM_" + this.toString());
unsuffixedName = this.toString().toLowerCase();
name = this.toString().toLowerCase() + "_gem";
item = new ItemTR();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
item.setTranslationKey(ModInfo.MOD_ID + ".gem." + this.toString().toLowerCase());
TRRecipeHandler.hideEntry(item);
}
public ItemStack getStack() {
return new ItemStack(item);
}
public ItemStack getStack(int amount) {
return new ItemStack(item, amount);
}
@ -254,16 +264,18 @@ public class TRIngredients {
return name;
}
}
public static enum Ingots implements IStringSerializable {
ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM_ALLOY, IRIDIUM,
LEAD, MIXED_METAL, NICKEL, PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC;
public final String unsuffixedName;
public final String name;
public final Item item;
private Ingots() {
name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "INGOT_" + this.toString());
unsuffixedName = this.toString().toLowerCase();
name = this.toString().toLowerCase() + "_ingot";
item = new ItemTR();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
item.setTranslationKey(ModInfo.MOD_ID + ".ingot." + this.toString().toLowerCase());
@ -283,26 +295,28 @@ public class TRIngredients {
return name;
}
}
public static enum Nuggets implements IStringSerializable {
ALUMINUM, BRASS, BRONZE, CHROME, COPPER, DIAMOND, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM, LEAD, NICKEL,
PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC;
public final String unsuffixedName;
public final String name;
public final Item item;
private Nuggets() {
name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "NUGGET_" + this.toString());
unsuffixedName = this.toString().toLowerCase();
name = this.toString().toLowerCase() + "_nugget";
item = new ItemTR();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
item.setTranslationKey(ModInfo.MOD_ID + ".nuggets." + this.toString().toLowerCase());
TRRecipeHandler.hideEntry(item);
item.setTranslationKey(ModInfo.MOD_ID + ".nugget." + this.toString().toLowerCase());
TRRecipeHandler.hideEntry(item);
}
public ItemStack getStack() {
return new ItemStack(item);
}
public ItemStack getStack(int amount) {
return new ItemStack(item, amount);
}
@ -312,22 +326,56 @@ public class TRIngredients {
return name;
}
}
public static enum Parts implements IStringSerializable {
CARBON_FIBER, CARBON_MESH, CIRCUIT_ADVANCED, CIRCUIT_BASIC, CIRCUIT_ELITE, COMPUTER_MONITOR, COOLANT_SIMPLE, COOLANT_SIX, COOLANT_TRIPLE,
CUPRONICKEL_HEATING_COIL, DATA_ORB, DATA_STORAGE_CIRCUIT, DEPLETED_CELL,
DIAMOND_GRINDING_HEAD, DIAMOND_SAW_BLADE, DOUBLE_DEPLETED_CELL, DOUBLE_PLUTONIUM_CELL, DOUBLE_THORIUM_CELL,
DOUBLE_URANIUM_CELL, ENERGY_FLOW_CIRCUIT, HELIUM_COOLANT_SIMPLE, HELIUM_COOLANT_SIX,
HELIUM_COOLANT_TRIPLE, IRIDIUM_NEUTRON_REFLECTOR, KANTHAL_HEATING_COIL, MACHINE_PARTS, NAK_COOLANT_SIMPLE,
NAK_COOLANT_SIX, NAK_COOLANT_TRIPLE, NEUTRON_REFLECTOR, NICHROME_HEATING_COIL, PLUTONIUM_CELL, QUAD_DEPLETED_CELL,
QUAD_PLUTONIUM_CELL, QUAD_THORIUM_CELL, QUAD_URANIUM_CELL, RUBBER, SAP, SCRAP, SUPER_CONDUCTOR,
THICK_NEUTRON_REFLECTOR, THORIUM_CELL, TUNGSTEN_GRINDING_HEAD, URANIUM_CELL, UU_MATTER;
CARBON_FIBER,
CARBON_MESH,
ELECTRONIC_CIRCUIT,
ADVANCED_CIRCUIT,
INDUSTRIAL_CIRCUIT,
MACHINE_PARTS,
DIGITAL_DISPLAY,
DATA_STORAGE_CORE,
DATA_STORAGE_CHIP,
ENERGY_FLOW_CHIP,
SUPERCONDUCTOR,
DIAMOND_SAW_BLADE,
DIAMOND_GRINDING_HEAD,
TUNGSTEN_GRINDING_HEAD,
CUPRONICKEL_HEATING_COIL,
KANTHAL_HEATING_COIL,
NICHROME_HEATING_COIL,
NEUTRON_REFLECTOR,
THICK_NEUTRON_REFLECTOR,
IRIDIUM_NEUTRON_REFLECTOR
//java vars can't start with numbers, so these get suffixes
, WATER_COOLANT_CELL_10K,
WATER_COOLANT_CELL_30K,
WATER_COOLANT_CELL_60K,
HELIUM_COOLANT_CELL_60K,
HELIUM_COOLANT_CELL_360K,
HELIUM_COOLANT_CELL_180K,
NAK_COOLANT_CELL_60K,
NAK_COOLANT_CELL_180K,
NAK_COOLANT_CELL_360K,
RUBBER,
SAP,
SCRAP,
UU_MATTER;
public final String name;
public final Item item;
private Parts() {
name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, this.toString());
name = this.toString().toLowerCase();
item = new ItemTR();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
item.setTranslationKey(ModInfo.MOD_ID + ".part." + this.toString().toLowerCase());
@ -347,18 +395,20 @@ public class TRIngredients {
return name;
}
}
public static enum Plates implements IStringSerializable {
ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CARBON, COAL, COPPER, DIAMOND, ELECTRUM, EMERALD, GOLD, INVAR,
IRIDIUM_ALLOY, IRIDIUM, IRON, LAPIS, LAZURITE, LEAD, MAGNALIUM, NICKEL, OBSIDIAN, PERIDOT, PLATINUM, RED_GARNET,
REDSTONE, REFINED_IRON, RUBY, SAPPHIRE, SILICON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, WOOD,
YELLOW_GARNET, ZINC;
public final String unsuffixedName;
public final String name;
public final Item item;
private Plates() {
name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "PLATE_" + this.toString());
unsuffixedName = this.toString().toLowerCase();
name = this.toString().toLowerCase() + "_plate";
item = new ItemTR();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
item.setTranslationKey(ModInfo.MOD_ID + ".plate." + this.toString().toLowerCase());
@ -368,7 +418,7 @@ public class TRIngredients {
public ItemStack getStack() {
return new ItemStack(item);
}
public ItemStack getStack(int amount) {
return new ItemStack(item, amount);
}

View file

@ -31,7 +31,6 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.RebornCraftingHelper;
import techreborn.Core;
import techreborn.blocks.BlockStorage;
import techreborn.blocks.cable.EnumCableType;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks;
@ -135,10 +134,10 @@ public class CraftingTableRecipes extends RecipeMethods {
registerShaped(getStack(ModBlocks.SCRAPBOXINATOR), "ICI", "DSD", "ICI", 'S', getStack(TRItems.SCRAP_BOX), 'C', "circuitBasic", 'I', "plateIron", 'D', "dirt");
registerShaped(getStack(ModBlocks.FUSION_CONTROL_COMPUTER), "CCC", "PTP", "CCC", 'P', "energyCrystal", 'T', getStack(ModBlocks.FUSION_COIL), 'C', "circuitMaster");
// registerShaped(getStack(ModBlocks.FUSION_COIL), "CSC", "NAN", "CRC", 'A', getStack(ModBlocks.MACHINE_CASINGS, 1, 2), 'N', getMaterial("nichromeHeatingCoil", Type.PART), 'C', "circuitMaster", 'S', "craftingSuperconductor", 'R', getMaterial("iridiumNeutronReflector", Type.PART));
registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateAluminum", 'D', TRIngredients.Parts.DATA_ORB.getStack(), 'C', TRIngredients.Parts.COMPUTER_MONITOR.getStack());
registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', TRIngredients.Parts.DATA_ORB.getStack(), 'C', TRIngredients.Parts.COMPUTER_MONITOR.getStack());
registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateAluminum", 'D', TRIngredients.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRIngredients.Parts.DIGITAL_DISPLAY.getStack());
registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', TRIngredients.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRIngredients.Parts.DIGITAL_DISPLAY.getStack());
registerShaped(getStack(ModBlocks.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', getStack(ModBlocks.EXTRACTOR), 'A', "machineBlockElite", 'O', getStack(TRItems.LAPOTRONIC_ORB));
registerShaped(getStack(ModBlocks.COMPUTER_CUBE), "OMC", "MFM", "CMO", 'O', TRIngredients.Parts.DATA_ORB.getStack(), 'M', TRIngredients.Parts.COMPUTER_MONITOR.getStack(), 'C', "circuitMaster", 'F', "machineBlockAdvanced");
registerShaped(getStack(ModBlocks.COMPUTER_CUBE), "OMC", "MFM", "CMO", 'O', TRIngredients.Parts.DATA_STORAGE_CORE.getStack(), 'M', TRIngredients.Parts.DIGITAL_DISPLAY.getStack(), 'C', "circuitMaster", 'F', "machineBlockAdvanced");
registerShaped(getStack(ModBlocks.PLAYER_DETECTOR, true), " D ", "CFC", " D ", 'D', "circuitStorage", 'C', "circuitAdvanced", 'F', getStack(ModBlocks.COMPUTER_CUBE));
registerShaped(getStack(ModBlocks.DRAGON_EGG_SYPHON), "CTC", "PSP", "CBC", 'C', "circuitMaster", 'T', getStack(ModBlocks.MEDIUM_VOLTAGE_SU), 'P', "plateIridiumAlloy", 'S', "craftingSuperconductor", 'B', getStack(TRItems.LAPOTRONIC_ORB));
registerShaped(getStack(ModBlocks.PLASMA_GENERATOR), "PPP", "PTP", "CGC", 'P', "plateTungstensteel", 'T', getStack(ModBlocks.HV_TRANSFORMER), 'C', "circuitMaster", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR));
@ -166,7 +165,7 @@ public class CraftingTableRecipes extends RecipeMethods {
registerShaped(getStack(ModBlocks.IRON_FURNACE), " I ", "I I", "IFI", 'I', "ingotIron", 'F', getStack(Blocks.FURNACE));
registerShaped(getStack(ModBlocks.EXTRACTOR), "TMT", "TCT", " ", 'T', getStack(TRItems.TREE_TAP, true), 'M', "machineBlockBasic", 'C', "circuitBasic");
registerShaped(getStack(ModBlocks.GRINDER), "FFF", "SMS", " C ", 'F', Items.FLINT, 'S', getStack(Blocks.COBBLESTONE), 'M', "machineBlockBasic", 'C', "circuitBasic");
registerShaped(getStack(ModBlocks.QUANTUM_CHEST), "DCD", "ATA", "DQD", 'D', TRIngredients.Parts.DATA_ORB.getStack(), 'C', TRIngredients.Parts.COMPUTER_MONITOR.getStack(), 'A', "machineBlockElite", 'Q', getStack(ModBlocks.DIGITAL_CHEST), 'T', getStack(ModBlocks.COMPRESSOR));
registerShaped(getStack(ModBlocks.QUANTUM_CHEST), "DCD", "ATA", "DQD", 'D', TRIngredients.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRIngredients.Parts.DIGITAL_DISPLAY.getStack(), 'A', "machineBlockElite", 'Q', getStack(ModBlocks.DIGITAL_CHEST), 'T', getStack(ModBlocks.COMPRESSOR));
registerShaped(getStack(ModBlocks.QUANTUM_TANK), "EPE", "PCP", "EPE", 'P', "platePlatinum", 'E', "circuitAdvanced", 'C', getStack(ModBlocks.QUANTUM_CHEST));
registerShaped(getStack(ModBlocks.LAMP_INCANDESCENT), "GGG", "TCT", "GGG", 'G', "paneGlass", 'T', getMaterial("copper", Type.CABLE), 'C', TRIngredients.Parts.CARBON_FIBER.getStack());
registerShaped(getStack(ModBlocks.LAMP_LED), "GGG", "TLT", "GGG", 'G', "paneGlass", 'T', getMaterial("tin", Type.CABLE), 'L', "dustGlowstone");

View file

@ -26,7 +26,6 @@ package techreborn.init.recipes;
import techreborn.api.reactor.FusionReactorRecipe;
import techreborn.api.reactor.FusionReactorRecipeHelper;
import techreborn.blocks.BlockOre;
import techreborn.init.TRIngredients;
import techreborn.items.ItemCells;