From 874559c21ea574a0710af8194ed639b28f59389f Mon Sep 17 00:00:00 2001 From: ProfessorProspector Date: Sat, 15 Sep 2018 19:36:37 -0700 Subject: [PATCH] Try to make things make more sense --- src/main/java/techreborn/init/OreDict.java | 152 ++++++----- .../java/techreborn/init/TRIngredients.java | 224 ++++++++++------- .../init/recipes/CraftingTableRecipes.java | 9 +- .../init/recipes/FusionReactorRecipes.java | 1 - .../dusts.json => material/dust.json} | 132 +++++----- .../gems.json => material/gem.json} | 10 +- .../ingots.json => material/ingot.json} | 46 ++-- .../nuggets.json => material/nugget.json} | 42 ++-- .../blockstates/items/material/part.json | 176 +++++++++++++ .../plates.json => material/plate.json} | 78 +++--- .../small_dust.json} | 128 +++++----- .../blockstates/items/materials/parts.json | 236 ------------------ .../blockstates/{ores.json => ore.json} | 40 +-- .../{storage.json => storage_block.json} | 54 ++-- ...cuit_advanced.png => advanced_circuit.png} | Bin .../textures/items/part/circuit_elite.png | Bin 583 -> 0 bytes .../textures/items/part/data_storage_chip.png | Bin 0 -> 1371 bytes .../items/part/data_storage_circuit.png | Bin 436 -> 0 bytes .../{data_orb.png => data_storage_core.png} | Bin ...mputer_monitor.png => digital_display.png} | Bin ...rcuit_basic.png => electronic_circuit.png} | Bin .../items/part/industrial_circuit.png | Bin 0 -> 1529 bytes 22 files changed, 656 insertions(+), 672 deletions(-) rename src/main/resources/assets/techreborn/blockstates/items/{materials/dusts.json => material/dust.json} (80%) rename src/main/resources/assets/techreborn/blockstates/items/{materials/gems.json => material/gem.json} (84%) rename src/main/resources/assets/techreborn/blockstates/items/{materials/ingots.json => material/ingot.json} (81%) rename src/main/resources/assets/techreborn/blockstates/items/{materials/nuggets.json => material/nugget.json} (81%) create mode 100644 src/main/resources/assets/techreborn/blockstates/items/material/part.json rename src/main/resources/assets/techreborn/blockstates/items/{materials/plates.json => material/plate.json} (80%) rename src/main/resources/assets/techreborn/blockstates/items/{materials/dustssmall.json => material/small_dust.json} (79%) delete mode 100644 src/main/resources/assets/techreborn/blockstates/items/materials/parts.json rename src/main/resources/assets/techreborn/blockstates/{ores.json => ore.json} (82%) rename src/main/resources/assets/techreborn/blockstates/{storage.json => storage_block.json} (80%) rename src/main/resources/assets/techreborn/textures/items/part/{circuit_advanced.png => advanced_circuit.png} (100%) delete mode 100644 src/main/resources/assets/techreborn/textures/items/part/circuit_elite.png create mode 100644 src/main/resources/assets/techreborn/textures/items/part/data_storage_chip.png delete mode 100644 src/main/resources/assets/techreborn/textures/items/part/data_storage_circuit.png rename src/main/resources/assets/techreborn/textures/items/part/{data_orb.png => data_storage_core.png} (100%) rename src/main/resources/assets/techreborn/textures/items/part/{computer_monitor.png => digital_display.png} (100%) rename src/main/resources/assets/techreborn/textures/items/part/{circuit_basic.png => electronic_circuit.png} (100%) create mode 100644 src/main/resources/assets/techreborn/textures/items/part/industrial_circuit.png diff --git a/src/main/java/techreborn/init/OreDict.java b/src/main/java/techreborn/init/OreDict.java index 0d1bf261a..c34b9f308 100644 --- a/src/main/java/techreborn/init/OreDict.java +++ b/src/main/java/techreborn/init/OreDict.java @@ -49,27 +49,25 @@ public class OreDict { OreUtil.registerOre("glassReinforced", ModBlocks.REINFORCED_GLASS); OreUtil.registerOre("treeSapling", ModBlocks.RUBBER_SAPLING); OreUtil.registerOre("saplingRubber", ModBlocks.RUBBER_SAPLING); - -// OreUtil.registerOre("logWood", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE)); -// OreUtil.registerOre("logRubber", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE)); -// OreUtil.registerOre("plankWood", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE)); -// OreUtil.registerOre("slabWood", new ItemStack(RUBBER_LOG_SLAB_HALF, 1, OreDictionary.WILDCARD_VALUE)); -// OreUtil.registerOre("stairWood", new ItemStack(RUBBER_LOG_STAIR, 1, OreDictionary.WILDCARD_VALUE)); -// OreUtil.registerOre("plankRubber", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE)); -// OreUtil.registerOre("treeLeaves", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE)); -// OreUtil.registerOre("leavesRubber", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE)); - + // OreUtil.registerOre("logWood", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE)); + // OreUtil.registerOre("logRubber", new ItemStack(RUBBER_LOG, 1, OreDictionary.WILDCARD_VALUE)); + // OreUtil.registerOre("plankWood", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE)); + // OreUtil.registerOre("slabWood", new ItemStack(RUBBER_LOG_SLAB_HALF, 1, OreDictionary.WILDCARD_VALUE)); + // OreUtil.registerOre("stairWood", new ItemStack(RUBBER_LOG_STAIR, 1, OreDictionary.WILDCARD_VALUE)); + // OreUtil.registerOre("plankRubber", new ItemStack(RUBBER_PLANKS, 1, OreDictionary.WILDCARD_VALUE)); + // OreUtil.registerOre("treeLeaves", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE)); + // OreUtil.registerOre("leavesRubber", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE)); // Parts - OreUtil.registerOre("circuitBasic", TRIngredients.Parts.CIRCUIT_BASIC.getStack()); - OreUtil.registerOre("circuitAdvanced", TRIngredients.Parts.CIRCUIT_ADVANCED.getStack()); - OreUtil.registerOre("circuitElite", TRIngredients.Parts.CIRCUIT_ELITE.getStack()); - OreUtil.registerOre("circuitStorage", TRIngredients.Parts.DATA_STORAGE_CIRCUIT.getStack()); - OreUtil.registerOre("circuitMaster", TRIngredients.Parts.ENERGY_FLOW_CIRCUIT.getStack()); + OreUtil.registerOre("circuitBasic", TRIngredients.Parts.ELECTRONIC_CIRCUIT.getStack()); + OreUtil.registerOre("circuitAdvanced", TRIngredients.Parts.ADVANCED_CIRCUIT.getStack()); + OreUtil.registerOre("circuitElite", TRIngredients.Parts.INDUSTRIAL_CIRCUIT.getStack()); + OreUtil.registerOre("circuitStorage", TRIngredients.Parts.DATA_STORAGE_CHIP.getStack()); + OreUtil.registerOre("circuitMaster", TRIngredients.Parts.ENERGY_FLOW_CHIP.getStack()); OreUtil.registerOre("craftingDiamondGrinder", TRIngredients.Parts.DIAMOND_GRINDING_HEAD.getStack()); OreUtil.registerOre("craftingTungstenGrinder", TRIngredients.Parts.TUNGSTEN_GRINDING_HEAD.getStack()); - OreUtil.registerOre("craftingSuperconductor", TRIngredients.Parts.SUPER_CONDUCTOR.getStack()); + OreUtil.registerOre("craftingSuperconductor", TRIngredients.Parts.SUPERCONDUCTOR.getStack()); OreUtil.registerOre("materialResin", TRIngredients.Parts.SAP.getStack()); OreUtil.registerOre("materialRubber", TRIngredients.Parts.RUBBER.getStack()); OreUtil.registerOre("itemRubber", TRIngredients.Parts.RUBBER.getStack()); @@ -100,74 +98,72 @@ public class OreDict { //OreUtil.registerOre("uran235", nothing); //OreUtil.registerOre("uran238", nothing); //OreUtil.registerOre("smallUran235", nothing); - -// for (String ore : BlockOre.ores) { -// OreUtil.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre.getOreByName(ore)); -// } + // for (String ore : BlockOre.ores) { + // OreUtil.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre.getOreByName(ore)); + // } -// OreUtil.registerOre("blockSilver", BlockStorage.getStorageBlockByName("silver")); -// OreUtil.registerOre("blockAluminum", BlockStorage.getStorageBlockByName("aluminum")); -// OreUtil.registerOre("blockAluminium", BlockStorage.getStorageBlockByName("aluminum")); -// OreUtil.registerOre("blockTitanium", BlockStorage.getStorageBlockByName("titanium")); -// OreUtil.registerOre("blockChrome", BlockStorage.getStorageBlockByName("chrome")); -// OreUtil.registerOre("blockSteel", BlockStorage.getStorageBlockByName("steel")); -// OreUtil.registerOre("blockBrass", BlockStorage.getStorageBlockByName("brass")); -// OreUtil.registerOre("blockLead", BlockStorage.getStorageBlockByName("lead")); -// OreUtil.registerOre("blockElectrum", BlockStorage.getStorageBlockByName("electrum")); -// OreUtil.registerOre("blockZinc", BlockStorage.getStorageBlockByName("zinc")); -// OreUtil.registerOre("blockPlatinum", BlockStorage.getStorageBlockByName("platinum")); -// OreUtil.registerOre("blockTungsten", BlockStorage.getStorageBlockByName("tungsten")); -// OreUtil.registerOre("blockNickel", BlockStorage.getStorageBlockByName("nickel")); -// OreUtil.registerOre("blockInvar", BlockStorage.getStorageBlockByName("invar")); -// OreUtil.registerOre("blockIridium", BlockStorage.getStorageBlockByName("iridium")); -// OreUtil.registerOre("blockBronze", BlockStorage.getStorageBlockByName("bronze")); -// OreUtil.registerOre("blockCopper", BlockStorage2.getStorageBlockByName("copper", 1)); -// OreUtil.registerOre("blockTin", BlockStorage2.getStorageBlockByName("tin", 1)); -// OreUtil.registerOre("blockTungstensteel", BlockStorage2.getStorageBlockByName("tungstensteel", 1)); -// OreUtil.registerOre("blockRuby", BlockStorage2.getStorageBlockByName("ruby", 1)); -// OreUtil.registerOre("blockSapphire", BlockStorage2.getStorageBlockByName("sapphire", 1)); -// OreUtil.registerOre("blockPeridot", BlockStorage2.getStorageBlockByName("peridot", 1)); -// OreUtil.registerOre("blockYellowGarnet", BlockStorage2.getStorageBlockByName("yellowGarnet", 1)); -// OreUtil.registerOre("blockRedGarnet", BlockStorage2.getStorageBlockByName("redGarnet", 1)); + // OreUtil.registerOre("blockSilver", BlockStorage.getStorageBlockByName("silver")); + // OreUtil.registerOre("blockAluminum", BlockStorage.getStorageBlockByName("aluminum")); + // OreUtil.registerOre("blockAluminium", BlockStorage.getStorageBlockByName("aluminum")); + // OreUtil.registerOre("blockTitanium", BlockStorage.getStorageBlockByName("titanium")); + // OreUtil.registerOre("blockChrome", BlockStorage.getStorageBlockByName("chrome")); + // OreUtil.registerOre("blockSteel", BlockStorage.getStorageBlockByName("steel")); + // OreUtil.registerOre("blockBrass", BlockStorage.getStorageBlockByName("brass")); + // OreUtil.registerOre("blockLead", BlockStorage.getStorageBlockByName("lead")); + // OreUtil.registerOre("blockElectrum", BlockStorage.getStorageBlockByName("electrum")); + // OreUtil.registerOre("blockZinc", BlockStorage.getStorageBlockByName("zinc")); + // OreUtil.registerOre("blockPlatinum", BlockStorage.getStorageBlockByName("platinum")); + // OreUtil.registerOre("blockTungsten", BlockStorage.getStorageBlockByName("tungsten")); + // OreUtil.registerOre("blockNickel", BlockStorage.getStorageBlockByName("nickel")); + // OreUtil.registerOre("blockInvar", BlockStorage.getStorageBlockByName("invar")); + // OreUtil.registerOre("blockIridium", BlockStorage.getStorageBlockByName("iridium")); + // OreUtil.registerOre("blockBronze", BlockStorage.getStorageBlockByName("bronze")); + // OreUtil.registerOre("blockCopper", BlockStorage2.getStorageBlockByName("copper", 1)); + // OreUtil.registerOre("blockTin", BlockStorage2.getStorageBlockByName("tin", 1)); + // OreUtil.registerOre("blockTungstensteel", BlockStorage2.getStorageBlockByName("tungstensteel", 1)); + // OreUtil.registerOre("blockRuby", BlockStorage2.getStorageBlockByName("ruby", 1)); + // OreUtil.registerOre("blockSapphire", BlockStorage2.getStorageBlockByName("sapphire", 1)); + // OreUtil.registerOre("blockPeridot", BlockStorage2.getStorageBlockByName("peridot", 1)); + // OreUtil.registerOre("blockYellowGarnet", BlockStorage2.getStorageBlockByName("yellowGarnet", 1)); + // OreUtil.registerOre("blockRedGarnet", BlockStorage2.getStorageBlockByName("redGarnet", 1)); - -// TODO: fix recipe -// for (String type : ItemGems.types) { -// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "gem_" + type), ItemGems.getGemByName(type)); -// boolean ignoreIt = false; -// for (String ignore : plateGenIgnores) -// if (type.startsWith(ignore)) -// ignoreIt = true; -// if (!ignoreIt) -// ItemPlates.registerType(type); -// } + // TODO: fix recipe + // for (String type : ItemGems.types) { + // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "gem_" + type), ItemGems.getGemByName(type)); + // boolean ignoreIt = false; + // for (String ignore : plateGenIgnores) + // if (type.startsWith(ignore)) + // ignoreIt = true; + // if (!ignoreIt) + // ItemPlates.registerType(type); + // } -// for (String type : ItemIngots.types) { -// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "ingot_" + type), ItemIngots.getIngotByName(type)); -// boolean ignoreIt = false; -// for (String ignore : plateGenIgnores) -// if (type.startsWith(ignore)) -// ignoreIt = true; -// if (!ignoreIt) -// ItemPlates.registerType(type); -// } + // for (String type : ItemIngots.types) { + // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "ingot_" + type), ItemIngots.getIngotByName(type)); + // boolean ignoreIt = false; + // for (String ignore : plateGenIgnores) + // if (type.startsWith(ignore)) + // ignoreIt = true; + // if (!ignoreIt) + // ItemPlates.registerType(type); + // } -// for (String type : ItemPlates.types) { -// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type)); -// } - -// for (String type : ItemDusts.types) { -// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_" + type), ItemDusts.getDustByName(type)); -// } -// -// for (String type : ItemDustsSmall.types) { -// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_small_" + type), ItemDustsSmall.getSmallDustByName(type)); -// } + // for (String type : ItemPlates.types) { + // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "plate_" + type), ItemPlates.getPlateByName(type)); + // } -// for (String type : ItemNuggets.types) { -// OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "nugget_" + type), ItemNuggets.getNuggetByName(type)); -// } + // for (String type : ItemDusts.types) { + // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_" + type), ItemDusts.getDustByName(type)); + // } + // + // for (String type : ItemDustsSmall.types) { + // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "dust_small_" + type), ItemDustsSmall.getSmallDustByName(type)); + // } + + // for (String type : ItemNuggets.types) { + // OreUtil.registerOre(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "nugget_" + type), ItemNuggets.getNuggetByName(type)); + // } } diff --git a/src/main/java/techreborn/init/TRIngredients.java b/src/main/java/techreborn/init/TRIngredients.java index dfebeddae..d4785ce9d 100644 --- a/src/main/java/techreborn/init/TRIngredients.java +++ b/src/main/java/techreborn/init/TRIngredients.java @@ -21,10 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ + package techreborn.init; -import java.util.Arrays; -import com.google.common.base.CaseFormat; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -43,89 +42,92 @@ import techreborn.events.TRRecipeHandler; import techreborn.items.ItemTR; import techreborn.lib.ModInfo; +import java.util.Arrays; + /** * @author drcrazy - * */ public class TRIngredients { public static void registerBlocks() { Arrays.stream(Ores.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); - Arrays.stream(Storage.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); + Arrays.stream(StorageBlocks.values()).forEach(value -> RebornRegistry.registerBlock(value.block)); } - + public static void registerItems() { - Arrays.stream(Dusts.values()).forEach(value -> RebornRegistry.registerItem(value.item)); - Arrays.stream(DustsSmall.values()).forEach(value -> RebornRegistry.registerItem(value.item)); - Arrays.stream(Gems.values()).forEach(value -> RebornRegistry.registerItem(value.item)); - Arrays.stream(Ingots.values()).forEach(value -> RebornRegistry.registerItem(value.item)); - Arrays.stream(Nuggets.values()).forEach(value -> RebornRegistry.registerItem(value.item)); - Arrays.stream(Parts.values()).forEach(value -> RebornRegistry.registerItem(value.item)); - Arrays.stream(Plates.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + Arrays.stream(Dusts.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + Arrays.stream(SmallDusts.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + Arrays.stream(Gems.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + Arrays.stream(Ingots.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + Arrays.stream(Nuggets.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + Arrays.stream(Parts.values()).forEach(value -> RebornRegistry.registerItem(value.item)); + Arrays.stream(Plates.values()).forEach(value -> RebornRegistry.registerItem(value.item)); } - + @SideOnly(Side.CLIENT) public static void registerModel() { - ResourceLocation dustsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/dusts"); + ResourceLocation dustsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/dust"); Arrays.stream(Dusts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(dustsRL, "type=" + value.name))); - - ResourceLocation dustsSmallRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/dustssmall"); - Arrays.stream(DustsSmall.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(dustsSmallRL, "type=" + value.name))); - - ResourceLocation gemsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/gems"); - Arrays.stream(Gems.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(gemsRL, "type=" + value.name))); - - ResourceLocation ingotsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/ingots"); - Arrays.stream(Ingots.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(ingotsRL, "type=" + value.name))); - - ResourceLocation nuggetsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/nuggets"); - Arrays.stream(Nuggets.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(nuggetsRL, "type=" + value.name))); - - ResourceLocation partsRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/parts"); - Arrays.stream(Parts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(partsRL, "type=" + value.name))); - - ResourceLocation platesRL = new ResourceLocation(ModInfo.MOD_ID, "items/materials/plates"); - Arrays.stream(Plates.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, - new ModelResourceLocation(platesRL, "type=" + value.name))); + new ModelResourceLocation(dustsRL, "type=" + value.unsuffixedName))); - ResourceLocation oresRL = new ResourceLocation(ModInfo.MOD_ID, "ores"); + ResourceLocation dustsSmallRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/small_dust"); + Arrays.stream(SmallDusts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, + new ModelResourceLocation(dustsSmallRL, "type=" + value.unsuffixedName))); + + ResourceLocation gemsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/gem"); + Arrays.stream(Gems.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, + new ModelResourceLocation(gemsRL, "type=" + value.unsuffixedName))); + + ResourceLocation ingotsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/ingot"); + Arrays.stream(Ingots.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, + new ModelResourceLocation(ingotsRL, "type=" + value.unsuffixedName))); + + ResourceLocation nuggetsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/nugget"); + Arrays.stream(Nuggets.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, + new ModelResourceLocation(nuggetsRL, "type=" + value.unsuffixedName))); + + ResourceLocation partsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/part"); + Arrays.stream(Parts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, + new ModelResourceLocation(partsRL, "type=" + value.name))); + + ResourceLocation platesRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/plate"); + Arrays.stream(Plates.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0, + new ModelResourceLocation(platesRL, "type=" + value.unsuffixedName))); + + ResourceLocation oresRL = new ResourceLocation(ModInfo.MOD_ID, "ore"); for (Ores value : Ores.values()) { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(oresRL, "type=" + value.name)); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(oresRL, "type=" + value.unsuffixedName)); ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() { @Override protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation(oresRL, "type=" + value.name); + return new ModelResourceLocation(oresRL, "type=" + value.unsuffixedName); } }); } - - ResourceLocation storageRL = new ResourceLocation(ModInfo.MOD_ID, "storage"); - for (Storage value : Storage.values()) { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(storageRL, "type=" + value.name)); + + ResourceLocation storageRL = new ResourceLocation(ModInfo.MOD_ID, "storage_block"); + for (StorageBlocks value : StorageBlocks.values()) { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(storageRL, "type=" + value.unsuffixedName)); ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() { @Override protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - return new ModelResourceLocation(storageRL, "type=" + value.name); + return new ModelResourceLocation(storageRL, "type=" + value.unsuffixedName); } }); - } + } } - + public static enum Ores implements IStringSerializable { BAUXITE, CINNABAR, COPPER, GALENA, IRIDIUM, LEAD, PERIDOT, PYRITE, RUBY, SAPPHIRE, SHELDONITE, SILVER, SODALITE, SPHALERITE, TIN, TUNGSTEN; + public final String unsuffixedName; public final String name; public final Block block; private Ores() { - name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "ORE_" + this.toString()); + unsuffixedName = this.toString().toLowerCase(); + name = this.toString().toLowerCase() + "_ore"; block = new BlockOre(); block.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); block.setTranslationKey(ModInfo.MOD_ID + ".ore." + this.toString().toLowerCase()); @@ -138,20 +140,22 @@ public class TRIngredients { } } - - public static enum Storage implements IStringSerializable { + + public static enum StorageBlocks implements IStringSerializable { ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, INVAR, IRIDIUM, IRIDIUM_REINFORCED_STONE, IRIDIUM_REINFORCED_TUNGSTENSTEEL, LEAD, NICKEL, OSMIUM, PERIDOT, PLATINUM, RED_GARNET, REFINED_IRON, RUBY, SAPPHIRE, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, YELLOW_GARNET, ZINC; + public final String unsuffixedName; public final String name; public final Block block; - private Storage() { - name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "BLOCK_" + this.toString()); + private StorageBlocks() { + unsuffixedName = this.toString().toLowerCase(); + name = this.toString().toLowerCase() + "_block"; block = new BlockStorage(); block.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); - block.setTranslationKey(ModInfo.MOD_ID + ".storage." + this.toString().toLowerCase()); + block.setTranslationKey(ModInfo.MOD_ID + ".storage_block." + this.toString().toLowerCase()); TRRecipeHandler.hideEntry(block); } @@ -169,11 +173,13 @@ public class TRIngredients { SAPPHIRE, SAW, SILVER, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TIN, TITANIUM, TUNGSTEN, UVAROVITE, YELLOW_GARNET, ZINC; + public final String unsuffixedName; public final String name; public final Item item; private Dusts() { - name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "DUST_" + this.toString()); + unsuffixedName = this.toString().toLowerCase(); + name = this.toString().toLowerCase() + "_dust"; item = new ItemTR(); item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); item.setTranslationKey(ModInfo.MOD_ID + ".dust." + this.toString().toLowerCase()); @@ -194,7 +200,7 @@ public class TRIngredients { } } - public static enum DustsSmall implements IStringSerializable { + public static enum SmallDusts implements IStringSerializable { ALMANDINE, ALUMINUM, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME, CINNABAR, CLAY, COAL, COPPER, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE, FLINT, GALENA, GLOWSTONE, GOLD, GRANITE, GROSSULAR, INVAR, IRON, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE, @@ -202,14 +208,16 @@ public class TRIngredients { RUBY, SALTPETER, SAPPHIRE, SAW, SILVER, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TIN, TITANIUM, TUNGSTEN, UVAROVITE, YELLOW_GARNET, ZINC; + public final String unsuffixedName; public final String name; public final Item item; - private DustsSmall() { - name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "DUST_SMALL_" + this.toString()); + private SmallDusts() { + unsuffixedName = this.toString().toLowerCase(); + name = this.toString().toLowerCase() + "_small_dust"; item = new ItemTR(); item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); - item.setTranslationKey(ModInfo.MOD_ID + ".dustsmall." + this.toString().toLowerCase()); + item.setTranslationKey(ModInfo.MOD_ID + ".small_dust." + this.toString().toLowerCase()); TRRecipeHandler.hideEntry(item); } @@ -226,25 +234,27 @@ public class TRIngredients { return name; } } - + public static enum Gems implements IStringSerializable { PERIDOT, RED_GARNET, RUBY, SAPPHIRE, YELLOW_GARNET; + public final String unsuffixedName; public final String name; public final Item item; - + private Gems() { - name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "GEM_" + this.toString()); + unsuffixedName = this.toString().toLowerCase(); + name = this.toString().toLowerCase() + "_gem"; item = new ItemTR(); item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); item.setTranslationKey(ModInfo.MOD_ID + ".gem." + this.toString().toLowerCase()); TRRecipeHandler.hideEntry(item); } - + public ItemStack getStack() { return new ItemStack(item); } - + public ItemStack getStack(int amount) { return new ItemStack(item, amount); } @@ -254,16 +264,18 @@ public class TRIngredients { return name; } } - + public static enum Ingots implements IStringSerializable { ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM_ALLOY, IRIDIUM, LEAD, MIXED_METAL, NICKEL, PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC; + public final String unsuffixedName; public final String name; public final Item item; private Ingots() { - name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "INGOT_" + this.toString()); + unsuffixedName = this.toString().toLowerCase(); + name = this.toString().toLowerCase() + "_ingot"; item = new ItemTR(); item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); item.setTranslationKey(ModInfo.MOD_ID + ".ingot." + this.toString().toLowerCase()); @@ -283,26 +295,28 @@ public class TRIngredients { return name; } } - + public static enum Nuggets implements IStringSerializable { ALUMINUM, BRASS, BRONZE, CHROME, COPPER, DIAMOND, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM, LEAD, NICKEL, PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC; + public final String unsuffixedName; public final String name; public final Item item; - + private Nuggets() { - name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "NUGGET_" + this.toString()); + unsuffixedName = this.toString().toLowerCase(); + name = this.toString().toLowerCase() + "_nugget"; item = new ItemTR(); item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); - item.setTranslationKey(ModInfo.MOD_ID + ".nuggets." + this.toString().toLowerCase()); - TRRecipeHandler.hideEntry(item); + item.setTranslationKey(ModInfo.MOD_ID + ".nugget." + this.toString().toLowerCase()); + TRRecipeHandler.hideEntry(item); } - + public ItemStack getStack() { return new ItemStack(item); } - + public ItemStack getStack(int amount) { return new ItemStack(item, amount); } @@ -312,22 +326,56 @@ public class TRIngredients { return name; } } - + public static enum Parts implements IStringSerializable { - CARBON_FIBER, CARBON_MESH, CIRCUIT_ADVANCED, CIRCUIT_BASIC, CIRCUIT_ELITE, COMPUTER_MONITOR, COOLANT_SIMPLE, COOLANT_SIX, COOLANT_TRIPLE, - CUPRONICKEL_HEATING_COIL, DATA_ORB, DATA_STORAGE_CIRCUIT, DEPLETED_CELL, - DIAMOND_GRINDING_HEAD, DIAMOND_SAW_BLADE, DOUBLE_DEPLETED_CELL, DOUBLE_PLUTONIUM_CELL, DOUBLE_THORIUM_CELL, - DOUBLE_URANIUM_CELL, ENERGY_FLOW_CIRCUIT, HELIUM_COOLANT_SIMPLE, HELIUM_COOLANT_SIX, - HELIUM_COOLANT_TRIPLE, IRIDIUM_NEUTRON_REFLECTOR, KANTHAL_HEATING_COIL, MACHINE_PARTS, NAK_COOLANT_SIMPLE, - NAK_COOLANT_SIX, NAK_COOLANT_TRIPLE, NEUTRON_REFLECTOR, NICHROME_HEATING_COIL, PLUTONIUM_CELL, QUAD_DEPLETED_CELL, - QUAD_PLUTONIUM_CELL, QUAD_THORIUM_CELL, QUAD_URANIUM_CELL, RUBBER, SAP, SCRAP, SUPER_CONDUCTOR, - THICK_NEUTRON_REFLECTOR, THORIUM_CELL, TUNGSTEN_GRINDING_HEAD, URANIUM_CELL, UU_MATTER; + CARBON_FIBER, + CARBON_MESH, + + ELECTRONIC_CIRCUIT, + ADVANCED_CIRCUIT, + INDUSTRIAL_CIRCUIT, + + MACHINE_PARTS, + DIGITAL_DISPLAY, + + DATA_STORAGE_CORE, + DATA_STORAGE_CHIP, + ENERGY_FLOW_CHIP, + SUPERCONDUCTOR, + + DIAMOND_SAW_BLADE, + DIAMOND_GRINDING_HEAD, + TUNGSTEN_GRINDING_HEAD, + + CUPRONICKEL_HEATING_COIL, + KANTHAL_HEATING_COIL, + NICHROME_HEATING_COIL, + + NEUTRON_REFLECTOR, + THICK_NEUTRON_REFLECTOR, + IRIDIUM_NEUTRON_REFLECTOR + + //java vars can't start with numbers, so these get suffixes + , WATER_COOLANT_CELL_10K, + WATER_COOLANT_CELL_30K, + WATER_COOLANT_CELL_60K, + HELIUM_COOLANT_CELL_60K, + HELIUM_COOLANT_CELL_360K, + HELIUM_COOLANT_CELL_180K, + NAK_COOLANT_CELL_60K, + NAK_COOLANT_CELL_180K, + NAK_COOLANT_CELL_360K, + + RUBBER, + SAP, + SCRAP, + UU_MATTER; public final String name; public final Item item; private Parts() { - name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, this.toString()); + name = this.toString().toLowerCase(); item = new ItemTR(); item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); item.setTranslationKey(ModInfo.MOD_ID + ".part." + this.toString().toLowerCase()); @@ -347,18 +395,20 @@ public class TRIngredients { return name; } } - + public static enum Plates implements IStringSerializable { ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CARBON, COAL, COPPER, DIAMOND, ELECTRUM, EMERALD, GOLD, INVAR, IRIDIUM_ALLOY, IRIDIUM, IRON, LAPIS, LAZURITE, LEAD, MAGNALIUM, NICKEL, OBSIDIAN, PERIDOT, PLATINUM, RED_GARNET, REDSTONE, REFINED_IRON, RUBY, SAPPHIRE, SILICON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, WOOD, YELLOW_GARNET, ZINC; + public final String unsuffixedName; public final String name; public final Item item; private Plates() { - name = CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, "PLATE_" + this.toString()); + unsuffixedName = this.toString().toLowerCase(); + name = this.toString().toLowerCase() + "_plate"; item = new ItemTR(); item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name)); item.setTranslationKey(ModInfo.MOD_ID + ".plate." + this.toString().toLowerCase()); @@ -368,7 +418,7 @@ public class TRIngredients { public ItemStack getStack() { return new ItemStack(item); } - + public ItemStack getStack(int amount) { return new ItemStack(item, amount); } diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index d3bf7bff1..82dabc52a 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -31,7 +31,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import reborncore.common.util.RebornCraftingHelper; import techreborn.Core; -import techreborn.blocks.BlockStorage; import techreborn.blocks.cable.EnumCableType; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; @@ -135,10 +134,10 @@ public class CraftingTableRecipes extends RecipeMethods { registerShaped(getStack(ModBlocks.SCRAPBOXINATOR), "ICI", "DSD", "ICI", 'S', getStack(TRItems.SCRAP_BOX), 'C', "circuitBasic", 'I', "plateIron", 'D', "dirt"); registerShaped(getStack(ModBlocks.FUSION_CONTROL_COMPUTER), "CCC", "PTP", "CCC", 'P', "energyCrystal", 'T', getStack(ModBlocks.FUSION_COIL), 'C', "circuitMaster"); // registerShaped(getStack(ModBlocks.FUSION_COIL), "CSC", "NAN", "CRC", 'A', getStack(ModBlocks.MACHINE_CASINGS, 1, 2), 'N', getMaterial("nichromeHeatingCoil", Type.PART), 'C', "circuitMaster", 'S', "craftingSuperconductor", 'R', getMaterial("iridiumNeutronReflector", Type.PART)); - registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateAluminum", 'D', TRIngredients.Parts.DATA_ORB.getStack(), 'C', TRIngredients.Parts.COMPUTER_MONITOR.getStack()); - registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', TRIngredients.Parts.DATA_ORB.getStack(), 'C', TRIngredients.Parts.COMPUTER_MONITOR.getStack()); + registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateAluminum", 'D', TRIngredients.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRIngredients.Parts.DIGITAL_DISPLAY.getStack()); + registerShaped(getStack(ModBlocks.DIGITAL_CHEST), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D', TRIngredients.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRIngredients.Parts.DIGITAL_DISPLAY.getStack()); registerShaped(getStack(ModBlocks.MATTER_FABRICATOR), "ETE", "AOA", "ETE", 'E', "circuitMaster", 'T', getStack(ModBlocks.EXTRACTOR), 'A', "machineBlockElite", 'O', getStack(TRItems.LAPOTRONIC_ORB)); - registerShaped(getStack(ModBlocks.COMPUTER_CUBE), "OMC", "MFM", "CMO", 'O', TRIngredients.Parts.DATA_ORB.getStack(), 'M', TRIngredients.Parts.COMPUTER_MONITOR.getStack(), 'C', "circuitMaster", 'F', "machineBlockAdvanced"); + registerShaped(getStack(ModBlocks.COMPUTER_CUBE), "OMC", "MFM", "CMO", 'O', TRIngredients.Parts.DATA_STORAGE_CORE.getStack(), 'M', TRIngredients.Parts.DIGITAL_DISPLAY.getStack(), 'C', "circuitMaster", 'F', "machineBlockAdvanced"); registerShaped(getStack(ModBlocks.PLAYER_DETECTOR, true), " D ", "CFC", " D ", 'D', "circuitStorage", 'C', "circuitAdvanced", 'F', getStack(ModBlocks.COMPUTER_CUBE)); registerShaped(getStack(ModBlocks.DRAGON_EGG_SYPHON), "CTC", "PSP", "CBC", 'C', "circuitMaster", 'T', getStack(ModBlocks.MEDIUM_VOLTAGE_SU), 'P', "plateIridiumAlloy", 'S', "craftingSuperconductor", 'B', getStack(TRItems.LAPOTRONIC_ORB)); registerShaped(getStack(ModBlocks.PLASMA_GENERATOR), "PPP", "PTP", "CGC", 'P', "plateTungstensteel", 'T', getStack(ModBlocks.HV_TRANSFORMER), 'C', "circuitMaster", 'G', getStack(ModBlocks.SOLID_FUEL_GENEREATOR)); @@ -166,7 +165,7 @@ public class CraftingTableRecipes extends RecipeMethods { registerShaped(getStack(ModBlocks.IRON_FURNACE), " I ", "I I", "IFI", 'I', "ingotIron", 'F', getStack(Blocks.FURNACE)); registerShaped(getStack(ModBlocks.EXTRACTOR), "TMT", "TCT", " ", 'T', getStack(TRItems.TREE_TAP, true), 'M', "machineBlockBasic", 'C', "circuitBasic"); registerShaped(getStack(ModBlocks.GRINDER), "FFF", "SMS", " C ", 'F', Items.FLINT, 'S', getStack(Blocks.COBBLESTONE), 'M', "machineBlockBasic", 'C', "circuitBasic"); - registerShaped(getStack(ModBlocks.QUANTUM_CHEST), "DCD", "ATA", "DQD", 'D', TRIngredients.Parts.DATA_ORB.getStack(), 'C', TRIngredients.Parts.COMPUTER_MONITOR.getStack(), 'A', "machineBlockElite", 'Q', getStack(ModBlocks.DIGITAL_CHEST), 'T', getStack(ModBlocks.COMPRESSOR)); + registerShaped(getStack(ModBlocks.QUANTUM_CHEST), "DCD", "ATA", "DQD", 'D', TRIngredients.Parts.DATA_STORAGE_CORE.getStack(), 'C', TRIngredients.Parts.DIGITAL_DISPLAY.getStack(), 'A', "machineBlockElite", 'Q', getStack(ModBlocks.DIGITAL_CHEST), 'T', getStack(ModBlocks.COMPRESSOR)); registerShaped(getStack(ModBlocks.QUANTUM_TANK), "EPE", "PCP", "EPE", 'P', "platePlatinum", 'E', "circuitAdvanced", 'C', getStack(ModBlocks.QUANTUM_CHEST)); registerShaped(getStack(ModBlocks.LAMP_INCANDESCENT), "GGG", "TCT", "GGG", 'G', "paneGlass", 'T', getMaterial("copper", Type.CABLE), 'C', TRIngredients.Parts.CARBON_FIBER.getStack()); registerShaped(getStack(ModBlocks.LAMP_LED), "GGG", "TLT", "GGG", 'G', "paneGlass", 'T', getMaterial("tin", Type.CABLE), 'L', "dustGlowstone"); diff --git a/src/main/java/techreborn/init/recipes/FusionReactorRecipes.java b/src/main/java/techreborn/init/recipes/FusionReactorRecipes.java index 866778457..43446ba73 100644 --- a/src/main/java/techreborn/init/recipes/FusionReactorRecipes.java +++ b/src/main/java/techreborn/init/recipes/FusionReactorRecipes.java @@ -26,7 +26,6 @@ package techreborn.init.recipes; import techreborn.api.reactor.FusionReactorRecipe; import techreborn.api.reactor.FusionReactorRecipeHelper; -import techreborn.blocks.BlockOre; import techreborn.init.TRIngredients; import techreborn.items.ItemCells; diff --git a/src/main/resources/assets/techreborn/blockstates/items/materials/dusts.json b/src/main/resources/assets/techreborn/blockstates/items/material/dust.json similarity index 80% rename from src/main/resources/assets/techreborn/blockstates/items/materials/dusts.json rename to src/main/resources/assets/techreborn/blockstates/items/material/dust.json index 656faf653..99e60c8f0 100644 --- a/src/main/resources/assets/techreborn/blockstates/items/materials/dusts.json +++ b/src/main/resources/assets/techreborn/blockstates/items/material/dust.json @@ -6,312 +6,312 @@ }, "variants": { "type": { - "dustalmandine": { + "almandine": { "textures": { "layer0": "techreborn:items/dust/almandine_dust" } }, - "dustaluminum": { + "aluminum": { "textures": { "layer0": "techreborn:items/dust/aluminum_dust" } }, - "dustandesite": { + "andesite": { "textures": { "layer0": "techreborn:items/dust/andesite_dust" } - }, - "dustandradite": { + }, + "andradite": { "textures": { "layer0": "techreborn:items/dust/andradite_dust" } }, - "dustashes": { + "ashes": { "textures": { "layer0": "techreborn:items/dust/ashes_dust" } }, - "dustbasalt": { + "basalt": { "textures": { "layer0": "techreborn:items/dust/basalt_dust" } }, - "dustbauxite": { + "bauxite": { "textures": { "layer0": "techreborn:items/dust/bauxite_dust" } }, - "dustbrass": { + "brass": { "textures": { "layer0": "techreborn:items/dust/brass_dust" } }, - "dustbronze": { + "bronze": { "textures": { "layer0": "techreborn:items/dust/bronze_dust" } }, - "dustcalcite": { + "calcite": { "textures": { "layer0": "techreborn:items/dust/calcite_dust" } }, - "dustcharcoal": { + "charcoal": { "textures": { "layer0": "techreborn:items/dust/charcoal_dust" } }, - "dustchrome": { + "chrome": { "textures": { "layer0": "techreborn:items/dust/chrome_dust" } }, - "dustcinnabar": { + "cinnabar": { "textures": { "layer0": "techreborn:items/dust/cinnabar_dust" } }, - "dustclay": { + "clay": { "textures": { "layer0": "techreborn:items/dust/clay_dust" } }, - "dustcoal": { + "coal": { "textures": { "layer0": "techreborn:items/dust/coal_dust" } }, - "dustcopper": { + "copper": { "textures": { "layer0": "techreborn:items/dust/copper_dust" } }, - "dustdarkashes": { + "dark_ashes": { "textures": { "layer0": "techreborn:items/dust/dark_ashes_dust" } }, - "dustdiamond": { + "diamond": { "textures": { "layer0": "techreborn:items/dust/diamond_dust" } }, - "dustdiorite": { + "diorite": { "textures": { "layer0": "techreborn:items/dust/diorite_dust" } - }, - "dustelectrum": { + }, + "electrum": { "textures": { "layer0": "techreborn:items/dust/electrum_dust" } }, - "dustemerald": { + "emerald": { "textures": { "layer0": "techreborn:items/dust/emerald_dust" } }, - "dustendereye": { + "ender_eye": { "textures": { "layer0": "techreborn:items/dust/ender_eye_dust" } }, - "dustenderpearl": { + "ender_pearl": { "textures": { "layer0": "techreborn:items/dust/ender_pearl_dust" } }, - "dustendstone": { + "endstone": { "textures": { "layer0": "techreborn:items/dust/endstone_dust" } }, - "dustflint": { + "flint": { "textures": { "layer0": "techreborn:items/dust/flint_dust" } }, - "dustgalena": { + "galena": { "textures": { "layer0": "techreborn:items/dust/galena_dust" } }, - "dustgold": { + "gold": { "textures": { "layer0": "techreborn:items/dust/gold_dust" } }, - "dustgranite": { + "granite": { "textures": { "layer0": "techreborn:items/dust/granite_dust" } - }, - "dustgrossular": { + }, + "grossular": { "textures": { "layer0": "techreborn:items/dust/grossular_dust" } }, - "dustinvar": { + "invar": { "textures": { "layer0": "techreborn:items/dust/invar_dust" } }, - "dustiron": { + "iron": { "textures": { "layer0": "techreborn:items/dust/iron_dust" } }, - "dustlazurite": { + "lazurite": { "textures": { "layer0": "techreborn:items/dust/lazurite_dust" } }, - "dustlead": { + "lead": { "textures": { "layer0": "techreborn:items/dust/lead_dust" } }, - "dustmagnesium": { + "magnesium": { "textures": { "layer0": "techreborn:items/dust/magnesium_dust" } }, - "dustmanganese": { + "manganese": { "textures": { "layer0": "techreborn:items/dust/manganese_dust" } }, - "dustmarble": { + "marble": { "textures": { "layer0": "techreborn:items/dust/marble_dust" } }, - "dustnetherrack": { + "netherrack": { "textures": { "layer0": "techreborn:items/dust/netherrack_dust" } }, - "dustnickel": { + "nickel": { "textures": { "layer0": "techreborn:items/dust/nickel_dust" } }, - "dustobsidian": { + "obsidian": { "textures": { "layer0": "techreborn:items/dust/obsidian_dust" } }, - "dustolivine": { + "olivine": { "textures": { "layer0": "techreborn:items/dust/olivine_dust" } - }, - "dustperidot": { + }, + "peridot": { "textures": { "layer0": "techreborn:items/dust/peridot_dust" } }, - "dustphosphorous": { + "phosphorous": { "textures": { "layer0": "techreborn:items/dust/phosphorous_dust" } }, - "dustplatinum": { + "platinum": { "textures": { "layer0": "techreborn:items/dust/platinum_dust" } }, - "dustpyrite": { + "pyrite": { "textures": { "layer0": "techreborn:items/dust/pyrite_dust" } }, - "dustpyrope": { + "pyrope": { "textures": { "layer0": "techreborn:items/dust/pyrope_dust" } }, - "dustredgarnet": { + "red_garnet": { "textures": { "layer0": "techreborn:items/dust/red_garnet_dust" } }, - "dustruby": { + "ruby": { "textures": { "layer0": "techreborn:items/dust/ruby_dust" } }, - "dustsaltpeter": { + "saltpeter": { "textures": { "layer0": "techreborn:items/dust/saltpeter_dust" } }, - "dustsapphire": { + "sapphire": { "textures": { "layer0": "techreborn:items/dust/sapphire_dust" } }, - "dustsaw": { + "saw": { "textures": { "layer0": "techreborn:items/dust/saw_dust_dust" } }, - "dustsilver": { + "silver": { "textures": { "layer0": "techreborn:items/dust/silver_dust" } }, - "dustsodalite": { + "sodalite": { "textures": { "layer0": "techreborn:items/dust/sodalite_dust" } }, - "dustspessartine": { + "spessartine": { "textures": { "layer0": "techreborn:items/dust/spessartine_dust" } }, - "dustsphalerite": { + "sphalerite": { "textures": { "layer0": "techreborn:items/dust/sphalerite_dust" } }, - "duststeel": { + "steel": { "textures": { "layer0": "techreborn:items/dust/steel_dust" } }, - "dustsulfur": { + "sulfur": { "textures": { "layer0": "techreborn:items/dust/sulfur_dust" } }, - "dusttin": { + "tin": { "textures": { "layer0": "techreborn:items/dust/tin_dust" } }, - "dusttitanium": { + "titanium": { "textures": { "layer0": "techreborn:items/dust/titanium_dust" } }, - "dusttungsten": { + "tungsten": { "textures": { "layer0": "techreborn:items/dust/tungsten_dust" } }, - "dustuvarovite": { + "uvarovite": { "textures": { "layer0": "techreborn:items/dust/uvarovite_dust" } }, - "dustyellowgarnet": { + "yellow_garnet": { "textures": { "layer0": "techreborn:items/dust/yellow_garnet_dust" } }, - "dustzinc": { + "zinc": { "textures": { "layer0": "techreborn:items/dust/zinc_dust" } diff --git a/src/main/resources/assets/techreborn/blockstates/items/materials/gems.json b/src/main/resources/assets/techreborn/blockstates/items/material/gem.json similarity index 84% rename from src/main/resources/assets/techreborn/blockstates/items/materials/gems.json rename to src/main/resources/assets/techreborn/blockstates/items/material/gem.json index 787106388..3bf240d8d 100644 --- a/src/main/resources/assets/techreborn/blockstates/items/materials/gems.json +++ b/src/main/resources/assets/techreborn/blockstates/items/material/gem.json @@ -6,27 +6,27 @@ }, "variants": { "type": { - "gemperidot": { + "peridot": { "textures": { "layer0": "techreborn:items/gem/peridot" } }, - "gemredgarnet": { + "red_garnet": { "textures": { "layer0": "techreborn:items/gem/red_garnet" } }, - "gemruby": { + "ruby": { "textures": { "layer0": "techreborn:items/gem/ruby" } }, - "gemsapphire": { + "sapphire": { "textures": { "layer0": "techreborn:items/gem/sapphire" } }, - "gemyellowgarnet": { + "yellow_garnet": { "textures": { "layer0": "techreborn:items/gem/yellow_garnet" } diff --git a/src/main/resources/assets/techreborn/blockstates/items/materials/ingots.json b/src/main/resources/assets/techreborn/blockstates/items/material/ingot.json similarity index 81% rename from src/main/resources/assets/techreborn/blockstates/items/materials/ingots.json rename to src/main/resources/assets/techreborn/blockstates/items/material/ingot.json index 074ce2e52..dc4b923ff 100644 --- a/src/main/resources/assets/techreborn/blockstates/items/materials/ingots.json +++ b/src/main/resources/assets/techreborn/blockstates/items/material/ingot.json @@ -6,117 +6,117 @@ }, "variants": { "type": { - "ingotadvancedalloy": { + "advanced_alloy": { "textures": { "layer0": "techreborn:items/ingot/advanced_alloy_ingot" } }, - "ingotaluminum": { + "aluminum": { "textures": { "layer0": "techreborn:items/ingot/aluminum_ingot" } }, - "ingotbrass": { + "brass": { "textures": { "layer0": "techreborn:items/ingot/brass_ingot" } }, - "ingotbronze": { + "bronze": { "textures": { "layer0": "techreborn:items/ingot/bronze_ingot" } }, - "ingotchrome": { + "chrome": { "textures": { "layer0": "techreborn:items/ingot/chrome_ingot" } }, - "ingotcopper": { + "copper": { "textures": { "layer0": "techreborn:items/ingot/copper_ingot" } }, - "ingotelectrum": { + "electrum": { "textures": { "layer0": "techreborn:items/ingot/electrum_ingot" } }, - "ingothottungstensteel": { + "hot_tungstensteel": { "textures": { "layer0": "techreborn:items/ingot/hot_tungstensteel_ingot" } }, - "ingotinvar": { + "invar": { "textures": { "layer0": "techreborn:items/ingot/invar_ingot" } }, - "ingotiridiumalloy": { + "iridium_alloy": { "textures": { "layer0": "techreborn:items/ingot/iridium_alloy_ingot" } }, - "ingotiridium": { + "iridium": { "textures": { "layer0": "techreborn:items/ingot/iridium_ingot" } }, - "ingotlead": { + "lead": { "textures": { "layer0": "techreborn:items/ingot/lead_ingot" } }, - "ingotmixedmetal": { + "mixed_metal": { "textures": { "layer0": "techreborn:items/ingot/mixed_metal_ingot" } }, - "ingotnickel": { + "nickel": { "textures": { "layer0": "techreborn:items/ingot/nickel_ingot" } }, - "ingotplatinum": { + "platinum": { "textures": { "layer0": "techreborn:items/ingot/platinum_ingot" } }, - "ingotrefinediron": { + "refined_iron": { "textures": { "layer0": "techreborn:items/ingot/refined_iron_ingot" } }, - "ingotsilver": { + "silver": { "textures": { "layer0": "techreborn:items/ingot/silver_ingot" } }, - "ingotsteel": { + "steel": { "textures": { "layer0": "techreborn:items/ingot/steel_ingot" } }, - "ingottin": { + "tin": { "textures": { "layer0": "techreborn:items/ingot/tin_ingot" } }, - "ingottitanium": { + "titanium": { "textures": { "layer0": "techreborn:items/ingot/titanium_ingot" } }, - "ingottungsten": { + "tungsten": { "textures": { "layer0": "techreborn:items/ingot/tungsten_ingot" } }, - "ingottungstensteel": { + "tungstensteel": { "textures": { "layer0": "techreborn:items/ingot/tungstensteel_ingot" } }, - "ingotzinc": { + "zinc": { "textures": { "layer0": "techreborn:items/ingot/zinc_ingot" } diff --git a/src/main/resources/assets/techreborn/blockstates/items/materials/nuggets.json b/src/main/resources/assets/techreborn/blockstates/items/material/nugget.json similarity index 81% rename from src/main/resources/assets/techreborn/blockstates/items/materials/nuggets.json rename to src/main/resources/assets/techreborn/blockstates/items/material/nugget.json index 542fc7c98..a76824dc2 100644 --- a/src/main/resources/assets/techreborn/blockstates/items/materials/nuggets.json +++ b/src/main/resources/assets/techreborn/blockstates/items/material/nugget.json @@ -6,107 +6,107 @@ }, "variants": { "type": { - "nuggetaluminum": { + "aluminum": { "textures": { "layer0": "techreborn:items/nugget/aluminum_nugget" } }, - "nuggetbrass": { + "brass": { "textures": { "layer0": "techreborn:items/nugget/brass_nugget" } }, - "nuggetbronze": { + "bronze": { "textures": { "layer0": "techreborn:items/nugget/bronze_nugget" } }, - "nuggetchrome": { + "chrome": { "textures": { "layer0": "techreborn:items/nugget/chrome_nugget" } }, - "nuggetcopper": { + "copper": { "textures": { "layer0": "techreborn:items/nugget/copper_nugget" } }, - "nuggetdiamond": { + "diamond": { "textures": { "layer0": "techreborn:items/nugget/diamond_nugget" } }, - "nuggetelectrum": { + "electrum": { "textures": { "layer0": "techreborn:items/nugget/electrum_nugget" } }, - "nuggethottungstensteel": { + "hot_tungstensteel": { "textures": { "layer0": "techreborn:items/nugget/hot_tungstensteel_nugget" } }, - "nuggetinvar": { + "invar": { "textures": { "layer0": "techreborn:items/nugget/invar_nugget" } }, - "nuggetiridium": { + "iridium": { "textures": { "layer0": "techreborn:items/nugget/iridium_nugget" } }, - "nuggetlead": { + "lead": { "textures": { "layer0": "techreborn:items/nugget/lead_nugget" } }, - "nuggetnickel": { + "nickel": { "textures": { "layer0": "techreborn:items/nugget/nickel_nugget" } }, - "nuggetplatinum": { + "platinum": { "textures": { "layer0": "techreborn:items/nugget/platinum_nugget" } }, - "nuggetrefinediron": { + "refined_iron": { "textures": { "layer0": "techreborn:items/nugget/refined_iron_nugget" } }, - "nuggetsilver": { + "silver": { "textures": { "layer0": "techreborn:items/nugget/silver_nugget" } }, - "nuggetsteel": { + "steel": { "textures": { "layer0": "techreborn:items/nugget/steel_nugget" } }, - "nuggettin": { + "tin": { "textures": { "layer0": "techreborn:items/nugget/tin_nugget" } }, - "nuggettitanium": { + "titanium": { "textures": { "layer0": "techreborn:items/nugget/titanium_nugget" } }, - "nuggettungsten": { + "tungsten": { "textures": { "layer0": "techreborn:items/nugget/tungsten_nugget" } }, - "nuggettungstensteel": { + "tungstensteel": { "textures": { "layer0": "techreborn:items/nugget/tungstensteel_nugget" } }, - "nuggetzinc": { + "zinc": { "textures": { "layer0": "techreborn:items/nugget/zinc_nugget" } diff --git a/src/main/resources/assets/techreborn/blockstates/items/material/part.json b/src/main/resources/assets/techreborn/blockstates/items/material/part.json new file mode 100644 index 000000000..77f61b331 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/items/material/part.json @@ -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" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/items/materials/plates.json b/src/main/resources/assets/techreborn/blockstates/items/material/plate.json similarity index 80% rename from src/main/resources/assets/techreborn/blockstates/items/materials/plates.json rename to src/main/resources/assets/techreborn/blockstates/items/material/plate.json index 07c5eacf9..8142e7b0f 100644 --- a/src/main/resources/assets/techreborn/blockstates/items/materials/plates.json +++ b/src/main/resources/assets/techreborn/blockstates/items/material/plate.json @@ -6,197 +6,197 @@ }, "variants": { "type": { - "plateadvancedalloy": { + "advanced_alloy": { "textures": { "layer0": "techreborn:items/plate/advanced_alloy_plate" } }, - "platealuminum": { + "aluminum": { "textures": { "layer0": "techreborn:items/plate/aluminum_plate" } }, - "platebrass": { + "brass": { "textures": { "layer0": "techreborn:items/plate/brass_plate" } }, - "platebronze": { + "bronze": { "textures": { "layer0": "techreborn:items/plate/bronze_plate" } }, - "platecarbon": { + "carbon": { "textures": { "layer0": "techreborn:items/plate/carbon_plate" } }, - "platechrome": { + "chrome": { "textures": { "layer0": "techreborn:items/plate/chrome_plate" } }, - "platecoal": { + "coal": { "textures": { "layer0": "techreborn:items/plate/coal_plate" } }, - "platecopper": { + "copper": { "textures": { "layer0": "techreborn:items/plate/copper_plate" } }, - "platediamond": { + "diamond": { "textures": { "layer0": "techreborn:items/plate/diamond_plate" } }, - "plateelectrum": { + "electrum": { "textures": { "layer0": "techreborn:items/plate/electrum_plate" } }, - "plateemerald": { + "emerald": { "textures": { "layer0": "techreborn:items/plate/emerald_plate" } }, - "plategold": { + "gold": { "textures": { "layer0": "techreborn:items/plate/gold_plate" } }, - "plateinvar": { + "invar": { "textures": { "layer0": "techreborn:items/plate/invar_plate" } }, - "plateiridiumalloy": { + "iridium_alloy": { "textures": { "layer0": "techreborn:items/plate/iridium_alloy_plate" } }, - "plateiridium": { + "iridium": { "textures": { "layer0": "techreborn:items/plate/iridium_plate" } }, - "plateiron": { + "iron": { "textures": { "layer0": "techreborn:items/plate/iron_plate" } }, - "platelapis": { + "lapis": { "textures": { "layer0": "techreborn:items/plate/lapis_plate" } }, - "platelazurite": { + "lazurite": { "textures": { "layer0": "techreborn:items/plate/lazurite_plate" } }, - "platelead": { + "lead": { "textures": { "layer0": "techreborn:items/plate/lead_plate" } }, - "platemagnalium": { + "magnalium": { "textures": { "layer0": "techreborn:items/plate/magnalium_plate" } }, - "platenickel": { + "nickel": { "textures": { "layer0": "techreborn:items/plate/nickel_plate" } }, - "plateobsidian": { + "obsidian": { "textures": { "layer0": "techreborn:items/plate/obsidian_plate" } }, - "plateperidot": { + "peridot": { "textures": { "layer0": "techreborn:items/plate/peridot_plate" } }, - "plateplatinum": { + "platinum": { "textures": { "layer0": "techreborn:items/plate/platinum_plate" } }, - "plateredgarnet": { + "red_garnet": { "textures": { "layer0": "techreborn:items/plate/red_garnet_plate" } }, - "plateredstone": { + "redstone": { "textures": { "layer0": "techreborn:items/plate/redstone_plate" } }, - "platerefinediron": { + "refined_iron": { "textures": { "layer0": "techreborn:items/plate/refined_iron_plate" } }, - "plateruby": { + "ruby": { "textures": { "layer0": "techreborn:items/plate/ruby_plate" } }, - "platesapphire": { + "sapphire": { "textures": { "layer0": "techreborn:items/plate/sapphire_plate" } }, - "platesilicon": { + "silicon": { "textures": { "layer0": "techreborn:items/plate/silicon_plate" } }, - "platesilver": { + "silver": { "textures": { "layer0": "techreborn:items/plate/silver_plate" } }, - "platesteel": { + "steel": { "textures": { "layer0": "techreborn:items/plate/steel_plate" } }, - "platetin": { + "tin": { "textures": { "layer0": "techreborn:items/plate/tin_plate" } }, - "platetitanium": { + "titanium": { "textures": { "layer0": "techreborn:items/plate/titanium_plate" } }, - "platetungsten": { + "tungsten": { "textures": { "layer0": "techreborn:items/plate/tungsten_plate" } }, - "platetungstensteel": { + "tungstensteel": { "textures": { "layer0": "techreborn:items/plate/tungstensteel_plate" } }, - "platewood": { + "wood": { "textures": { "layer0": "techreborn:items/plate/wood_plate" } }, - "plateyellowgarnet": { + "yellow_garnet": { "textures": { "layer0": "techreborn:items/plate/yellow_garnet_plate" } }, - "platezinc": { + "zinc": { "textures": { "layer0": "techreborn:items/plate/zinc_plate" } diff --git a/src/main/resources/assets/techreborn/blockstates/items/materials/dustssmall.json b/src/main/resources/assets/techreborn/blockstates/items/material/small_dust.json similarity index 79% rename from src/main/resources/assets/techreborn/blockstates/items/materials/dustssmall.json rename to src/main/resources/assets/techreborn/blockstates/items/material/small_dust.json index 1440e9d5a..46ca8e23b 100644 --- a/src/main/resources/assets/techreborn/blockstates/items/materials/dustssmall.json +++ b/src/main/resources/assets/techreborn/blockstates/items/material/small_dust.json @@ -6,322 +6,322 @@ }, "variants": { "type": { - "dustsmallalmandine": { + "almandine": { "textures": { "layer0": "techreborn:items/smalldust/almandine_smalldust" } }, - "dustsmallaluminum": { + "aluminum": { "textures": { "layer0": "techreborn:items/smalldust/aluminum_smalldust" } }, - "dustsmallandesite": { + "andesite": { "textures": { "layer0": "techreborn:items/smalldust/andesite_smalldust" } }, - "dustsmallandradite": { + "andradite": { "textures": { "layer0": "techreborn:items/smalldust/andradite_smalldust" } }, - "dustsmallashes": { + "ashes": { "textures": { "layer0": "techreborn:items/smalldust/ashes_smalldust" } }, - "dustsmallbasalt": { + "basalt": { "textures": { "layer0": "techreborn:items/smalldust/basalt_smalldust" } }, - "dustsmallbauxite": { + "bauxite": { "textures": { "layer0": "techreborn:items/smalldust/bauxite_smalldust" } }, - "dustsmallbrass": { + "brass": { "textures": { "layer0": "techreborn:items/smalldust/brass_smalldust" } }, - "dustsmallbronze": { + "bronze": { "textures": { "layer0": "techreborn:items/smalldust/bronze_smalldust" } }, - "dustsmallcalcite": { + "calcite": { "textures": { "layer0": "techreborn:items/smalldust/calcite_smalldust" } }, - "dustsmallcharcoal": { + "charcoal": { "textures": { "layer0": "techreborn:items/smalldust/charcoal_smalldust" } }, - "dustsmallchrome": { + "chrome": { "textures": { "layer0": "techreborn:items/smalldust/chrome_smalldust" } }, - "dustsmallcinnabar": { + "cinnabar": { "textures": { "layer0": "techreborn:items/smalldust/cinnabar_smalldust" } }, - "dustsmallclay": { + "clay": { "textures": { "layer0": "techreborn:items/smalldust/clay_smalldust" } }, - "dustsmallcoal": { + "coal": { "textures": { "layer0": "techreborn:items/smalldust/coal_smalldust" } }, - "dustsmallcopper": { + "copper": { "textures": { "layer0": "techreborn:items/smalldust/copper_smalldust" } }, - "dustsmalldarkashes": { + "dark_ashes": { "textures": { "layer0": "techreborn:items/smalldust/dark_ashes_smalldust" } }, - "dustsmalldiamond": { + "diamond": { "textures": { "layer0": "techreborn:items/smalldust/diamond_smalldust" } }, - "dustsmalldiorite": { + "diorite": { "textures": { "layer0": "techreborn:items/smalldust/diorite_smalldust" } }, - "dustsmallelectrum": { + "electrum": { "textures": { "layer0": "techreborn:items/smalldust/electrum_smalldust" } }, - "dustsmallemerald": { + "emerald": { "textures": { "layer0": "techreborn:items/smalldust/emerald_smalldust" } }, - "dustsmallendereye": { + "ender_eye": { "textures": { "layer0": "techreborn:items/smalldust/ender_eye_smalldust" } }, - "dustsmallenderpearl": { + "ender_pearl": { "textures": { "layer0": "techreborn:items/smalldust/ender_pearl_smalldust" } }, - "dustsmallendstone": { + "endstone": { "textures": { "layer0": "techreborn:items/smalldust/endstone_smalldust" } }, - "dustsmallflint": { + "flint": { "textures": { "layer0": "techreborn:items/smalldust/flint_smalldust" } }, - "dustsmallgalena": { + "galena": { "textures": { "layer0": "techreborn:items/smalldust/galena_smalldust" } }, - "dustsmallglowstone": { + "glowstone": { "textures": { "layer0": "techreborn:items/smalldust/glowstone_smalldust" } }, - "dustsmallgold": { + "gold": { "textures": { "layer0": "techreborn:items/smalldust/gold_smalldust" } }, - "dustsmallgranite": { + "granite": { "textures": { "layer0": "techreborn:items/smalldust/granite_smalldust" } }, - "dustsmallgrossular": { + "grossular": { "textures": { "layer0": "techreborn:items/smalldust/grossular_smalldust" } }, - "dustsmallinvar": { + "invar": { "textures": { "layer0": "techreborn:items/smalldust/invar_smalldust" } }, - "dustsmalliron": { + "iron": { "textures": { "layer0": "techreborn:items/smalldust/iron_smalldust" } }, - "dustsmalllazurite": { + "lazurite": { "textures": { "layer0": "techreborn:items/smalldust/lazurite_smalldust" } }, - "dustsmalllead": { + "lead": { "textures": { "layer0": "techreborn:items/smalldust/lead_smalldust" } }, - "dustsmallmagnesium": { + "magnesium": { "textures": { "layer0": "techreborn:items/smalldust/magnesium_smalldust" } }, - "dustsmallmanganese": { + "manganese": { "textures": { "layer0": "techreborn:items/smalldust/manganese_smalldust" } }, - "dustsmallmarble": { + "marble": { "textures": { "layer0": "techreborn:items/smalldust/marble_smalldust" } }, - "dustsmallnetherrack": { + "netherrack": { "textures": { "layer0": "techreborn:items/smalldust/netherrack_smalldust" } }, - "dustsmallnickel": { + "nickel": { "textures": { "layer0": "techreborn:items/smalldust/nickel_smalldust" } }, - "dustsmallobsidian": { + "obsidian": { "textures": { "layer0": "techreborn:items/smalldust/obsidian_smalldust" } }, - "dustsmallolivine": { + "olivine": { "textures": { "layer0": "techreborn:items/smalldust/olivine_smalldust" } }, - "dustsmallperidot": { + "peridot": { "textures": { "layer0": "techreborn:items/smalldust/peridot_smalldust" } }, - "dustsmallphosphorous": { + "phosphorous": { "textures": { "layer0": "techreborn:items/smalldust/phosphorous_smalldust" } }, - "dustsmallplatinum": { + "platinum": { "textures": { "layer0": "techreborn:items/smalldust/platinum_smalldust" } }, - "dustsmallpyrite": { + "pyrite": { "textures": { "layer0": "techreborn:items/smalldust/pyrite_smalldust" } }, - "dustsmallpyrope": { + "pyrope": { "textures": { "layer0": "techreborn:items/smalldust/pyrope_smalldust" } }, - "dustsmallredgarnet": { + "red_garnet": { "textures": { "layer0": "techreborn:items/smalldust/red_garnet_smalldust" } }, - "dustsmallredstone": { + "redstone": { "textures": { "layer0": "techreborn:items/smalldust/redstone_smalldust" } }, - "dustsmallruby": { + "ruby": { "textures": { "layer0": "techreborn:items/smalldust/ruby_smalldust" } }, - "dustsmallsaltpeter": { + "saltpeter": { "textures": { "layer0": "techreborn:items/smalldust/saltpeter_smalldust" } }, - "dustsmallsapphire": { + "sapphire": { "textures": { "layer0": "techreborn:items/smalldust/sapphire_smalldust" } }, - "dustsmallsaw": { + "saw": { "textures": { "layer0": "techreborn:items/smalldust/saw_dust_smalldust" } }, - "dustsmallsilver": { + "silver": { "textures": { "layer0": "techreborn:items/smalldust/silver_smalldust" } }, - "dustsmallsodalite": { + "sodalite": { "textures": { "layer0": "techreborn:items/smalldust/sodalite_smalldust" } }, - "dustsmallspessartine": { + "spessartine": { "textures": { "layer0": "techreborn:items/smalldust/spessartine_smalldust" } }, - "dustsmallsphalerite": { + "sphalerite": { "textures": { "layer0": "techreborn:items/smalldust/sphalerite_smalldust" } }, - "dustsmallsteel": { + "steel": { "textures": { "layer0": "techreborn:items/smalldust/steel_smalldust" } }, - "dustsmallsulfur": { + "sulfur": { "textures": { "layer0": "techreborn:items/smalldust/sulfur_smalldust" } }, - "dustsmalltin": { + "tin": { "textures": { "layer0": "techreborn:items/smalldust/tin_smalldust" } }, - "dustsmalltitanium": { + "titanium": { "textures": { "layer0": "techreborn:items/smalldust/titanium_smalldust" } }, - "dustsmalltungsten": { + "tungsten": { "textures": { "layer0": "techreborn:items/smalldust/tungsten_smalldust" } }, - "dustsmalluvarovite": { + "uvarovite": { "textures": { "layer0": "techreborn:items/smalldust/uvarovite_smalldust" } }, - "dustsmallyellowgarnet": { + "yellow_garnet": { "textures": { "layer0": "techreborn:items/smalldust/yellow_garnet_smalldust" } }, - "dustsmallzinc": { + "zinc": { "textures": { "layer0": "techreborn:items/smalldust/zinc_smalldust" } diff --git a/src/main/resources/assets/techreborn/blockstates/items/materials/parts.json b/src/main/resources/assets/techreborn/blockstates/items/materials/parts.json deleted file mode 100644 index 583ff6136..000000000 --- a/src/main/resources/assets/techreborn/blockstates/items/materials/parts.json +++ /dev/null @@ -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" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/ores.json b/src/main/resources/assets/techreborn/blockstates/ore.json similarity index 82% rename from src/main/resources/assets/techreborn/blockstates/ores.json rename to src/main/resources/assets/techreborn/blockstates/ore.json index b0f341823..7d606fddf 100644 --- a/src/main/resources/assets/techreborn/blockstates/ores.json +++ b/src/main/resources/assets/techreborn/blockstates/ore.json @@ -10,102 +10,102 @@ {} ], "type": { - "oregalena": { + "galena": { "textures": { "all": "techreborn:blocks/ore/galena_ore" } }, - "oreiridium": { + "iridium": { "textures": { "all": "techreborn:blocks/ore/iridium_ore" } }, - "oreruby": { + "ruby": { "textures": { "all": "techreborn:blocks/ore/ruby_ore" } }, - "oresapphire": { + "sapphire": { "textures": { "all": "techreborn:blocks/ore/sapphire_ore" } }, - "orebauxite": { + "bauxite": { "textures": { "all": "techreborn:blocks/ore/bauxite_ore" } }, - "orepyrite": { + "pyrite": { "textures": { "all": "techreborn:blocks/ore/pyrite_ore" } }, - "orecinnabar": { + "cinnabar": { "textures": { "all": "techreborn:blocks/ore/cinnabar_ore" } }, - "oresphalerite": { + "sphalerite": { "textures": { "all": "techreborn:blocks/ore/sphalerite_ore" } }, - "oretungsten": { + "tungsten": { "textures": { "all": "techreborn:blocks/ore/tungsten_ore" } }, - "oretungstenstone": { + "tungsten_stone": { "textures": { "all": "techreborn:blocks/ore/tungsten_ore_stone" } }, - "oresheldonite": { + "sheldonite": { "textures": { "all": "techreborn:blocks/ore/sheldonite_ore" } }, - "oresheldonitestone": { + "sheldonite_stone": { "textures": { "all": "techreborn:blocks/ore/sheldonite_ore_stone" } }, - "oreperidot": { + "peridot": { "textures": { "all": "techreborn:blocks/ore/peridot_ore" } }, - "oreperidotstone": { + "peridot_stone": { "textures": { "all": "techreborn:blocks/ore/peridot_ore_stone" } }, - "oresodalite": { + "sodalite": { "textures": { "all": "techreborn:blocks/ore/sodalite_ore" } }, - "oresodalitestone": { + "sodalite_stone": { "textures": { "all": "techreborn:blocks/ore/sodalite_ore_stone" } }, - "orelead": { + "lead": { "textures": { "all": "techreborn:blocks/ore/lead_ore" } }, - "oresilver": { + "silver": { "textures": { "all": "techreborn:blocks/ore/silver_ore" } }, - "orecopper": { + "copper": { "textures": { "all": "techreborn:blocks/ore/copper_ore" } }, - "oretin": { + "tin": { "textures": { "all": "techreborn:blocks/ore/tin_ore" } diff --git a/src/main/resources/assets/techreborn/blockstates/storage.json b/src/main/resources/assets/techreborn/blockstates/storage_block.json similarity index 80% rename from src/main/resources/assets/techreborn/blockstates/storage.json rename to src/main/resources/assets/techreborn/blockstates/storage_block.json index 7a84cfb83..563d02145 100644 --- a/src/main/resources/assets/techreborn/blockstates/storage.json +++ b/src/main/resources/assets/techreborn/blockstates/storage_block.json @@ -14,137 +14,137 @@ } ], "type": { - "blockaluminum": { + "aluminum": { "textures": { "all": "techreborn:blocks/storage/aluminum_block" } }, - "blockbrass": { + "brass": { "textures": { "all": "techreborn:blocks/storage/brass_block" } }, - "blockbronze": { + "bronze": { "textures": { "all": "techreborn:blocks/storage/bronze_block" } }, - "blockchrome": { + "chrome": { "textures": { "all": "techreborn:blocks/storage/chrome_block" } }, - "blockcopper": { + "copper": { "textures": { "all": "techreborn:blocks/storage/copper_block" } }, - "blockelectrum": { + "electrum": { "textures": { "all": "techreborn:blocks/storage/electrum_block" } }, - "blockinvar": { + "invar": { "textures": { "all": "techreborn:blocks/storage/invar_block" } }, - "blockiridium": { + "iridium": { "textures": { "all": "techreborn:blocks/storage/iridium_block" } }, - "blockiridiumreinforcedstone": { + "iridium_reinforced_stone": { "textures": { "all": "techreborn:blocks/storage/iridium_reinforced_stone_block" } }, - "blockiridiumreinforcedtungstensteel": { + "iridium_reinforced_tungstensteel": { "textures": { "all": "techreborn:blocks/storage/iridium_reinforced_tungstensteel_block" } }, - "blocklead": { + "lead": { "textures": { "all": "techreborn:blocks/storage/lead_block" } }, - "blocknickel": { + "nickel": { "textures": { "all": "techreborn:blocks/storage/nickel_block" } }, - "blockosmium": { + "osmium": { "textures": { "all": "techreborn:blocks/storage/osmium_block" } }, - "blockperidot": { + "peridot": { "textures": { "all": "techreborn:blocks/storage/peridot_block" } }, - "blockplatinum": { + "platinum": { "textures": { "all": "techreborn:blocks/storage/platinum_block" } }, - "blockredgarnet": { + "red_garnet": { "textures": { "all": "techreborn:blocks/storage/redgarnet_block" } }, - "blockrefinediron": { + "refined_iron": { "textures": { "all": "techreborn:blocks/storage/refinediron_block" } }, - "blockruby": { + "ruby": { "textures": { "all": "techreborn:blocks/storage/ruby_block" } }, - "blocksapphire": { + "sapphire": { "textures": { "all": "techreborn:blocks/storage/sapphire_block" } }, - "blocksilver": { + "silver": { "textures": { "all": "techreborn:blocks/storage/silver_block" } }, - "blocksteel": { + "steel": { "textures": { "all": "techreborn:blocks/storage/steel_block" } }, - "blocktin": { + "tin": { "textures": { "all": "techreborn:blocks/storage/tin_block" } }, - "blocktitanium": { + "titanium": { "textures": { "all": "techreborn:blocks/storage/titanium_block" } }, - "blocktungsten": { + "tungsten": { "textures": { "all": "techreborn:blocks/storage/tungsten_block" } }, - "blocktungstensteel": { + "tungstensteel": { "textures": { "all": "techreborn:blocks/storage/tungstensteel_block" } }, - "blockyellowgarnet": { + "yellow_garnet": { "textures": { "all": "techreborn:blocks/storage/yellowgarnet_block" } }, - "blockzinc": { + "zinc": { "textures": { "all": "techreborn:blocks/storage/zinc_block" } diff --git a/src/main/resources/assets/techreborn/textures/items/part/circuit_advanced.png b/src/main/resources/assets/techreborn/textures/items/part/advanced_circuit.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/part/circuit_advanced.png rename to src/main/resources/assets/techreborn/textures/items/part/advanced_circuit.png diff --git a/src/main/resources/assets/techreborn/textures/items/part/circuit_elite.png b/src/main/resources/assets/techreborn/textures/items/part/circuit_elite.png deleted file mode 100644 index 6d92a8c2651dd344578ea479976ab720583fa4bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 583 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>lWd_wSz3EqMic;8q5`d>ebpe%X5y#gWIQDKaR2f zV932?!4S0RY}gNtH+l0J*;d_sSYZ|a$h2HxMbG}7zm>P$HTWhuDei8$<l# lm4U(I%fCxeH00)|WTsW()-b8h`6N&SgQu&X%Q~loCIDw*9P diff --git a/src/main/resources/assets/techreborn/textures/items/part/data_storage_chip.png b/src/main/resources/assets/techreborn/textures/items/part/data_storage_chip.png new file mode 100644 index 0000000000000000000000000000000000000000..a209395a108905685550b889fc1552907912ab93 GIT binary patch literal 1371 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NSs56Z83KGlT!G@Ao}PYweu063iHV6NB_#qA#LSl1nQb+;+HD;DH@bDkqV`!! zI%Y5JnZL4c;p&M?)=gTve%A7J^Hy)1zh=|?HJj(J-@b7D)@7TvFWk6u@#fvjHtkrx zdFQfi`&Mk(wPxGyl{@#Y-*b4~zjb?$pE-2)(#b0~FWtC(`R1MLcOTri_welh^EV$n zzWwOw{bwK-j)Kt;pmPW~vw52X^9e&qkYDiskqsDvzq6|XgP*g&BeIx*fm;ZK886+f z`vVkYFY)wsWq-gbCZKLD@amibP)MT0HKHUqKdq!Zu_%?HATcwqL@zJ3M8QPQP|q+~ zYmPTi%|cHX#}JL+*nUpFLka?}xtWnsqSv`rtmp_^wfFx=x3*nJ=X1{7;}d76{KK0m z)seyDA1gzoln;xg%=cp%cVCDrEEB$cA^KfffYOPciWSlMwv(55@Fic3{jlJgQI)`p zZQ^s2*G_L{W-J%2WuEl%uA+g|m83}yjBVA`dvp9s=E$g;^sW6<>ABi!nk)Mm)wHO` q^BlhX2|IrNsQR=+JmT{iY#4R;dw)nu^PB@Zmci52&t;ucLK6VBFvdgx literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/items/part/data_storage_circuit.png b/src/main/resources/assets/techreborn/textures/items/part/data_storage_circuit.png deleted file mode 100644 index fd67b9757fb412083e233c523b00b0c23c89afd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 436 zcmV;l0ZaagP)CCp!@8&L98)0YOPb zK~y-)-IBdaLSYn#AFp5Bgb0-yf`$khEcz3g3d*&?hG=mSyn|q2xkfn%Mc5WWgh7J@ zHAS_z)DS_@;2;QMX?_fO?Y-~Yo)>Jb-}rEN;GFY=KOcu3JiEG8mgT^*EE@G1QYtjf zfw3Ctnb&@Tlgn#0G4ChmUSn(|h=0&WemKkMiifR(Bh^;`VBADGp1i;}pyPJCNqe$n zPWP~+_uMn?Oisd@)GJG>Pj;+Z*%2$GCGf+zP7YHFpEu=|4$LVxTgb*akQNqR?(&h`cMcU7wDhC0)~G eXWek{|MCrw$bP;#Yt}LV0000!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+0812aQ_Plzi}ft;M2s;a7* znwq-0x`u{^mX?-|j*gz5o`HdZv9Yn4nVF@frInSHwY9a4jg6h1oxQ!iwS%>TgM*`^ zqmz@9v$M0KyQ7PXi>s@vo12@vyStl*o2RFzmzS5fx3{maub-cvOMr`Kkf(R3w_mWI zZ=|n(jDJ8tKww~CaBy&FXlQtNcu+)8KvY0*RB%8{KzLMmRCH8iY-DsybVNi-e0+9b zQea48NJMf(Y(i{YQd~@GOnhd1LPA1HN=j;4YI=HlQg%{WW?Fh?dPa6eMs7w%UPfkS zNmf>AesO+9c~ebwTlC+Uw126Ee+z5=RyQ_uw>0;){A-)=Z_?C%(`Nmfz4ZUGRsUA6 z`@ep}|4lpo@7nW!-~NAx4*ov`44hFgyhC8>1dXo@42%pVL4LviM>b#x{?4unjBU;W zkH}&M25un`X1sK_?hjCqy~NYkmHiRBjF76#o#*#g0EHw4D}3?wdQyO!&Sl4#WBRf|Ln!%MNJGMtq(gIl3aPk1OyJ=tA4-td)&SM zx_Jp|r_Zp2o!r0Y^VvB^|2D+`GH-Zp**E>MMcc=pci#D1b}h=B?kzjxti`(Pvwe;| zzL;U~qU`qDD%bH!Zy+ZC=brZzqQ`|n}F-g|ld$4@`~Sh4^8_ka@#0o-NQ43o}0 z*PiO3A~Q`TaLST|3onlpZgn`B^|r)dO@zw?C&%U9Dh55v0zR7G9x3Lk$#qzU zk42GVZyfiAo0Cpvm