maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try to make things make more sense

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

150
src/main/java/techreborn/init/OreDict.java
View file

@ -50,26 +50,24 @@ public class OreDict {
OreUtil.registerOre("treeSapling", ModBlocks.RUBBER_SAPLING); OreUtil.registerOre("treeSapling", ModBlocks.RUBBER_SAPLING);
OreUtil.registerOre("saplingRubber", ModBlocks.RUBBER_SAPLING); OreUtil.registerOre("saplingRubber", ModBlocks.RUBBER_SAPLING);
// OreUtil.registerOre("logWood", new ItemStack(RUBBER_LOG, 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("logRubber", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("plankWood", new ItemStack(RUBBER_PLANKS, 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("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("stairWood", new ItemStack(RUBBER_LOG_STAIR, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("plankRubber", new ItemStack(RUBBER_PLANKS, 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("treeLeaves", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE));
// OreUtil.registerOre("leavesRubber", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE)); // OreUtil.registerOre("leavesRubber", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE));
// Parts // Parts
OreUtil.registerOre("circuitBasic", TRIngredients.Parts.CIRCUIT_BASIC.getStack()); OreUtil.registerOre("circuitBasic", TRIngredients.Parts.ELECTRONIC_CIRCUIT.getStack());
OreUtil.registerOre("circuitAdvanced", TRIngredients.Parts.CIRCUIT_ADVANCED.getStack()); OreUtil.registerOre("circuitAdvanced", TRIngredients.Parts.ADVANCED_CIRCUIT.getStack());
OreUtil.registerOre("circuitElite", TRIngredients.Parts.CIRCUIT_ELITE.getStack()); OreUtil.registerOre("circuitElite", TRIngredients.Parts.INDUSTRIAL_CIRCUIT.getStack());
OreUtil.registerOre("circuitStorage", TRIngredients.Parts.DATA_STORAGE_CIRCUIT.getStack()); OreUtil.registerOre("circuitStorage", TRIngredients.Parts.DATA_STORAGE_CHIP.getStack());
OreUtil.registerOre("circuitMaster", TRIngredients.Parts.ENERGY_FLOW_CIRCUIT.getStack()); OreUtil.registerOre("circuitMaster", TRIngredients.Parts.ENERGY_FLOW_CHIP.getStack());
OreUtil.registerOre("craftingDiamondGrinder", TRIngredients.Parts.DIAMOND_GRINDING_HEAD.getStack()); OreUtil.registerOre("craftingDiamondGrinder", TRIngredients.Parts.DIAMOND_GRINDING_HEAD.getStack());
OreUtil.registerOre("craftingTungstenGrinder", TRIngredients.Parts.TUNGSTEN_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("materialResin", TRIngredients.Parts.SAP.getStack());
OreUtil.registerOre("materialRubber", TRIngredients.Parts.RUBBER.getStack()); OreUtil.registerOre("materialRubber", TRIngredients.Parts.RUBBER.getStack());
OreUtil.registerOre("itemRubber", TRIngredients.Parts.RUBBER.getStack()); OreUtil.registerOre("itemRubber", TRIngredients.Parts.RUBBER.getStack());
@ -101,73 +99,71 @@ public class OreDict {
//OreUtil.registerOre("uran238", nothing); //OreUtil.registerOre("uran238", nothing);
//OreUtil.registerOre("smallUran235", nothing); //OreUtil.registerOre("smallUran235", nothing);
// for (String ore : BlockOre.ores) { // for (String ore : BlockOre.ores) {
// OreUtil.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre.getOreByName(ore)); // 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")); // TODO: fix recipe
// OreUtil.registerOre("blockAluminum", BlockStorage.getStorageBlockByName("aluminum")); // for (String type : ItemGems.types) {
// OreUtil.registerOre("blockAluminium", BlockStorage.getStorageBlockByName("aluminum")); // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "gem_" + type), ItemGems.getGemByName(type));
// OreUtil.registerOre("blockTitanium", BlockStorage.getStorageBlockByName("titanium")); // boolean ignoreIt = false;
// OreUtil.registerOre("blockChrome", BlockStorage.getStorageBlockByName("chrome")); // for (String ignore : plateGenIgnores)
// OreUtil.registerOre("blockSteel", BlockStorage.getStorageBlockByName("steel")); // if (type.startsWith(ignore))
// OreUtil.registerOre("blockBrass", BlockStorage.getStorageBlockByName("brass")); // ignoreIt = true;
// OreUtil.registerOre("blockLead", BlockStorage.getStorageBlockByName("lead")); // if (!ignoreIt)
// OreUtil.registerOre("blockElectrum", BlockStorage.getStorageBlockByName("electrum")); // ItemPlates.registerType(type);
// 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));
// 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);
// }
// TODO: fix recipe // for (String type : ItemPlates.types) {
// for (String type : ItemGems.types) { // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type));
// 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) { // for (String type : ItemDusts.types) {
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "ingot_" + type), ItemIngots.getIngotByName(type)); // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_" + type), ItemDusts.getDustByName(type));
// boolean ignoreIt = false; // }
// for (String ignore : plateGenIgnores) //
// if (type.startsWith(ignore)) // for (String type : ItemDustsSmall.types) {
// ignoreIt = true; // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_small_" + type), ItemDustsSmall.getSmallDustByName(type));
// if (!ignoreIt) // }
// ItemPlates.registerType(type);
// }
// for (String type : ItemPlates.types) { // for (String type : ItemNuggets.types) {
// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type)); // 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));
// }
} }

164
src/main/java/techreborn/init/TRIngredients.java
View file

@ -21,10 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. * SOFTWARE.
*/ */
package techreborn.init; package techreborn.init;
import java.util.Arrays;
import com.google.common.base.CaseFormat;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@ -43,75 +42,76 @@ import techreborn.events.TRRecipeHandler;
import techreborn.items.ItemTR; import techreborn.items.ItemTR;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import java.util.Arrays;
/** /**
* @author drcrazy * @author drcrazy
*
*/ */
public class TRIngredients { public class TRIngredients {
public static void registerBlocks() { public static void registerBlocks() {
Arrays.stream(Ores.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); 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() { public static void registerItems() {
Arrays.stream(Dusts.values()).forEach(value -> RebornRegistry.registerItem(value.item)); Arrays.stream(Dusts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(DustsSmall.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(Gems.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Ingots.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(Nuggets.values()).forEach(value -> RebornRegistry.registerItem(value.item));
Arrays.stream(Parts.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(Plates.values()).forEach(value -> RebornRegistry.registerItem(value.item));
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public static void registerModel() { 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, Arrays.stream(Dusts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(dustsRL, "type=" + value.name))); new ModelResourceLocation(dustsRL, "type=" + value.unsuffixedName)));
ResourceLocation dustsSmallRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/dustssmall"); ResourceLocation dustsSmallRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/small_dust");
Arrays.stream(DustsSmall.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, Arrays.stream(SmallDusts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(dustsSmallRL, "type=" + value.name))); new ModelResourceLocation(dustsSmallRL, "type=" + value.unsuffixedName)));
ResourceLocation gemsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/gems"); ResourceLocation gemsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/gem");
Arrays.stream(Gems.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, Arrays.stream(Gems.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(gemsRL, "type=" + value.name))); new ModelResourceLocation(gemsRL, "type=" + value.unsuffixedName)));
ResourceLocation ingotsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/ingots"); ResourceLocation ingotsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/ingot");
Arrays.stream(Ingots.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, Arrays.stream(Ingots.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(ingotsRL, "type=" + value.name))); new ModelResourceLocation(ingotsRL, "type=" + value.unsuffixedName)));
ResourceLocation nuggetsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/nuggets"); ResourceLocation nuggetsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/nugget");
Arrays.stream(Nuggets.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, Arrays.stream(Nuggets.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(nuggetsRL, "type=" + value.name))); new ModelResourceLocation(nuggetsRL, "type=" + value.unsuffixedName)));
ResourceLocation partsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/parts"); ResourceLocation partsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/part");
Arrays.stream(Parts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, Arrays.stream(Parts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(partsRL, "type=" + value.name))); new ModelResourceLocation(partsRL, "type=" + value.name)));
ResourceLocation platesRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/plates"); ResourceLocation platesRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/plate");
Arrays.stream(Plates.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, Arrays.stream(Plates.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
new ModelResourceLocation(platesRL, "type=" + value.name))); new ModelResourceLocation(platesRL, "type=" + value.unsuffixedName)));
ResourceLocation oresRL = new ResourceLocation(ModInfo.MOD_ID, "ores"); ResourceLocation oresRL = new ResourceLocation(ModInfo.MOD_ID, "ore");
for (Ores value : Ores.values()) { 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() { ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() {
@Override @Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state) { 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"); ResourceLocation storageRL = new ResourceLocation(ModInfo.MOD_ID, "storage_block");
for (Storage value : Storage.values()) { for (StorageBlocks value : StorageBlocks.values()) {
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(storageRL, "type=" + value.name)); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(storageRL, "type=" + value.unsuffixedName));
ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() { ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() {
@Override @Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state) { protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
return new ModelResourceLocation(storageRL, "type=" + value.name); return new ModelResourceLocation(storageRL, "type=" + value.unsuffixedName);
} }
}); });
} }
@ -121,11 +121,13 @@ public class TRIngredients {
BAUXITE, CINNABAR, COPPER, GALENA, IRIDIUM, LEAD, PERIDOT, PYRITE, RUBY, SAPPHIRE, SHELDONITE, SILVER, SODALITE, BAUXITE, CINNABAR, COPPER, GALENA, IRIDIUM, LEAD, PERIDOT, PYRITE, RUBY, SAPPHIRE, SHELDONITE, SILVER, SODALITE,
SPHALERITE, TIN, TUNGSTEN; SPHALERITE, TIN, TUNGSTEN;
public final String unsuffixedName;
public final String name; public final String name;
public final Block block; public final Block block;
private Ores() { 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 = new BlockOre();
block.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); block.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
block.setTranslationKey(ModInfo.MOD_ID + ".ore." + this.toString().toLowerCase()); block.setTranslationKey(ModInfo.MOD_ID + ".ore." + this.toString().toLowerCase());
@ -139,19 +141,21 @@ 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, ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, INVAR, IRIDIUM, IRIDIUM_REINFORCED_STONE,
IRIDIUM_REINFORCED_TUNGSTENSTEEL, LEAD, NICKEL, OSMIUM, PERIDOT, PLATINUM, RED_GARNET, REFINED_IRON, RUBY, IRIDIUM_REINFORCED_TUNGSTENSTEEL, LEAD, NICKEL, OSMIUM, PERIDOT, PLATINUM, RED_GARNET, REFINED_IRON, RUBY,
SAPPHIRE, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, YELLOW_GARNET, ZINC; SAPPHIRE, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, YELLOW_GARNET, ZINC;
public final String unsuffixedName;
public final String name; public final String name;
public final Block block; public final Block block;
private Storage() { private StorageBlocks() {
name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "BLOCK_" + this.toString()); unsuffixedName = this.toString().toLowerCase();
name = this.toString().toLowerCase() + "_block";
block = new BlockStorage(); block = new BlockStorage();
block.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); 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); TRRecipeHandler.hideEntry(block);
} }
@ -169,11 +173,13 @@ public class TRIngredients {
SAPPHIRE, SAW, SILVER, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TIN, TITANIUM, TUNGSTEN, UVAROVITE, SAPPHIRE, SAW, SILVER, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TIN, TITANIUM, TUNGSTEN, UVAROVITE,
YELLOW_GARNET, ZINC; YELLOW_GARNET, ZINC;
public final String unsuffixedName;
public final String name; public final String name;
public final Item item; public final Item item;
private Dusts() { 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 = new ItemTR();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
item.setTranslationKey(ModInfo.MOD_ID + ".dust." + this.toString().toLowerCase()); 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, 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, 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, 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, RUBY, SALTPETER, SAPPHIRE, SAW, SILVER, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TIN, TITANIUM,
TUNGSTEN, UVAROVITE, YELLOW_GARNET, ZINC; TUNGSTEN, UVAROVITE, YELLOW_GARNET, ZINC;
public final String unsuffixedName;
public final String name; public final String name;
public final Item item; public final Item item;
private DustsSmall() { private SmallDusts() {
name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "DUST_SMALL_" + this.toString()); unsuffixedName = this.toString().toLowerCase();
name = this.toString().toLowerCase() + "_small_dust";
item = new ItemTR(); item = new ItemTR();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); 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); TRRecipeHandler.hideEntry(item);
} }
@ -230,11 +238,13 @@ public class TRIngredients {
public static enum Gems implements IStringSerializable { public static enum Gems implements IStringSerializable {
PERIDOT, RED_GARNET, RUBY, SAPPHIRE, YELLOW_GARNET; PERIDOT, RED_GARNET, RUBY, SAPPHIRE, YELLOW_GARNET;
public final String unsuffixedName;
public final String name; public final String name;
public final Item item; public final Item item;
private Gems() { 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 = new ItemTR();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
item.setTranslationKey(ModInfo.MOD_ID + ".gem." + this.toString().toLowerCase()); item.setTranslationKey(ModInfo.MOD_ID + ".gem." + this.toString().toLowerCase());
@ -259,11 +269,13 @@ public class TRIngredients {
ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM_ALLOY, IRIDIUM, 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; LEAD, MIXED_METAL, NICKEL, PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC;
public final String unsuffixedName;
public final String name; public final String name;
public final Item item; public final Item item;
private Ingots() { 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 = new ItemTR();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
item.setTranslationKey(ModInfo.MOD_ID + ".ingot." + this.toString().toLowerCase()); item.setTranslationKey(ModInfo.MOD_ID + ".ingot." + this.toString().toLowerCase());
@ -288,14 +300,16 @@ public class TRIngredients {
ALUMINUM, BRASS, BRONZE, CHROME, COPPER, DIAMOND, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM, LEAD, NICKEL, ALUMINUM, BRASS, BRONZE, CHROME, COPPER, DIAMOND, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM, LEAD, NICKEL,
PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC; PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC;
public final String unsuffixedName;
public final String name; public final String name;
public final Item item; public final Item item;
private Nuggets() { 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 = new ItemTR();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
item.setTranslationKey(ModInfo.MOD_ID + ".nuggets." + this.toString().toLowerCase()); item.setTranslationKey(ModInfo.MOD_ID + ".nugget." + this.toString().toLowerCase());
TRRecipeHandler.hideEntry(item); TRRecipeHandler.hideEntry(item);
} }
@ -314,20 +328,54 @@ public class TRIngredients {
} }
public static enum Parts implements IStringSerializable { public static enum Parts implements IStringSerializable {
CARBON_FIBER, CARBON_MESH, CIRCUIT_ADVANCED, CIRCUIT_BASIC, CIRCUIT_ELITE, COMPUTER_MONITOR, COOLANT_SIMPLE, COOLANT_SIX, COOLANT_TRIPLE, CARBON_FIBER,
CUPRONICKEL_HEATING_COIL, DATA_ORB, DATA_STORAGE_CIRCUIT, DEPLETED_CELL, CARBON_MESH,
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, ELECTRONIC_CIRCUIT,
HELIUM_COOLANT_TRIPLE, IRIDIUM_NEUTRON_REFLECTOR, KANTHAL_HEATING_COIL, MACHINE_PARTS, NAK_COOLANT_SIMPLE, ADVANCED_CIRCUIT,
NAK_COOLANT_SIX, NAK_COOLANT_TRIPLE, NEUTRON_REFLECTOR, NICHROME_HEATING_COIL, PLUTONIUM_CELL, QUAD_DEPLETED_CELL, INDUSTRIAL_CIRCUIT,
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; 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 String name;
public final Item item; public final Item item;
private Parts() { private Parts() {
name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, this.toString()); name = this.toString().toLowerCase();
item = new ItemTR(); item = new ItemTR();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
item.setTranslationKey(ModInfo.MOD_ID + ".part." + this.toString().toLowerCase()); item.setTranslationKey(ModInfo.MOD_ID + ".part." + this.toString().toLowerCase());
@ -354,11 +402,13 @@ public class TRIngredients {
REDSTONE, REFINED_IRON, RUBY, SAPPHIRE, SILICON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, WOOD, REDSTONE, REFINED_IRON, RUBY, SAPPHIRE, SILICON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, WOOD,
YELLOW_GARNET, ZINC; YELLOW_GARNET, ZINC;
public final String unsuffixedName;
public final String name; public final String name;
public final Item item; public final Item item;
private Plates() { 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 = new ItemTR();
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
item.setTranslationKey(ModInfo.MOD_ID + ".plate." + this.toString().toLowerCase()); item.setTranslationKey(ModInfo.MOD_ID + ".plate." + this.toString().toLowerCase());

9
src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
View file

@ -31,7 +31,6 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.RebornCraftingHelper; import reborncore.common.util.RebornCraftingHelper;
import techreborn.Core; import techreborn.Core;
import techreborn.blocks.BlockStorage;
import techreborn.blocks.cable.EnumCableType; import techreborn.blocks.cable.EnumCableType;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks; 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.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_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.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', "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_ORB.getStack(), 'C', TRIngredients.Parts.COMPUTER_MONITOR.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.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.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.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)); 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.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.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.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.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_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"); registerShaped(getStack(ModBlocks.LAMP_LED), "GGG", "TLT", "GGG", 'G', "paneGlass", 'T', getMaterial("tin", Type.CABLE), 'L', "dustGlowstone");

1
src/main/java/techreborn/init/recipes/FusionReactorRecipes.java
View file

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

124
src/main/resources/assets/techreborn/blockstates/items/materials/dusts.json → src/main/resources/assets/techreborn/blockstates/items/material/dust.json
View file

@ -6,312 +6,312 @@
}, },
"variants": { "variants": {
"type": { "type": {
"dustalmandine": { "almandine": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/almandine_dust" "layer0": "techreborn:items/dust/almandine_dust"
} }
}, },
"dustaluminum": { "aluminum": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/aluminum_dust" "layer0": "techreborn:items/dust/aluminum_dust"
} }
}, },
"dustandesite": { "andesite": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/andesite_dust" "layer0": "techreborn:items/dust/andesite_dust"
} }
}, },
"dustandradite": { "andradite": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/andradite_dust" "layer0": "techreborn:items/dust/andradite_dust"
} }
}, },
"dustashes": { "ashes": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/ashes_dust" "layer0": "techreborn:items/dust/ashes_dust"
} }
}, },
"dustbasalt": { "basalt": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/basalt_dust" "layer0": "techreborn:items/dust/basalt_dust"
} }
}, },
"dustbauxite": { "bauxite": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/bauxite_dust" "layer0": "techreborn:items/dust/bauxite_dust"
} }
}, },
"dustbrass": { "brass": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/brass_dust" "layer0": "techreborn:items/dust/brass_dust"
} }
}, },
"dustbronze": { "bronze": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/bronze_dust" "layer0": "techreborn:items/dust/bronze_dust"
} }
}, },
"dustcalcite": { "calcite": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/calcite_dust" "layer0": "techreborn:items/dust/calcite_dust"
} }
}, },
"dustcharcoal": { "charcoal": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/charcoal_dust" "layer0": "techreborn:items/dust/charcoal_dust"
} }
}, },
"dustchrome": { "chrome": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/chrome_dust" "layer0": "techreborn:items/dust/chrome_dust"
} }
}, },
"dustcinnabar": { "cinnabar": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/cinnabar_dust" "layer0": "techreborn:items/dust/cinnabar_dust"
} }
}, },
"dustclay": { "clay": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/clay_dust" "layer0": "techreborn:items/dust/clay_dust"
} }
}, },
"dustcoal": { "coal": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/coal_dust" "layer0": "techreborn:items/dust/coal_dust"
} }
}, },
"dustcopper": { "copper": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/copper_dust" "layer0": "techreborn:items/dust/copper_dust"
} }
}, },
"dustdarkashes": { "dark_ashes": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/dark_ashes_dust" "layer0": "techreborn:items/dust/dark_ashes_dust"
} }
}, },
"dustdiamond": { "diamond": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/diamond_dust" "layer0": "techreborn:items/dust/diamond_dust"
} }
}, },
"dustdiorite": { "diorite": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/diorite_dust" "layer0": "techreborn:items/dust/diorite_dust"
} }
}, },
"dustelectrum": { "electrum": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/electrum_dust" "layer0": "techreborn:items/dust/electrum_dust"
} }
}, },
"dustemerald": { "emerald": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/emerald_dust" "layer0": "techreborn:items/dust/emerald_dust"
} }
}, },
"dustendereye": { "ender_eye": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/ender_eye_dust" "layer0": "techreborn:items/dust/ender_eye_dust"
} }
}, },
"dustenderpearl": { "ender_pearl": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/ender_pearl_dust" "layer0": "techreborn:items/dust/ender_pearl_dust"
} }
}, },
"dustendstone": { "endstone": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/endstone_dust" "layer0": "techreborn:items/dust/endstone_dust"
} }
}, },
"dustflint": { "flint": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/flint_dust" "layer0": "techreborn:items/dust/flint_dust"
} }
}, },
"dustgalena": { "galena": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/galena_dust" "layer0": "techreborn:items/dust/galena_dust"
} }
}, },
"dustgold": { "gold": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/gold_dust" "layer0": "techreborn:items/dust/gold_dust"
} }
}, },
"dustgranite": { "granite": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/granite_dust" "layer0": "techreborn:items/dust/granite_dust"
} }
}, },
"dustgrossular": { "grossular": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/grossular_dust" "layer0": "techreborn:items/dust/grossular_dust"
} }
}, },
"dustinvar": { "invar": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/invar_dust" "layer0": "techreborn:items/dust/invar_dust"
} }
}, },
"dustiron": { "iron": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/iron_dust" "layer0": "techreborn:items/dust/iron_dust"
} }
}, },
"dustlazurite": { "lazurite": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/lazurite_dust" "layer0": "techreborn:items/dust/lazurite_dust"
} }
}, },
"dustlead": { "lead": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/lead_dust" "layer0": "techreborn:items/dust/lead_dust"
} }
}, },
"dustmagnesium": { "magnesium": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/magnesium_dust" "layer0": "techreborn:items/dust/magnesium_dust"
} }
}, },
"dustmanganese": { "manganese": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/manganese_dust" "layer0": "techreborn:items/dust/manganese_dust"
} }
}, },
"dustmarble": { "marble": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/marble_dust" "layer0": "techreborn:items/dust/marble_dust"
} }
}, },
"dustnetherrack": { "netherrack": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/netherrack_dust" "layer0": "techreborn:items/dust/netherrack_dust"
} }
}, },
"dustnickel": { "nickel": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/nickel_dust" "layer0": "techreborn:items/dust/nickel_dust"
} }
}, },
"dustobsidian": { "obsidian": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/obsidian_dust" "layer0": "techreborn:items/dust/obsidian_dust"
} }
}, },
"dustolivine": { "olivine": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/olivine_dust" "layer0": "techreborn:items/dust/olivine_dust"
} }
}, },
"dustperidot": { "peridot": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/peridot_dust" "layer0": "techreborn:items/dust/peridot_dust"
} }
}, },
"dustphosphorous": { "phosphorous": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/phosphorous_dust" "layer0": "techreborn:items/dust/phosphorous_dust"
} }
}, },
"dustplatinum": { "platinum": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/platinum_dust" "layer0": "techreborn:items/dust/platinum_dust"
} }
}, },
"dustpyrite": { "pyrite": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/pyrite_dust" "layer0": "techreborn:items/dust/pyrite_dust"
} }
}, },
"dustpyrope": { "pyrope": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/pyrope_dust" "layer0": "techreborn:items/dust/pyrope_dust"
} }
}, },
"dustredgarnet": { "red_garnet": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/red_garnet_dust" "layer0": "techreborn:items/dust/red_garnet_dust"
} }
}, },
"dustruby": { "ruby": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/ruby_dust" "layer0": "techreborn:items/dust/ruby_dust"
} }
}, },
"dustsaltpeter": { "saltpeter": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/saltpeter_dust" "layer0": "techreborn:items/dust/saltpeter_dust"
} }
}, },
"dustsapphire": { "sapphire": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/sapphire_dust" "layer0": "techreborn:items/dust/sapphire_dust"
} }
}, },
"dustsaw": { "saw": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/saw_dust_dust" "layer0": "techreborn:items/dust/saw_dust_dust"
} }
}, },
"dustsilver": { "silver": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/silver_dust" "layer0": "techreborn:items/dust/silver_dust"
} }
}, },
"dustsodalite": { "sodalite": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/sodalite_dust" "layer0": "techreborn:items/dust/sodalite_dust"
} }
}, },
"dustspessartine": { "spessartine": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/spessartine_dust" "layer0": "techreborn:items/dust/spessartine_dust"
} }
}, },
"dustsphalerite": { "sphalerite": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/sphalerite_dust" "layer0": "techreborn:items/dust/sphalerite_dust"
} }
}, },
"duststeel": { "steel": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/steel_dust" "layer0": "techreborn:items/dust/steel_dust"
} }
}, },
"dustsulfur": { "sulfur": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/sulfur_dust" "layer0": "techreborn:items/dust/sulfur_dust"
} }
}, },
"dusttin": { "tin": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/tin_dust" "layer0": "techreborn:items/dust/tin_dust"
} }
}, },
"dusttitanium": { "titanium": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/titanium_dust" "layer0": "techreborn:items/dust/titanium_dust"
} }
}, },
"dusttungsten": { "tungsten": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/tungsten_dust" "layer0": "techreborn:items/dust/tungsten_dust"
} }
}, },
"dustuvarovite": { "uvarovite": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/uvarovite_dust" "layer0": "techreborn:items/dust/uvarovite_dust"
} }
}, },
"dustyellowgarnet": { "yellow_garnet": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/yellow_garnet_dust" "layer0": "techreborn:items/dust/yellow_garnet_dust"
} }
}, },
"dustzinc": { "zinc": {
"textures": { "textures": {
"layer0": "techreborn:items/dust/zinc_dust" "layer0": "techreborn:items/dust/zinc_dust"
} }

10
src/main/resources/assets/techreborn/blockstates/items/materials/gems.json → src/main/resources/assets/techreborn/blockstates/items/material/gem.json
View file

@ -6,27 +6,27 @@
}, },
"variants": { "variants": {
"type": { "type": {
"gemperidot": { "peridot": {
"textures": { "textures": {
"layer0": "techreborn:items/gem/peridot" "layer0": "techreborn:items/gem/peridot"
} }
}, },
"gemredgarnet": { "red_garnet": {
"textures": { "textures": {
"layer0": "techreborn:items/gem/red_garnet" "layer0": "techreborn:items/gem/red_garnet"
} }
}, },
"gemruby": { "ruby": {
"textures": { "textures": {
"layer0": "techreborn:items/gem/ruby" "layer0": "techreborn:items/gem/ruby"
} }
}, },
"gemsapphire": { "sapphire": {
"textures": { "textures": {
"layer0": "techreborn:items/gem/sapphire" "layer0": "techreborn:items/gem/sapphire"
} }
}, },
"gemyellowgarnet": { "yellow_garnet": {
"textures": { "textures": {
"layer0": "techreborn:items/gem/yellow_garnet" "layer0": "techreborn:items/gem/yellow_garnet"
} }

46
src/main/resources/assets/techreborn/blockstates/items/materials/ingots.json → src/main/resources/assets/techreborn/blockstates/items/material/ingot.json
View file

@ -6,117 +6,117 @@
}, },
"variants": { "variants": {
"type": { "type": {
"ingotadvancedalloy": { "advanced_alloy": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/advanced_alloy_ingot" "layer0": "techreborn:items/ingot/advanced_alloy_ingot"
} }
}, },
"ingotaluminum": { "aluminum": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/aluminum_ingot" "layer0": "techreborn:items/ingot/aluminum_ingot"
} }
}, },
"ingotbrass": { "brass": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/brass_ingot" "layer0": "techreborn:items/ingot/brass_ingot"
} }
}, },
"ingotbronze": { "bronze": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/bronze_ingot" "layer0": "techreborn:items/ingot/bronze_ingot"
} }
}, },
"ingotchrome": { "chrome": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/chrome_ingot" "layer0": "techreborn:items/ingot/chrome_ingot"
} }
}, },
"ingotcopper": { "copper": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/copper_ingot" "layer0": "techreborn:items/ingot/copper_ingot"
} }
}, },
"ingotelectrum": { "electrum": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/electrum_ingot" "layer0": "techreborn:items/ingot/electrum_ingot"
} }
}, },
"ingothottungstensteel": { "hot_tungstensteel": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/hot_tungstensteel_ingot" "layer0": "techreborn:items/ingot/hot_tungstensteel_ingot"
} }
}, },
"ingotinvar": { "invar": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/invar_ingot" "layer0": "techreborn:items/ingot/invar_ingot"
} }
}, },
"ingotiridiumalloy": { "iridium_alloy": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/iridium_alloy_ingot" "layer0": "techreborn:items/ingot/iridium_alloy_ingot"
} }
}, },
"ingotiridium": { "iridium": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/iridium_ingot" "layer0": "techreborn:items/ingot/iridium_ingot"
} }
}, },
"ingotlead": { "lead": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/lead_ingot" "layer0": "techreborn:items/ingot/lead_ingot"
} }
}, },
"ingotmixedmetal": { "mixed_metal": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/mixed_metal_ingot" "layer0": "techreborn:items/ingot/mixed_metal_ingot"
} }
}, },
"ingotnickel": { "nickel": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/nickel_ingot" "layer0": "techreborn:items/ingot/nickel_ingot"
} }
}, },
"ingotplatinum": { "platinum": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/platinum_ingot" "layer0": "techreborn:items/ingot/platinum_ingot"
} }
}, },
"ingotrefinediron": { "refined_iron": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/refined_iron_ingot" "layer0": "techreborn:items/ingot/refined_iron_ingot"
} }
}, },
"ingotsilver": { "silver": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/silver_ingot" "layer0": "techreborn:items/ingot/silver_ingot"
} }
}, },
"ingotsteel": { "steel": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/steel_ingot" "layer0": "techreborn:items/ingot/steel_ingot"
} }
}, },
"ingottin": { "tin": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/tin_ingot" "layer0": "techreborn:items/ingot/tin_ingot"
} }
}, },
"ingottitanium": { "titanium": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/titanium_ingot" "layer0": "techreborn:items/ingot/titanium_ingot"
} }
}, },
"ingottungsten": { "tungsten": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/tungsten_ingot" "layer0": "techreborn:items/ingot/tungsten_ingot"
} }
}, },
"ingottungstensteel": { "tungstensteel": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/tungstensteel_ingot" "layer0": "techreborn:items/ingot/tungstensteel_ingot"
} }
}, },
"ingotzinc": { "zinc": {
"textures": { "textures": {
"layer0": "techreborn:items/ingot/zinc_ingot" "layer0": "techreborn:items/ingot/zinc_ingot"
} }

42
src/main/resources/assets/techreborn/blockstates/items/materials/nuggets.json → src/main/resources/assets/techreborn/blockstates/items/material/nugget.json
View file

@ -6,107 +6,107 @@
}, },
"variants": { "variants": {
"type": { "type": {
"nuggetaluminum": { "aluminum": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/aluminum_nugget" "layer0": "techreborn:items/nugget/aluminum_nugget"
} }
}, },
"nuggetbrass": { "brass": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/brass_nugget" "layer0": "techreborn:items/nugget/brass_nugget"
} }
}, },
"nuggetbronze": { "bronze": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/bronze_nugget" "layer0": "techreborn:items/nugget/bronze_nugget"
} }
}, },
"nuggetchrome": { "chrome": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/chrome_nugget" "layer0": "techreborn:items/nugget/chrome_nugget"
} }
}, },
"nuggetcopper": { "copper": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/copper_nugget" "layer0": "techreborn:items/nugget/copper_nugget"
} }
}, },
"nuggetdiamond": { "diamond": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/diamond_nugget" "layer0": "techreborn:items/nugget/diamond_nugget"
} }
}, },
"nuggetelectrum": { "electrum": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/electrum_nugget" "layer0": "techreborn:items/nugget/electrum_nugget"
} }
}, },
"nuggethottungstensteel": { "hot_tungstensteel": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/hot_tungstensteel_nugget" "layer0": "techreborn:items/nugget/hot_tungstensteel_nugget"
} }
}, },
"nuggetinvar": { "invar": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/invar_nugget" "layer0": "techreborn:items/nugget/invar_nugget"
} }
}, },
"nuggetiridium": { "iridium": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/iridium_nugget" "layer0": "techreborn:items/nugget/iridium_nugget"
} }
}, },
"nuggetlead": { "lead": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/lead_nugget" "layer0": "techreborn:items/nugget/lead_nugget"
} }
}, },
"nuggetnickel": { "nickel": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/nickel_nugget" "layer0": "techreborn:items/nugget/nickel_nugget"
} }
}, },
"nuggetplatinum": { "platinum": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/platinum_nugget" "layer0": "techreborn:items/nugget/platinum_nugget"
} }
}, },
"nuggetrefinediron": { "refined_iron": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/refined_iron_nugget" "layer0": "techreborn:items/nugget/refined_iron_nugget"
} }
}, },
"nuggetsilver": { "silver": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/silver_nugget" "layer0": "techreborn:items/nugget/silver_nugget"
} }
}, },
"nuggetsteel": { "steel": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/steel_nugget" "layer0": "techreborn:items/nugget/steel_nugget"
} }
}, },
"nuggettin": { "tin": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/tin_nugget" "layer0": "techreborn:items/nugget/tin_nugget"
} }
}, },
"nuggettitanium": { "titanium": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/titanium_nugget" "layer0": "techreborn:items/nugget/titanium_nugget"
} }
}, },
"nuggettungsten": { "tungsten": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/tungsten_nugget" "layer0": "techreborn:items/nugget/tungsten_nugget"
} }
}, },
"nuggettungstensteel": { "tungstensteel": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/tungstensteel_nugget" "layer0": "techreborn:items/nugget/tungstensteel_nugget"
} }
}, },
"nuggetzinc": { "zinc": {
"textures": { "textures": {
"layer0": "techreborn:items/nugget/zinc_nugget" "layer0": "techreborn:items/nugget/zinc_nugget"
} }

176
src/main/resources/assets/techreborn/blockstates/items/material/part.json Normal file
View file

@ -0,0 +1,176 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item"
},
"variants": {
"type": {
"carbon_fiber": {
"textures": {
"layer0": "techreborn:items/part/carbon_fiber"
}
},
"carbon_mesh": {
"textures": {
"layer0": "techreborn:items/part/carbon_mesh"
}
},
"advanced_circuit": {
"textures": {
"layer0": "techreborn:items/part/advanced_circuit"
}
},
"electronic_circuit": {
"textures": {
"layer0": "techreborn:items/part/electronic_circuit"
}
},
"industrial_circuit": {
"textures": {
"layer0": "techreborn:items/part/industrial_circuit"
}
},
"digital_display": {
"textures": {
"layer0": "techreborn:items/part/digital_display"
}
},
"water_coolant_cell_10k": {
"textures": {
"layer0": "techreborn:items/part/coolant_simple"
}
},
"water_coolant_cell_60k": {
"textures": {
"layer0": "techreborn:items/part/coolant_six"
}
},
"water_coolant_cell_30k": {
"textures": {
"layer0": "techreborn:items/part/coolant_triple"
}
},
"cupronickel_heating_coil": {
"textures": {
"layer0": "techreborn:items/part/cupronickel_heating_coil"
}
},
"kanthal_heating_coil": {
"textures": {
"layer0": "techreborn:items/part/kanthal_heating_coil"
}
},
"data_storage_core": {
"textures": {
"layer0": "techreborn:items/part/data_storage_core"
}
},
"data_storage_chip": {
"textures": {
"layer0": "techreborn:items/part/data_storage_chip"
}
},
"diamond_grinding_head": {
"textures": {
"layer0": "techreborn:items/part/diamond_grinding_head"
}
},
"diamond_saw_blade": {
"textures": {
"layer0": "techreborn:items/part/diamond_saw_blade"
}
},
"energy_flow_chip": {
"textures": {
"layer0": "techreborn:items/part/energy_flow_circuit"
}
},
"helium_coolant_cell_60k": {
"textures": {
"layer0": "techreborn:items/part/helium_coolant_simple"
}
},
"helium_coolant_cell_360k": {
"textures": {
"layer0": "techreborn:items/part/helium_coolant_six"
}
},
"helium_coolant_cell_180k": {
"textures": {
"layer0": "techreborn:items/part/helium_coolant_triple"
}
},
"iridium_neutron_reflector": {
"textures": {
"layer0": "techreborn:items/part/iridium_neutron_reflector"
}
},
"machine_parts": {
"textures": {
"layer0": "techreborn:items/part/machine_parts"
}
},
"nak_coolant_cell_60k": {
"textures": {
"layer0": "techreborn:items/part/nak_coolant_simple"
}
},
"nak_coolant_cell_360k": {
"textures": {
"layer0": "techreborn:items/part/nak_coolant_six"
}
},
"nak_coolant_cell_180k": {
"textures": {
"layer0": "techreborn:items/part/nak_coolant_triple"
}
},
"neutron_reflector": {
"textures": {
"layer0": "techreborn:items/part/neutron_reflector"
}
},
"nichrome_heating_coil": {
"textures": {
"layer0": "techreborn:items/part/nichrome_heating_coil"
}
},
"rubber": {
"textures": {
"layer0": "techreborn:items/part/rubber"
}
},
"sap": {
"textures": {
"layer0": "techreborn:items/part/sap"
}
},
"scrap": {
"textures": {
"layer0": "techreborn:items/part/scrap"
}
},
"superconductor": {
"textures": {
"layer0": "techreborn:items/part/super_conductor"
}
},
"thick_neutron_reflector": {
"textures": {
"layer0": "techreborn:items/part/thick_neutron_reflector"
}
},
"tungsten_grinding_head": {
"textures": {
"layer0": "techreborn:items/part/tungsten_grinding_head"
}
},
"uu_matter": {
"textures": {
"layer0": "techreborn:items/part/uu_matter"
}
}
}
}
}

78
src/main/resources/assets/techreborn/blockstates/items/materials/plates.json → src/main/resources/assets/techreborn/blockstates/items/material/plate.json
View file

@ -6,197 +6,197 @@
}, },
"variants": { "variants": {
"type": { "type": {
"plateadvancedalloy": { "advanced_alloy": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/advanced_alloy_plate" "layer0": "techreborn:items/plate/advanced_alloy_plate"
} }
}, },
"platealuminum": { "aluminum": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/aluminum_plate" "layer0": "techreborn:items/plate/aluminum_plate"
} }
}, },
"platebrass": { "brass": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/brass_plate" "layer0": "techreborn:items/plate/brass_plate"
} }
}, },
"platebronze": { "bronze": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/bronze_plate" "layer0": "techreborn:items/plate/bronze_plate"
} }
}, },
"platecarbon": { "carbon": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/carbon_plate" "layer0": "techreborn:items/plate/carbon_plate"
} }
}, },
"platechrome": { "chrome": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/chrome_plate" "layer0": "techreborn:items/plate/chrome_plate"
} }
}, },
"platecoal": { "coal": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/coal_plate" "layer0": "techreborn:items/plate/coal_plate"
} }
}, },
"platecopper": { "copper": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/copper_plate" "layer0": "techreborn:items/plate/copper_plate"
} }
}, },
"platediamond": { "diamond": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/diamond_plate" "layer0": "techreborn:items/plate/diamond_plate"
} }
}, },
"plateelectrum": { "electrum": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/electrum_plate" "layer0": "techreborn:items/plate/electrum_plate"
} }
}, },
"plateemerald": { "emerald": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/emerald_plate" "layer0": "techreborn:items/plate/emerald_plate"
} }
}, },
"plategold": { "gold": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/gold_plate" "layer0": "techreborn:items/plate/gold_plate"
} }
}, },
"plateinvar": { "invar": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/invar_plate" "layer0": "techreborn:items/plate/invar_plate"
} }
}, },
"plateiridiumalloy": { "iridium_alloy": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/iridium_alloy_plate" "layer0": "techreborn:items/plate/iridium_alloy_plate"
} }
}, },
"plateiridium": { "iridium": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/iridium_plate" "layer0": "techreborn:items/plate/iridium_plate"
} }
}, },
"plateiron": { "iron": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/iron_plate" "layer0": "techreborn:items/plate/iron_plate"
} }
}, },
"platelapis": { "lapis": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/lapis_plate" "layer0": "techreborn:items/plate/lapis_plate"
} }
}, },
"platelazurite": { "lazurite": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/lazurite_plate" "layer0": "techreborn:items/plate/lazurite_plate"
} }
}, },
"platelead": { "lead": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/lead_plate" "layer0": "techreborn:items/plate/lead_plate"
} }
}, },
"platemagnalium": { "magnalium": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/magnalium_plate" "layer0": "techreborn:items/plate/magnalium_plate"
} }
}, },
"platenickel": { "nickel": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/nickel_plate" "layer0": "techreborn:items/plate/nickel_plate"
} }
}, },
"plateobsidian": { "obsidian": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/obsidian_plate" "layer0": "techreborn:items/plate/obsidian_plate"
} }
}, },
"plateperidot": { "peridot": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/peridot_plate" "layer0": "techreborn:items/plate/peridot_plate"
} }
}, },
"plateplatinum": { "platinum": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/platinum_plate" "layer0": "techreborn:items/plate/platinum_plate"
} }
}, },
"plateredgarnet": { "red_garnet": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/red_garnet_plate" "layer0": "techreborn:items/plate/red_garnet_plate"
} }
}, },
"plateredstone": { "redstone": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/redstone_plate" "layer0": "techreborn:items/plate/redstone_plate"
} }
}, },
"platerefinediron": { "refined_iron": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/refined_iron_plate" "layer0": "techreborn:items/plate/refined_iron_plate"
} }
}, },
"plateruby": { "ruby": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/ruby_plate" "layer0": "techreborn:items/plate/ruby_plate"
} }
}, },
"platesapphire": { "sapphire": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/sapphire_plate" "layer0": "techreborn:items/plate/sapphire_plate"
} }
}, },
"platesilicon": { "silicon": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/silicon_plate" "layer0": "techreborn:items/plate/silicon_plate"
} }
}, },
"platesilver": { "silver": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/silver_plate" "layer0": "techreborn:items/plate/silver_plate"
} }
}, },
"platesteel": { "steel": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/steel_plate" "layer0": "techreborn:items/plate/steel_plate"
} }
}, },
"platetin": { "tin": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/tin_plate" "layer0": "techreborn:items/plate/tin_plate"
} }
}, },
"platetitanium": { "titanium": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/titanium_plate" "layer0": "techreborn:items/plate/titanium_plate"
} }
}, },
"platetungsten": { "tungsten": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/tungsten_plate" "layer0": "techreborn:items/plate/tungsten_plate"
} }
}, },
"platetungstensteel": { "tungstensteel": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/tungstensteel_plate" "layer0": "techreborn:items/plate/tungstensteel_plate"
} }
}, },
"platewood": { "wood": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/wood_plate" "layer0": "techreborn:items/plate/wood_plate"
} }
}, },
"plateyellowgarnet": { "yellow_garnet": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/yellow_garnet_plate" "layer0": "techreborn:items/plate/yellow_garnet_plate"
} }
}, },
"platezinc": { "zinc": {
"textures": { "textures": {
"layer0": "techreborn:items/plate/zinc_plate" "layer0": "techreborn:items/plate/zinc_plate"
} }

128
src/main/resources/assets/techreborn/blockstates/items/materials/dustssmall.json → src/main/resources/assets/techreborn/blockstates/items/material/small_dust.json
View file

@ -6,322 +6,322 @@
}, },
"variants": { "variants": {
"type": { "type": {
"dustsmallalmandine": { "almandine": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/almandine_smalldust" "layer0": "techreborn:items/smalldust/almandine_smalldust"
} }
}, },
"dustsmallaluminum": { "aluminum": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/aluminum_smalldust" "layer0": "techreborn:items/smalldust/aluminum_smalldust"
} }
}, },
"dustsmallandesite": { "andesite": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/andesite_smalldust" "layer0": "techreborn:items/smalldust/andesite_smalldust"
} }
}, },
"dustsmallandradite": { "andradite": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/andradite_smalldust" "layer0": "techreborn:items/smalldust/andradite_smalldust"
} }
}, },
"dustsmallashes": { "ashes": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/ashes_smalldust" "layer0": "techreborn:items/smalldust/ashes_smalldust"
} }
}, },
"dustsmallbasalt": { "basalt": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/basalt_smalldust" "layer0": "techreborn:items/smalldust/basalt_smalldust"
} }
}, },
"dustsmallbauxite": { "bauxite": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/bauxite_smalldust" "layer0": "techreborn:items/smalldust/bauxite_smalldust"
} }
}, },
"dustsmallbrass": { "brass": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/brass_smalldust" "layer0": "techreborn:items/smalldust/brass_smalldust"
} }
}, },
"dustsmallbronze": { "bronze": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/bronze_smalldust" "layer0": "techreborn:items/smalldust/bronze_smalldust"
} }
}, },
"dustsmallcalcite": { "calcite": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/calcite_smalldust" "layer0": "techreborn:items/smalldust/calcite_smalldust"
} }
}, },
"dustsmallcharcoal": { "charcoal": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/charcoal_smalldust" "layer0": "techreborn:items/smalldust/charcoal_smalldust"
} }
}, },
"dustsmallchrome": { "chrome": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/chrome_smalldust" "layer0": "techreborn:items/smalldust/chrome_smalldust"
} }
}, },
"dustsmallcinnabar": { "cinnabar": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/cinnabar_smalldust" "layer0": "techreborn:items/smalldust/cinnabar_smalldust"
} }
}, },
"dustsmallclay": { "clay": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/clay_smalldust" "layer0": "techreborn:items/smalldust/clay_smalldust"
} }
}, },
"dustsmallcoal": { "coal": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/coal_smalldust" "layer0": "techreborn:items/smalldust/coal_smalldust"
} }
}, },
"dustsmallcopper": { "copper": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/copper_smalldust" "layer0": "techreborn:items/smalldust/copper_smalldust"
} }
}, },
"dustsmalldarkashes": { "dark_ashes": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/dark_ashes_smalldust" "layer0": "techreborn:items/smalldust/dark_ashes_smalldust"
} }
}, },
"dustsmalldiamond": { "diamond": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/diamond_smalldust" "layer0": "techreborn:items/smalldust/diamond_smalldust"
} }
}, },
"dustsmalldiorite": { "diorite": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/diorite_smalldust" "layer0": "techreborn:items/smalldust/diorite_smalldust"
} }
}, },
"dustsmallelectrum": { "electrum": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/electrum_smalldust" "layer0": "techreborn:items/smalldust/electrum_smalldust"
} }
}, },
"dustsmallemerald": { "emerald": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/emerald_smalldust" "layer0": "techreborn:items/smalldust/emerald_smalldust"
} }
}, },
"dustsmallendereye": { "ender_eye": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/ender_eye_smalldust" "layer0": "techreborn:items/smalldust/ender_eye_smalldust"
} }
}, },
"dustsmallenderpearl": { "ender_pearl": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/ender_pearl_smalldust" "layer0": "techreborn:items/smalldust/ender_pearl_smalldust"
} }
}, },
"dustsmallendstone": { "endstone": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/endstone_smalldust" "layer0": "techreborn:items/smalldust/endstone_smalldust"
} }
}, },
"dustsmallflint": { "flint": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/flint_smalldust" "layer0": "techreborn:items/smalldust/flint_smalldust"
} }
}, },
"dustsmallgalena": { "galena": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/galena_smalldust" "layer0": "techreborn:items/smalldust/galena_smalldust"
} }
}, },
"dustsmallglowstone": { "glowstone": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/glowstone_smalldust" "layer0": "techreborn:items/smalldust/glowstone_smalldust"
} }
}, },
"dustsmallgold": { "gold": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/gold_smalldust" "layer0": "techreborn:items/smalldust/gold_smalldust"
} }
}, },
"dustsmallgranite": { "granite": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/granite_smalldust" "layer0": "techreborn:items/smalldust/granite_smalldust"
} }
}, },
"dustsmallgrossular": { "grossular": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/grossular_smalldust" "layer0": "techreborn:items/smalldust/grossular_smalldust"
} }
}, },
"dustsmallinvar": { "invar": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/invar_smalldust" "layer0": "techreborn:items/smalldust/invar_smalldust"
} }
}, },
"dustsmalliron": { "iron": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/iron_smalldust" "layer0": "techreborn:items/smalldust/iron_smalldust"
} }
}, },
"dustsmalllazurite": { "lazurite": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/lazurite_smalldust" "layer0": "techreborn:items/smalldust/lazurite_smalldust"
} }
}, },
"dustsmalllead": { "lead": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/lead_smalldust" "layer0": "techreborn:items/smalldust/lead_smalldust"
} }
}, },
"dustsmallmagnesium": { "magnesium": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/magnesium_smalldust" "layer0": "techreborn:items/smalldust/magnesium_smalldust"
} }
}, },
"dustsmallmanganese": { "manganese": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/manganese_smalldust" "layer0": "techreborn:items/smalldust/manganese_smalldust"
} }
}, },
"dustsmallmarble": { "marble": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/marble_smalldust" "layer0": "techreborn:items/smalldust/marble_smalldust"
} }
}, },
"dustsmallnetherrack": { "netherrack": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/netherrack_smalldust" "layer0": "techreborn:items/smalldust/netherrack_smalldust"
} }
}, },
"dustsmallnickel": { "nickel": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/nickel_smalldust" "layer0": "techreborn:items/smalldust/nickel_smalldust"
} }
}, },
"dustsmallobsidian": { "obsidian": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/obsidian_smalldust" "layer0": "techreborn:items/smalldust/obsidian_smalldust"
} }
}, },
"dustsmallolivine": { "olivine": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/olivine_smalldust" "layer0": "techreborn:items/smalldust/olivine_smalldust"
} }
}, },
"dustsmallperidot": { "peridot": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/peridot_smalldust" "layer0": "techreborn:items/smalldust/peridot_smalldust"
} }
}, },
"dustsmallphosphorous": { "phosphorous": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/phosphorous_smalldust" "layer0": "techreborn:items/smalldust/phosphorous_smalldust"
} }
}, },
"dustsmallplatinum": { "platinum": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/platinum_smalldust" "layer0": "techreborn:items/smalldust/platinum_smalldust"
} }
}, },
"dustsmallpyrite": { "pyrite": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/pyrite_smalldust" "layer0": "techreborn:items/smalldust/pyrite_smalldust"
} }
}, },
"dustsmallpyrope": { "pyrope": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/pyrope_smalldust" "layer0": "techreborn:items/smalldust/pyrope_smalldust"
} }
}, },
"dustsmallredgarnet": { "red_garnet": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/red_garnet_smalldust" "layer0": "techreborn:items/smalldust/red_garnet_smalldust"
} }
}, },
"dustsmallredstone": { "redstone": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/redstone_smalldust" "layer0": "techreborn:items/smalldust/redstone_smalldust"
} }
}, },
"dustsmallruby": { "ruby": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/ruby_smalldust" "layer0": "techreborn:items/smalldust/ruby_smalldust"
} }
}, },
"dustsmallsaltpeter": { "saltpeter": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/saltpeter_smalldust" "layer0": "techreborn:items/smalldust/saltpeter_smalldust"
} }
}, },
"dustsmallsapphire": { "sapphire": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/sapphire_smalldust" "layer0": "techreborn:items/smalldust/sapphire_smalldust"
} }
}, },
"dustsmallsaw": { "saw": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/saw_dust_smalldust" "layer0": "techreborn:items/smalldust/saw_dust_smalldust"
} }
}, },
"dustsmallsilver": { "silver": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/silver_smalldust" "layer0": "techreborn:items/smalldust/silver_smalldust"
} }
}, },
"dustsmallsodalite": { "sodalite": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/sodalite_smalldust" "layer0": "techreborn:items/smalldust/sodalite_smalldust"
} }
}, },
"dustsmallspessartine": { "spessartine": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/spessartine_smalldust" "layer0": "techreborn:items/smalldust/spessartine_smalldust"
} }
}, },
"dustsmallsphalerite": { "sphalerite": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/sphalerite_smalldust" "layer0": "techreborn:items/smalldust/sphalerite_smalldust"
} }
}, },
"dustsmallsteel": { "steel": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/steel_smalldust" "layer0": "techreborn:items/smalldust/steel_smalldust"
} }
}, },
"dustsmallsulfur": { "sulfur": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/sulfur_smalldust" "layer0": "techreborn:items/smalldust/sulfur_smalldust"
} }
}, },
"dustsmalltin": { "tin": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/tin_smalldust" "layer0": "techreborn:items/smalldust/tin_smalldust"
} }
}, },
"dustsmalltitanium": { "titanium": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/titanium_smalldust" "layer0": "techreborn:items/smalldust/titanium_smalldust"
} }
}, },
"dustsmalltungsten": { "tungsten": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/tungsten_smalldust" "layer0": "techreborn:items/smalldust/tungsten_smalldust"
} }
}, },
"dustsmalluvarovite": { "uvarovite": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/uvarovite_smalldust" "layer0": "techreborn:items/smalldust/uvarovite_smalldust"
} }
}, },
"dustsmallyellowgarnet": { "yellow_garnet": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/yellow_garnet_smalldust" "layer0": "techreborn:items/smalldust/yellow_garnet_smalldust"
} }
}, },
"dustsmallzinc": { "zinc": {
"textures": { "textures": {
"layer0": "techreborn:items/smalldust/zinc_smalldust" "layer0": "techreborn:items/smalldust/zinc_smalldust"
} }

236
src/main/resources/assets/techreborn/blockstates/items/materials/parts.json
View file

@ -1,236 +0,0 @@
{
"forge_marker": 1,
"defaults": {
"model": "builtin/generated",
"transform": "forge:default-item"
},
"variants": {
"type": {
"carbonfiber": {
"textures": {
"layer0": "techreborn:items/part/carbon_fiber"
}
},
"carbonmesh": {
"textures": {
"layer0": "techreborn:items/part/carbon_mesh"
}
},
"circuitadvanced": {
"textures": {
"layer0": "techreborn:items/part/circuit_advanced"
}
},
"circuitbasic": {
"textures": {
"layer0": "techreborn:items/part/circuit_basic"
}
},
"circuitelite": {
"textures": {
"layer0": "techreborn:items/part/circuit_elite"
}
},
"computermonitor": {
"textures": {
"layer0": "techreborn:items/part/computer_monitor"
}
},
"coolantsimple": {
"textures": {
"layer0": "techreborn:items/part/coolant_simple"
}
},
"coolantsix": {
"textures": {
"layer0": "techreborn:items/part/coolant_six"
}
},
"coolanttriple": {
"textures": {
"layer0": "techreborn:items/part/coolant_triple"
}
},
"cupronickelheatingcoil": {
"textures": {
"layer0": "techreborn:items/part/cupronickel_heating_coil"
}
},
"dataorb": {
"textures": {
"layer0": "techreborn:items/part/data_orb"
}
},
"datastoragecircuit": {
"textures": {
"layer0": "techreborn:items/part/data_storage_circuit"
}
},
"depletedcell": {
"textures": {
"layer0": "techreborn:items/part/depleted_cell"
}
},
"diamondgrindinghead": {
"textures": {
"layer0": "techreborn:items/part/diamond_grinding_head"
}
},
"diamondsawblade": {
"textures": {
"layer0": "techreborn:items/part/diamond_saw_blade"
}
},
"doubledepletedcell": {
"textures": {
"layer0": "techreborn:items/part/double_depleted_cell"
}
},
"doubleplutoniumcell": {
"textures": {
"layer0": "techreborn:items/part/double_plutonium_cell"
}
},
"doublethoriumcell": {
"textures": {
"layer0": "techreborn:items/part/double_thorium_cell"
}
},
"doubleuraniumcell": {
"textures": {
"layer0": "techreborn:items/part/double_uranium_cell"
}
},
"energyflowcircuit": {
"textures": {
"layer0": "techreborn:items/part/energy_flow_circuit"
}
},
"heliumcoolantsimple": {
"textures": {
"layer0": "techreborn:items/part/helium_coolant_simple"
}
},
"heliumcoolantsix": {
"textures": {
"layer0": "techreborn:items/part/helium_coolant_six"
}
},
"heliumcoolanttriple": {
"textures": {
"layer0": "techreborn:items/part/helium_coolant_triple"
}
},
"iridiumneutronreflector": {
"textures": {
"layer0": "techreborn:items/part/iridium_neutron_reflector"
}
},
"kanthalheatingcoil": {
"textures": {
"layer0": "techreborn:items/part/kanthal_heating_coil"
}
},
"machineparts": {
"textures": {
"layer0": "techreborn:items/part/machine_parts"
}
},
"nakcoolantsimple": {
"textures": {
"layer0": "techreborn:items/part/nak_coolant_simple"
}
},
"nakcoolantsix": {
"textures": {
"layer0": "techreborn:items/part/nak_coolant_six"
}
},
"nakcoolanttriple": {
"textures": {
"layer0": "techreborn:items/part/nak_coolant_triple"
}
},
"neutronreflector": {
"textures": {
"layer0": "techreborn:items/part/neutron_reflector"
}
},
"nichromeheatingcoil": {
"textures": {
"layer0": "techreborn:items/part/nichrome_heating_coil"
}
},
"plutoniumcell": {
"textures": {
"layer0": "techreborn:items/part/plutonium_cell"
}
},
"quaddepletedcell": {
"textures": {
"layer0": "techreborn:items/part/quad_depleted_cell"
}
},
"quadplutoniumcell": {
"textures": {
"layer0": "techreborn:items/part/quad_plutonium_cell"
}
},
"quadthoriumcell": {
"textures": {
"layer0": "techreborn:items/part/quad_thorium_cell"
}
},
"quaduraniumcell": {
"textures": {
"layer0": "techreborn:items/part/quad_uranium_cell"
}
},
"rubber": {
"textures": {
"layer0": "techreborn:items/part/rubber"
}
},
"sap": {
"textures": {
"layer0": "techreborn:items/part/sap"
}
},
"scrap": {
"textures": {
"layer0": "techreborn:items/part/scrap"
}
},
"superconductor": {
"textures": {
"layer0": "techreborn:items/part/super_conductor"
}
},
"thickneutronreflector": {
"textures": {
"layer0": "techreborn:items/part/thick_neutron_reflector"
}
},
"thoriumcell": {
"textures": {
"layer0": "techreborn:items/part/thorium_cell"
}
},
"tungstengrindinghead": {
"textures": {
"layer0": "techreborn:items/part/tungsten_grinding_head"
}
},
"uraniumcell": {
"textures": {
"layer0": "techreborn:items/part/uranium_cell"
}
},
"uumatter": {
"textures": {
"layer0": "techreborn:items/part/uu_matter"
}
}
}
}
}

40
src/main/resources/assets/techreborn/blockstates/ores.json → src/main/resources/assets/techreborn/blockstates/ore.json
View file

@ -10,102 +10,102 @@
{} {}
], ],
"type": { "type": {
"oregalena": { "galena": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/galena_ore" "all": "techreborn:blocks/ore/galena_ore"
} }
}, },
"oreiridium": { "iridium": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/iridium_ore" "all": "techreborn:blocks/ore/iridium_ore"
} }
}, },
"oreruby": { "ruby": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/ruby_ore" "all": "techreborn:blocks/ore/ruby_ore"
} }
}, },
"oresapphire": { "sapphire": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/sapphire_ore" "all": "techreborn:blocks/ore/sapphire_ore"
} }
}, },
"orebauxite": { "bauxite": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/bauxite_ore" "all": "techreborn:blocks/ore/bauxite_ore"
} }
}, },
"orepyrite": { "pyrite": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/pyrite_ore" "all": "techreborn:blocks/ore/pyrite_ore"
} }
}, },
"orecinnabar": { "cinnabar": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/cinnabar_ore" "all": "techreborn:blocks/ore/cinnabar_ore"
} }
}, },
"oresphalerite": { "sphalerite": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/sphalerite_ore" "all": "techreborn:blocks/ore/sphalerite_ore"
} }
}, },
"oretungsten": { "tungsten": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/tungsten_ore" "all": "techreborn:blocks/ore/tungsten_ore"
} }
}, },
"oretungstenstone": { "tungsten_stone": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/tungsten_ore_stone" "all": "techreborn:blocks/ore/tungsten_ore_stone"
} }
}, },
"oresheldonite": { "sheldonite": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/sheldonite_ore" "all": "techreborn:blocks/ore/sheldonite_ore"
} }
}, },
"oresheldonitestone": { "sheldonite_stone": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/sheldonite_ore_stone" "all": "techreborn:blocks/ore/sheldonite_ore_stone"
} }
}, },
"oreperidot": { "peridot": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/peridot_ore" "all": "techreborn:blocks/ore/peridot_ore"
} }
}, },
"oreperidotstone": { "peridot_stone": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/peridot_ore_stone" "all": "techreborn:blocks/ore/peridot_ore_stone"
} }
}, },
"oresodalite": { "sodalite": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/sodalite_ore" "all": "techreborn:blocks/ore/sodalite_ore"
} }
}, },
"oresodalitestone": { "sodalite_stone": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/sodalite_ore_stone" "all": "techreborn:blocks/ore/sodalite_ore_stone"
} }
}, },
"orelead": { "lead": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/lead_ore" "all": "techreborn:blocks/ore/lead_ore"
} }
}, },
"oresilver": { "silver": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/silver_ore" "all": "techreborn:blocks/ore/silver_ore"
} }
}, },
"orecopper": { "copper": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/copper_ore" "all": "techreborn:blocks/ore/copper_ore"
} }
}, },
"oretin": { "tin": {
"textures": { "textures": {
"all": "techreborn:blocks/ore/tin_ore" "all": "techreborn:blocks/ore/tin_ore"
} }

54
src/main/resources/assets/techreborn/blockstates/storage.json → src/main/resources/assets/techreborn/blockstates/storage_block.json
View file

@ -14,137 +14,137 @@
} }
], ],
"type": { "type": {
"blockaluminum": { "aluminum": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/aluminum_block" "all": "techreborn:blocks/storage/aluminum_block"
} }
}, },
"blockbrass": { "brass": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/brass_block" "all": "techreborn:blocks/storage/brass_block"
} }
}, },
"blockbronze": { "bronze": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/bronze_block" "all": "techreborn:blocks/storage/bronze_block"
} }
}, },
"blockchrome": { "chrome": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/chrome_block" "all": "techreborn:blocks/storage/chrome_block"
} }
}, },
"blockcopper": { "copper": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/copper_block" "all": "techreborn:blocks/storage/copper_block"
} }
}, },
"blockelectrum": { "electrum": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/electrum_block" "all": "techreborn:blocks/storage/electrum_block"
} }
}, },
"blockinvar": { "invar": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/invar_block" "all": "techreborn:blocks/storage/invar_block"
} }
}, },
"blockiridium": { "iridium": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/iridium_block" "all": "techreborn:blocks/storage/iridium_block"
} }
}, },
"blockiridiumreinforcedstone": { "iridium_reinforced_stone": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/iridium_reinforced_stone_block" "all": "techreborn:blocks/storage/iridium_reinforced_stone_block"
} }
}, },
"blockiridiumreinforcedtungstensteel": { "iridium_reinforced_tungstensteel": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/iridium_reinforced_tungstensteel_block" "all": "techreborn:blocks/storage/iridium_reinforced_tungstensteel_block"
} }
}, },
"blocklead": { "lead": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/lead_block" "all": "techreborn:blocks/storage/lead_block"
} }
}, },
"blocknickel": { "nickel": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/nickel_block" "all": "techreborn:blocks/storage/nickel_block"
} }
}, },
"blockosmium": { "osmium": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/osmium_block" "all": "techreborn:blocks/storage/osmium_block"
} }
}, },
"blockperidot": { "peridot": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/peridot_block" "all": "techreborn:blocks/storage/peridot_block"
} }
}, },
"blockplatinum": { "platinum": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/platinum_block" "all": "techreborn:blocks/storage/platinum_block"
} }
}, },
"blockredgarnet": { "red_garnet": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/redgarnet_block" "all": "techreborn:blocks/storage/redgarnet_block"
} }
}, },
"blockrefinediron": { "refined_iron": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/refinediron_block" "all": "techreborn:blocks/storage/refinediron_block"
} }
}, },
"blockruby": { "ruby": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/ruby_block" "all": "techreborn:blocks/storage/ruby_block"
} }
}, },
"blocksapphire": { "sapphire": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/sapphire_block" "all": "techreborn:blocks/storage/sapphire_block"
} }
}, },
"blocksilver": { "silver": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/silver_block" "all": "techreborn:blocks/storage/silver_block"
} }
}, },
"blocksteel": { "steel": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/steel_block" "all": "techreborn:blocks/storage/steel_block"
} }
}, },
"blocktin": { "tin": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/tin_block" "all": "techreborn:blocks/storage/tin_block"
} }
}, },
"blocktitanium": { "titanium": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/titanium_block" "all": "techreborn:blocks/storage/titanium_block"
} }
}, },
"blocktungsten": { "tungsten": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/tungsten_block" "all": "techreborn:blocks/storage/tungsten_block"
} }
}, },
"blocktungstensteel": { "tungstensteel": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/tungstensteel_block" "all": "techreborn:blocks/storage/tungstensteel_block"
} }
}, },
"blockyellowgarnet": { "yellow_garnet": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/yellowgarnet_block" "all": "techreborn:blocks/storage/yellowgarnet_block"
} }
}, },
"blockzinc": { "zinc": {
"textures": { "textures": {
"all": "techreborn:blocks/storage/zinc_block" "all": "techreborn:blocks/storage/zinc_block"
} }

0
src/main/resources/assets/techreborn/textures/items/part/circuit_advanced.png → src/main/resources/assets/techreborn/textures/items/part/advanced_circuit.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 769 B

After

Width:  |  Height:  |  Size: 769 B

BIN
src/main/resources/assets/techreborn/textures/items/part/circuit_elite.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 583 B

BIN
src/main/resources/assets/techreborn/textures/items/part/data_storage_chip.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/main/resources/assets/techreborn/textures/items/part/data_storage_circuit.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 436 B

0
src/main/resources/assets/techreborn/textures/items/part/data_orb.png → src/main/resources/assets/techreborn/textures/items/part/data_storage_core.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 549 B

After

Width:  |  Height:  |  Size: 549 B

0
src/main/resources/assets/techreborn/textures/items/part/computer_monitor.png → src/main/resources/assets/techreborn/textures/items/part/digital_display.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 815 B

After

Width:  |  Height:  |  Size: 815 B

0
src/main/resources/assets/techreborn/textures/items/part/circuit_basic.png → src/main/resources/assets/techreborn/textures/items/part/electronic_circuit.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 754 B

After

Width:  |  Height:  |  Size: 754 B

BIN
src/main/resources/assets/techreborn/textures/items/part/industrial_circuit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB