diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index 8797dea18..8096d367a 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -59,10 +59,6 @@ public class BlockMachineCasing extends BlockMultiblockBase { setCreativeTab(TechRebornCreativeTab.instance); setHardness(2F); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/structure")); -// this.setDefaultState(this.getDefaultState().withProperty(TYPE, "standard")); -// for (int i = 0; i < types.length; i++) { -// RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/structure").setInvVariant("type=" + types[i])); -// } BlockWrenchEventHandler.wrenableBlocks.add(this); } diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index f6f310596..5bfc5c9fa 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -6,7 +6,6 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; @@ -40,7 +39,6 @@ public class TRContent { 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(Upgrades.values()).forEach(value -> RebornRegistry.registerItem(value.item)); } @@ -101,7 +99,7 @@ public class TRContent { new ModelResourceLocation(upgradeRL, "type=" + value.name))); } - public static enum Ores implements IStringSerializable { + public static enum Ores { BAUXITE, CINNABAR, COPPER, GALENA, IRIDIUM, LEAD, PERIDOT, PYRITE, RUBY, SAPPHIRE, SHELDONITE, SILVER, SODALITE, SPHALERITE, TIN, TUNGSTEN; @@ -113,14 +111,9 @@ public class TRContent { block = new BlockOre(); InitUtils.setupIngredient(block, name, "ore"); } - - @Override - public String getName() { - return name; - } } - public static enum StorageBlocks implements IStringSerializable { + public static enum StorageBlocks { 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; @@ -133,14 +126,9 @@ public class TRContent { block = new BlockStorage(); InitUtils.setupIngredient(block, name, "storage_block"); } - - @Override - public String getName() { - return name; - } } - public static enum Dusts implements IStringSerializable { + public static enum Dusts { 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, GOLD, GRANITE, GROSSULAR, INVAR, IRON, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE, NETHERRACK, @@ -164,14 +152,9 @@ public class TRContent { public ItemStack getStack(int amount) { return new ItemStack(item, amount); } - - @Override - public String getName() { - return name; - } } - public static enum SmallDusts implements IStringSerializable { + public static enum SmallDusts { 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, @@ -196,14 +179,9 @@ public class TRContent { public ItemStack getStack(int amount) { return new ItemStack(item, amount); } - - @Override - public String getName() { - return name; - } } - public static enum Gems implements IStringSerializable { + public static enum Gems { PERIDOT, RED_GARNET, RUBY, SAPPHIRE, YELLOW_GARNET; public final String name; @@ -222,14 +200,9 @@ public class TRContent { public ItemStack getStack(int amount) { return new ItemStack(item, amount); } - - @Override - public String getName() { - return name; - } } - public static enum Ingots implements IStringSerializable { + public static enum Ingots { 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; @@ -249,14 +222,9 @@ public class TRContent { public ItemStack getStack(int amount) { return new ItemStack(item, amount); } - - @Override - public String getName() { - return name; - } } - public static enum Nuggets implements IStringSerializable { + public static enum Nuggets { ALUMINUM, BRASS, BRONZE, CHROME, COPPER, DIAMOND, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM, LEAD, NICKEL, PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC; @@ -276,14 +244,9 @@ public class TRContent { public ItemStack getStack(int amount) { return new ItemStack(item, amount); } - - @Override - public String getName() { - return name; - } } - public static enum Parts implements IStringSerializable { + public static enum Parts { CARBON_FIBER, CARBON_MESH, @@ -343,14 +306,9 @@ public class TRContent { public ItemStack getStack(int amount) { return new ItemStack(item, amount); } - - @Override - public String getName() { - return name; - } } - public static enum Plates implements IStringSerializable { + public static enum Plates { 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, @@ -372,11 +330,6 @@ public class TRContent { public ItemStack getStack(int amount) { return new ItemStack(item, amount); } - - @Override - public String getName() { - return name; - } } @ConfigRegistry(config = "items", category = "upgrades", key = "overclcoker_speed", comment = "Overclocker behavior speed multipiler") diff --git a/src/main/java/techreborn/init/TRItems.java b/src/main/java/techreborn/init/TRItems.java index 04736996e..573614b5a 100644 --- a/src/main/java/techreborn/init/TRItems.java +++ b/src/main/java/techreborn/init/TRItems.java @@ -77,28 +77,28 @@ public class TRItems { public static Item RED_CELL_BATTERY; // Tools - public static Item INDUSTRIAL_CHAINSAW; - public static Item INDUSTRIAL_DRILL; - public static Item INDUSTRIAL_JACKHAMMER; - public static Item DEBUG_TOOL; public static Item ADVANCED_CHAINSAW; public static Item ADVANCED_DRILL; public static Item ADVANCED_JACKHAMMER; - public static Item ELECTRIC_TREE_TAP; - public static Item NANOSABER; - public static Item OMNI_TOOL; - public static Item ROCK_CUTTER; public static Item BASIC_CHAINSAW; public static Item BASIC_DRILL; public static Item BASIC_JACKHAMMER; + public static Item DEBUG_TOOL; + public static Item ELECTRIC_TREE_TAP; + public static Item INDUSTRIAL_CHAINSAW; + public static Item INDUSTRIAL_DRILL; + public static Item INDUSTRIAL_JACKHAMMER; + public static Item NANOSABER; + public static Item OMNI_TOOL; + public static Item ROCK_CUTTER; public static Item TREE_TAP; public static Item WRENCH; // Other public static DynamicCell CELL; public static Item FREQUENCY_TRANSMITTER; - public static Item SCRAP_BOX; public static Item MANUAL; + public static Item SCRAP_BOX; // Gem armor & tools @Nullable @@ -179,44 +179,42 @@ public class TRItems { TRContent.registerItems(); // Battery - registerItem(RED_CELL_BATTERY = InitUtils.setup(new ItemRedCellBattery(), "red_cell_battery")); - registerItem(LITHIUM_ION_BATTERY = InitUtils.setup(new ItemLithiumIonBattery(), "lithium_ion_battery")); - registerItem(LITHIUM_ION_BATPACK = InitUtils.setup(new ItemLithiumIonBatpack(), "lithium_ion_batpack")); registerItem(ENERGY_CRYSTAL = InitUtils.setup(new ItemEnergyCrystal(), "energy_crystal")); - registerItem(LAPOTRON_CRYSTAL = InitUtils.setup(new ItemLapotronCrystal(), "lapotron_crytal")); + registerItem(LAPOTRON_CRYSTAL = InitUtils.setup(new ItemLapotronCrystal(), "lapotron_crystal")); registerItem(LAPOTRONIC_ORB = InitUtils.setup(new ItemLapotronicOrb(), "lapotronic_orb")); - registerItem(LAPOTRONIC_ORBPACK = InitUtils.setup(new ItemLapotronicOrbpack(), "lapotronic_orbpack")); + registerItem(LITHIUM_ION_BATTERY = InitUtils.setup(new ItemLithiumIonBattery(), "lithium_ion_battery")); + registerItem(RED_CELL_BATTERY = InitUtils.setup(new ItemRedCellBattery(), "red_cell_battery")); // Tools - registerItem(DEBUG_TOOL = InitUtils.setup(new ItemDebugTool(), "debug_tool")); - - registerItem(BASIC_DRILL = InitUtils.setup(new ItemBasicDrill(), "basic_drill")); - registerItem(BASIC_CHAINSAW = InitUtils.setup(new ItemBasicChainsaw(), "basic_chainsaw")); - registerItem(BASIC_JACKHAMMER = InitUtils.setup(new ItemBasicJackhammer(), "basic_jackhammer")); registerItem(ADVANCED_DRILL = InitUtils.setup(new ItemAdvancedDrill(), "advanced_drill")); registerItem(ADVANCED_CHAINSAW = InitUtils.setup(new ItemAdvancedChainsaw(), "advanced_chainsaw")); registerItem(ADVANCED_JACKHAMMER = InitUtils.setup(new ItemAdvancedJackhammer(), "advanced_jackhammer")); + registerItem(BASIC_DRILL = InitUtils.setup(new ItemBasicDrill(), "basic_drill")); + registerItem(BASIC_CHAINSAW = InitUtils.setup(new ItemBasicChainsaw(), "basic_chainsaw")); + registerItem(BASIC_JACKHAMMER = InitUtils.setup(new ItemBasicJackhammer(), "basic_jackhammer")); + registerItem(DEBUG_TOOL = InitUtils.setup(new ItemDebugTool(), "debug_tool")); + registerItem(ELECTRIC_TREE_TAP = InitUtils.setup(new ItemElectricTreetap(), "electric_treetap")); registerItem(INDUSTRIAL_DRILL = InitUtils.setup(new ItemIndustrialDrill(), "industrial_drill")); registerItem(INDUSTRIAL_CHAINSAW = InitUtils.setup(new ItemIndustrialChainsaw(), "industrial_chainsaw")); registerItem(INDUSTRIAL_JACKHAMMER = InitUtils.setup(new ItemIndustrialJackhammer(), "industrial_jackhammer")); - - registerItem(ROCK_CUTTER = InitUtils.setup(new ItemRockCutter(), "rock_cutter")); registerItem(NANOSABER = InitUtils.setup(new ItemNanosaber(), "nanosaber")); registerItem(OMNI_TOOL = InitUtils.setup(new ItemOmniTool(), "omni_tool")); - registerItem(ELECTRIC_TREE_TAP = InitUtils.setup(new ItemElectricTreetap(), "electric_treetap")); - + registerItem(ROCK_CUTTER = InitUtils.setup(new ItemRockCutter(), "rock_cutter")); registerItem(TREE_TAP = InitUtils.setup(new ItemTreeTap(), "treetap")); registerItem(WRENCH = InitUtils.setup(new ItemWrench(), "wrench")); // Armor registerItem(CLOAKING_DEVICE = InitUtils.setup(new ItemCloakingDevice(), "cloaking_device")); + registerItem(LAPOTRONIC_ORBPACK = InitUtils.setup(new ItemLapotronicOrbpack(), "lapotronic_orbpack")); + registerItem(LITHIUM_ION_BATPACK = InitUtils.setup(new ItemLithiumIonBatpack(), "lithium_ion_batpack")); // Other registerItem(CELL = InitUtils.setup(new DynamicCell(), "cell")); MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE); registerItem(FREQUENCY_TRANSMITTER = InitUtils.setup(new ItemFrequencyTransmitter(), "frequency_transmitter")); - registerItem(SCRAP_BOX = InitUtils.setup(new ItemScrapBox(), "scrap_box")); registerItem(MANUAL = InitUtils.setup(new ItemManual(), "manual")); + registerItem(SCRAP_BOX = InitUtils.setup(new ItemScrapBox(), "scrap_box")); + // Gem armor & tools if (ConfigTechReborn.enableGemArmorAndTools) { diff --git a/src/main/java/techreborn/items/DynamicCell.java b/src/main/java/techreborn/items/DynamicCell.java index 43e3b3415..a749a8d34 100644 --- a/src/main/java/techreborn/items/DynamicCell.java +++ b/src/main/java/techreborn/items/DynamicCell.java @@ -49,7 +49,6 @@ import org.apache.commons.lang3.Validate; import reborncore.common.util.StringUtils; import techreborn.events.TRRecipeHandler; import techreborn.init.TRItems; -import techreborn.utils.InitUtils; /** * Created by modmuss50 on 17/05/2016. diff --git a/src/main/java/techreborn/items/ItemDestructopack.java b/src/main/java/techreborn/items/ItemDestructopack.java index b65cc98f9..a5d2672f1 100644 --- a/src/main/java/techreborn/items/ItemDestructopack.java +++ b/src/main/java/techreborn/items/ItemDestructopack.java @@ -33,7 +33,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.world.World; import techreborn.TechReborn; import techreborn.client.EGui; -import techreborn.utils.InitUtils; public class ItemDestructopack extends Item { diff --git a/src/main/java/techreborn/items/ItemManual.java b/src/main/java/techreborn/items/ItemManual.java index a149fba9a..3ee2a6cb3 100644 --- a/src/main/java/techreborn/items/ItemManual.java +++ b/src/main/java/techreborn/items/ItemManual.java @@ -33,7 +33,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.world.World; import techreborn.TechReborn; import techreborn.client.EGui; -import techreborn.utils.InitUtils; public class ItemManual extends Item { diff --git a/src/main/java/techreborn/items/ItemScrapBox.java b/src/main/java/techreborn/items/ItemScrapBox.java index 67493cfa3..80e5774df 100644 --- a/src/main/java/techreborn/items/ItemScrapBox.java +++ b/src/main/java/techreborn/items/ItemScrapBox.java @@ -35,8 +35,6 @@ import reborncore.api.recipe.IBaseRecipeType; import reborncore.api.recipe.RecipeHandler; import reborncore.common.util.WorldUtils; import techreborn.api.Reference; -import techreborn.utils.InitUtils; - import java.util.List; public class ItemScrapBox extends Item { diff --git a/src/main/resources/assets/techreborn/advancements/root.json b/src/main/resources/assets/techreborn/advancements/root.json index b289cc641..55c21b24e 100644 --- a/src/main/resources/assets/techreborn/advancements/root.json +++ b/src/main/resources/assets/techreborn/advancements/root.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "techreborn:orecopper" + "item": "techreborn:copper_ore" }, "title": { "translate": "itemGroup.techreborn" @@ -19,7 +19,7 @@ "conditions": { "items": [ { - "item": "techreborn:orecopper" + "item": "techreborn:copper_ore" } ] } @@ -29,7 +29,7 @@ "conditions": { "items": [ { - "item": "techreborn:orelead" + "item": "techreborn:lead_ore" } ] } diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json b/src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json index bd793af09..c22541d21 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/abandoned_mineshaft.json @@ -6,7 +6,7 @@ "entries": [ { "type": "item", - "name": "techreborn:ingotbronze", + "name": "techreborn:bronze_ingot", "entryName": "bronze_ingot", "weight": 5, "functions": [ @@ -21,7 +21,7 @@ }, { "type": "item", - "name": "techreborn:ingotcopper", + "name": "techreborn:copper_ingot", "entryName": "copper_ingot", "weight": 5, "functions": [ @@ -36,7 +36,7 @@ }, { "type": "item", - "name": "techreborn:ingotlead", + "name": "techreborn:lead_ingot", "entryName": "lead_ingot", "weight": 5, "functions": [ @@ -51,7 +51,7 @@ }, { "type": "item", - "name": "techreborn:ingotsilver", + "name": "techreborn:silver_ingot", "entryName": "silver_ingot", "weight": 5, "functions": [ @@ -66,7 +66,7 @@ }, { "type": "item", - "name": "techreborn:ingottin", + "name": "techreborn:tin_ingot", "entryName": "tin_ingot", "weight": 5, "functions": [ @@ -81,7 +81,7 @@ }, { "type": "item", - "name": "techreborn:ingotrefinediron", + "name": "techreborn:refined_iron_ingot", "entryName": "refined_iron_ingot", "weight": 5, "functions": [ @@ -96,7 +96,7 @@ }, { "type": "item", - "name": "techreborn:ingotadvancedalloy", + "name": "techreborn:advanced_alloy_ingot", "entryName": "advanced_alloy_ingot", "weight": 5, "functions": [ @@ -108,22 +108,7 @@ } } ] - }, - { - "type": "item", - "name": "techreborn:ingotmixedmetal", - "entryName": "mixed_metal_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, + }, { "type": "item", "name": "techreborn:machineblockbasic", @@ -132,7 +117,7 @@ }, { "type": "item", - "name": "techreborn:circuitBasic", + "name": "techreborn:electronic_circuit", "entryName": "basic_circuit", "weight": 5 }, diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json b/src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json index bd793af09..c22541d21 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/desert_pyramid.json @@ -6,7 +6,7 @@ "entries": [ { "type": "item", - "name": "techreborn:ingotbronze", + "name": "techreborn:bronze_ingot", "entryName": "bronze_ingot", "weight": 5, "functions": [ @@ -21,7 +21,7 @@ }, { "type": "item", - "name": "techreborn:ingotcopper", + "name": "techreborn:copper_ingot", "entryName": "copper_ingot", "weight": 5, "functions": [ @@ -36,7 +36,7 @@ }, { "type": "item", - "name": "techreborn:ingotlead", + "name": "techreborn:lead_ingot", "entryName": "lead_ingot", "weight": 5, "functions": [ @@ -51,7 +51,7 @@ }, { "type": "item", - "name": "techreborn:ingotsilver", + "name": "techreborn:silver_ingot", "entryName": "silver_ingot", "weight": 5, "functions": [ @@ -66,7 +66,7 @@ }, { "type": "item", - "name": "techreborn:ingottin", + "name": "techreborn:tin_ingot", "entryName": "tin_ingot", "weight": 5, "functions": [ @@ -81,7 +81,7 @@ }, { "type": "item", - "name": "techreborn:ingotrefinediron", + "name": "techreborn:refined_iron_ingot", "entryName": "refined_iron_ingot", "weight": 5, "functions": [ @@ -96,7 +96,7 @@ }, { "type": "item", - "name": "techreborn:ingotadvancedalloy", + "name": "techreborn:advanced_alloy_ingot", "entryName": "advanced_alloy_ingot", "weight": 5, "functions": [ @@ -108,22 +108,7 @@ } } ] - }, - { - "type": "item", - "name": "techreborn:ingotmixedmetal", - "entryName": "mixed_metal_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, + }, { "type": "item", "name": "techreborn:machineblockbasic", @@ -132,7 +117,7 @@ }, { "type": "item", - "name": "techreborn:circuitBasic", + "name": "techreborn:electronic_circuit", "entryName": "basic_circuit", "weight": 5 }, diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/end_city_treasure.json b/src/main/resources/assets/techreborn/loot_tables/chests/end_city_treasure.json index fce0173d7..857153cdb 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/end_city_treasure.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/end_city_treasure.json @@ -9,7 +9,7 @@ "entries": [ { "type": "item", - "name": "techreborn:ingotchrome", + "name": "techreborn:chrome_ingot", "entryName": "chrome_ingot", "weight": 10, "functions": [ @@ -24,7 +24,7 @@ }, { "type": "item", - "name": "techreborn:ingotiridium", + "name": "techreborn:iridium_ingot", "entryName": "iridium_ingot", "weight": 10, "functions": [ @@ -39,7 +39,7 @@ }, { "type": "item", - "name": "techreborn:ingotplatinum", + "name": "techreborn:platinum_ingot", "entryName": "platinum_ingot", "weight": 10, "functions": [ @@ -54,7 +54,7 @@ }, { "type": "item", - "name": "techreborn:ingottitanium", + "name": "techreborn:titanium_ingot", "entryName": "titanium_ingot", "weight": 10, "functions": [ @@ -69,7 +69,7 @@ }, { "type": "item", - "name": "techreborn:ingottungsten", + "name": "techreborn:tungsten_ingot", "entryName": "tungsten_ingot", "weight": 10, "functions": [ @@ -84,7 +84,7 @@ }, { "type": "item", - "name": "techreborn:ingottungstensteel", + "name": "techreborn:tungstensteel_ingot", "entryName": "tungstensteel_ingot", "weight": 10, "functions": [ @@ -105,10 +105,16 @@ }, { "type": "item", - "name": "techreborn:energyflowcircuit", - "entryName": "energy_flow_circuit", + "name": "techreborn:industrial_circuit", + "entryName": "tier3_electronic_circuit", "weight": 30 }, + { + "type": "item", + "name": "techreborn:energy_flow_chip", + "entryName": "tier2_data_circuit", + "weight": 15 + }, { "type": "empty", "weight": 20 diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json b/src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json index bd793af09..c22541d21 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/igloo_chest.json @@ -6,7 +6,7 @@ "entries": [ { "type": "item", - "name": "techreborn:ingotbronze", + "name": "techreborn:bronze_ingot", "entryName": "bronze_ingot", "weight": 5, "functions": [ @@ -21,7 +21,7 @@ }, { "type": "item", - "name": "techreborn:ingotcopper", + "name": "techreborn:copper_ingot", "entryName": "copper_ingot", "weight": 5, "functions": [ @@ -36,7 +36,7 @@ }, { "type": "item", - "name": "techreborn:ingotlead", + "name": "techreborn:lead_ingot", "entryName": "lead_ingot", "weight": 5, "functions": [ @@ -51,7 +51,7 @@ }, { "type": "item", - "name": "techreborn:ingotsilver", + "name": "techreborn:silver_ingot", "entryName": "silver_ingot", "weight": 5, "functions": [ @@ -66,7 +66,7 @@ }, { "type": "item", - "name": "techreborn:ingottin", + "name": "techreborn:tin_ingot", "entryName": "tin_ingot", "weight": 5, "functions": [ @@ -81,7 +81,7 @@ }, { "type": "item", - "name": "techreborn:ingotrefinediron", + "name": "techreborn:refined_iron_ingot", "entryName": "refined_iron_ingot", "weight": 5, "functions": [ @@ -96,7 +96,7 @@ }, { "type": "item", - "name": "techreborn:ingotadvancedalloy", + "name": "techreborn:advanced_alloy_ingot", "entryName": "advanced_alloy_ingot", "weight": 5, "functions": [ @@ -108,22 +108,7 @@ } } ] - }, - { - "type": "item", - "name": "techreborn:ingotmixedmetal", - "entryName": "mixed_metal_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, + }, { "type": "item", "name": "techreborn:machineblockbasic", @@ -132,7 +117,7 @@ }, { "type": "item", - "name": "techreborn:circuitBasic", + "name": "techreborn:electronic_circuit", "entryName": "basic_circuit", "weight": 5 }, diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json b/src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json index bd793af09..c22541d21 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/jungle_temple.json @@ -6,7 +6,7 @@ "entries": [ { "type": "item", - "name": "techreborn:ingotbronze", + "name": "techreborn:bronze_ingot", "entryName": "bronze_ingot", "weight": 5, "functions": [ @@ -21,7 +21,7 @@ }, { "type": "item", - "name": "techreborn:ingotcopper", + "name": "techreborn:copper_ingot", "entryName": "copper_ingot", "weight": 5, "functions": [ @@ -36,7 +36,7 @@ }, { "type": "item", - "name": "techreborn:ingotlead", + "name": "techreborn:lead_ingot", "entryName": "lead_ingot", "weight": 5, "functions": [ @@ -51,7 +51,7 @@ }, { "type": "item", - "name": "techreborn:ingotsilver", + "name": "techreborn:silver_ingot", "entryName": "silver_ingot", "weight": 5, "functions": [ @@ -66,7 +66,7 @@ }, { "type": "item", - "name": "techreborn:ingottin", + "name": "techreborn:tin_ingot", "entryName": "tin_ingot", "weight": 5, "functions": [ @@ -81,7 +81,7 @@ }, { "type": "item", - "name": "techreborn:ingotrefinediron", + "name": "techreborn:refined_iron_ingot", "entryName": "refined_iron_ingot", "weight": 5, "functions": [ @@ -96,7 +96,7 @@ }, { "type": "item", - "name": "techreborn:ingotadvancedalloy", + "name": "techreborn:advanced_alloy_ingot", "entryName": "advanced_alloy_ingot", "weight": 5, "functions": [ @@ -108,22 +108,7 @@ } } ] - }, - { - "type": "item", - "name": "techreborn:ingotmixedmetal", - "entryName": "mixed_metal_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, + }, { "type": "item", "name": "techreborn:machineblockbasic", @@ -132,7 +117,7 @@ }, { "type": "item", - "name": "techreborn:circuitBasic", + "name": "techreborn:electronic_circuit", "entryName": "basic_circuit", "weight": 5 }, diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/nether_bridge.json b/src/main/resources/assets/techreborn/loot_tables/chests/nether_bridge.json index 025d25b4e..3c4afac8d 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/nether_bridge.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/nether_bridge.json @@ -9,7 +9,7 @@ "entries": [ { "type": "item", - "name": "techreborn:ingotaluminum", + "name": "techreborn:aluminum_ingot", "entryName": "aluminium_ingot", "weight": 10, "functions": [ @@ -24,7 +24,7 @@ }, { "type": "item", - "name": "techreborn:ingotbrass", + "name": "techreborn:brass_ingot", "entryName": "brass_ingot", "weight": 10, "functions": [ @@ -39,7 +39,7 @@ }, { "type": "item", - "name": "techreborn:ingotelectrum", + "name": "techreborn:electrum_ingot", "entryName": "electrum_ingot", "weight": 10, "functions": [ @@ -54,7 +54,7 @@ }, { "type": "item", - "name": "techreborn:ingotinvar", + "name": "techreborn:invar_ingot", "entryName": "invar_ingot", "weight": 10, "functions": [ @@ -69,7 +69,7 @@ }, { "type": "item", - "name": "techreborn:ingotnickel", + "name": "techreborn:nickel_ingot", "entryName": "nickel_ingot", "weight": 10, "functions": [ @@ -84,7 +84,7 @@ }, { "type": "item", - "name": "techreborn:ingotsteel", + "name": "techreborn:steel_ingot", "entryName": "steel_ingot", "weight": 10, "functions": [ @@ -99,7 +99,7 @@ }, { "type": "item", - "name": "techreborn:ingotzinc", + "name": "techreborn:zinc_ingot", "entryName": "zinc_ingot", "weight": 10, "functions": [ @@ -120,14 +120,14 @@ }, { "type": "item", - "name": "techreborn:circuitelite", - "entryName": "data_control_circuit", + "name": "techreborn:advanced_circuit", + "entryName": "tier2_electronic_circuit", "weight": 15 }, { "type": "item", - "name": "techreborn:datastoragecircuit", - "entryName": "data_storage_circuit", + "name": "techreborn:data_storage_chip", + "entryName": "tier1_data_circuit", "weight": 15 }, { diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json b/src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json index bd793af09..c22541d21 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/simple_dungeon.json @@ -6,7 +6,7 @@ "entries": [ { "type": "item", - "name": "techreborn:ingotbronze", + "name": "techreborn:bronze_ingot", "entryName": "bronze_ingot", "weight": 5, "functions": [ @@ -21,7 +21,7 @@ }, { "type": "item", - "name": "techreborn:ingotcopper", + "name": "techreborn:copper_ingot", "entryName": "copper_ingot", "weight": 5, "functions": [ @@ -36,7 +36,7 @@ }, { "type": "item", - "name": "techreborn:ingotlead", + "name": "techreborn:lead_ingot", "entryName": "lead_ingot", "weight": 5, "functions": [ @@ -51,7 +51,7 @@ }, { "type": "item", - "name": "techreborn:ingotsilver", + "name": "techreborn:silver_ingot", "entryName": "silver_ingot", "weight": 5, "functions": [ @@ -66,7 +66,7 @@ }, { "type": "item", - "name": "techreborn:ingottin", + "name": "techreborn:tin_ingot", "entryName": "tin_ingot", "weight": 5, "functions": [ @@ -81,7 +81,7 @@ }, { "type": "item", - "name": "techreborn:ingotrefinediron", + "name": "techreborn:refined_iron_ingot", "entryName": "refined_iron_ingot", "weight": 5, "functions": [ @@ -96,7 +96,7 @@ }, { "type": "item", - "name": "techreborn:ingotadvancedalloy", + "name": "techreborn:advanced_alloy_ingot", "entryName": "advanced_alloy_ingot", "weight": 5, "functions": [ @@ -108,22 +108,7 @@ } } ] - }, - { - "type": "item", - "name": "techreborn:ingotmixedmetal", - "entryName": "mixed_metal_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, + }, { "type": "item", "name": "techreborn:machineblockbasic", @@ -132,7 +117,7 @@ }, { "type": "item", - "name": "techreborn:circuitBasic", + "name": "techreborn:electronic_circuit", "entryName": "basic_circuit", "weight": 5 }, diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_corridor.json b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_corridor.json index 025d25b4e..3c4afac8d 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_corridor.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_corridor.json @@ -9,7 +9,7 @@ "entries": [ { "type": "item", - "name": "techreborn:ingotaluminum", + "name": "techreborn:aluminum_ingot", "entryName": "aluminium_ingot", "weight": 10, "functions": [ @@ -24,7 +24,7 @@ }, { "type": "item", - "name": "techreborn:ingotbrass", + "name": "techreborn:brass_ingot", "entryName": "brass_ingot", "weight": 10, "functions": [ @@ -39,7 +39,7 @@ }, { "type": "item", - "name": "techreborn:ingotelectrum", + "name": "techreborn:electrum_ingot", "entryName": "electrum_ingot", "weight": 10, "functions": [ @@ -54,7 +54,7 @@ }, { "type": "item", - "name": "techreborn:ingotinvar", + "name": "techreborn:invar_ingot", "entryName": "invar_ingot", "weight": 10, "functions": [ @@ -69,7 +69,7 @@ }, { "type": "item", - "name": "techreborn:ingotnickel", + "name": "techreborn:nickel_ingot", "entryName": "nickel_ingot", "weight": 10, "functions": [ @@ -84,7 +84,7 @@ }, { "type": "item", - "name": "techreborn:ingotsteel", + "name": "techreborn:steel_ingot", "entryName": "steel_ingot", "weight": 10, "functions": [ @@ -99,7 +99,7 @@ }, { "type": "item", - "name": "techreborn:ingotzinc", + "name": "techreborn:zinc_ingot", "entryName": "zinc_ingot", "weight": 10, "functions": [ @@ -120,14 +120,14 @@ }, { "type": "item", - "name": "techreborn:circuitelite", - "entryName": "data_control_circuit", + "name": "techreborn:advanced_circuit", + "entryName": "tier2_electronic_circuit", "weight": 15 }, { "type": "item", - "name": "techreborn:datastoragecircuit", - "entryName": "data_storage_circuit", + "name": "techreborn:data_storage_chip", + "entryName": "tier1_data_circuit", "weight": 15 }, { diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_crossing.json b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_crossing.json index 025d25b4e..3c4afac8d 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_crossing.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_crossing.json @@ -9,7 +9,7 @@ "entries": [ { "type": "item", - "name": "techreborn:ingotaluminum", + "name": "techreborn:aluminum_ingot", "entryName": "aluminium_ingot", "weight": 10, "functions": [ @@ -24,7 +24,7 @@ }, { "type": "item", - "name": "techreborn:ingotbrass", + "name": "techreborn:brass_ingot", "entryName": "brass_ingot", "weight": 10, "functions": [ @@ -39,7 +39,7 @@ }, { "type": "item", - "name": "techreborn:ingotelectrum", + "name": "techreborn:electrum_ingot", "entryName": "electrum_ingot", "weight": 10, "functions": [ @@ -54,7 +54,7 @@ }, { "type": "item", - "name": "techreborn:ingotinvar", + "name": "techreborn:invar_ingot", "entryName": "invar_ingot", "weight": 10, "functions": [ @@ -69,7 +69,7 @@ }, { "type": "item", - "name": "techreborn:ingotnickel", + "name": "techreborn:nickel_ingot", "entryName": "nickel_ingot", "weight": 10, "functions": [ @@ -84,7 +84,7 @@ }, { "type": "item", - "name": "techreborn:ingotsteel", + "name": "techreborn:steel_ingot", "entryName": "steel_ingot", "weight": 10, "functions": [ @@ -99,7 +99,7 @@ }, { "type": "item", - "name": "techreborn:ingotzinc", + "name": "techreborn:zinc_ingot", "entryName": "zinc_ingot", "weight": 10, "functions": [ @@ -120,14 +120,14 @@ }, { "type": "item", - "name": "techreborn:circuitelite", - "entryName": "data_control_circuit", + "name": "techreborn:advanced_circuit", + "entryName": "tier2_electronic_circuit", "weight": 15 }, { "type": "item", - "name": "techreborn:datastoragecircuit", - "entryName": "data_storage_circuit", + "name": "techreborn:data_storage_chip", + "entryName": "tier1_data_circuit", "weight": 15 }, { diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_library.json b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_library.json index 025d25b4e..3c4afac8d 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_library.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/stronghold_library.json @@ -9,7 +9,7 @@ "entries": [ { "type": "item", - "name": "techreborn:ingotaluminum", + "name": "techreborn:aluminum_ingot", "entryName": "aluminium_ingot", "weight": 10, "functions": [ @@ -24,7 +24,7 @@ }, { "type": "item", - "name": "techreborn:ingotbrass", + "name": "techreborn:brass_ingot", "entryName": "brass_ingot", "weight": 10, "functions": [ @@ -39,7 +39,7 @@ }, { "type": "item", - "name": "techreborn:ingotelectrum", + "name": "techreborn:electrum_ingot", "entryName": "electrum_ingot", "weight": 10, "functions": [ @@ -54,7 +54,7 @@ }, { "type": "item", - "name": "techreborn:ingotinvar", + "name": "techreborn:invar_ingot", "entryName": "invar_ingot", "weight": 10, "functions": [ @@ -69,7 +69,7 @@ }, { "type": "item", - "name": "techreborn:ingotnickel", + "name": "techreborn:nickel_ingot", "entryName": "nickel_ingot", "weight": 10, "functions": [ @@ -84,7 +84,7 @@ }, { "type": "item", - "name": "techreborn:ingotsteel", + "name": "techreborn:steel_ingot", "entryName": "steel_ingot", "weight": 10, "functions": [ @@ -99,7 +99,7 @@ }, { "type": "item", - "name": "techreborn:ingotzinc", + "name": "techreborn:zinc_ingot", "entryName": "zinc_ingot", "weight": 10, "functions": [ @@ -120,14 +120,14 @@ }, { "type": "item", - "name": "techreborn:circuitelite", - "entryName": "data_control_circuit", + "name": "techreborn:advanced_circuit", + "entryName": "tier2_electronic_circuit", "weight": 15 }, { "type": "item", - "name": "techreborn:datastoragecircuit", - "entryName": "data_storage_circuit", + "name": "techreborn:data_storage_chip", + "entryName": "tier1_data_circuit", "weight": 15 }, { diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json b/src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json index bd793af09..c22541d21 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/village_blacksmith.json @@ -6,7 +6,7 @@ "entries": [ { "type": "item", - "name": "techreborn:ingotbronze", + "name": "techreborn:bronze_ingot", "entryName": "bronze_ingot", "weight": 5, "functions": [ @@ -21,7 +21,7 @@ }, { "type": "item", - "name": "techreborn:ingotcopper", + "name": "techreborn:copper_ingot", "entryName": "copper_ingot", "weight": 5, "functions": [ @@ -36,7 +36,7 @@ }, { "type": "item", - "name": "techreborn:ingotlead", + "name": "techreborn:lead_ingot", "entryName": "lead_ingot", "weight": 5, "functions": [ @@ -51,7 +51,7 @@ }, { "type": "item", - "name": "techreborn:ingotsilver", + "name": "techreborn:silver_ingot", "entryName": "silver_ingot", "weight": 5, "functions": [ @@ -66,7 +66,7 @@ }, { "type": "item", - "name": "techreborn:ingottin", + "name": "techreborn:tin_ingot", "entryName": "tin_ingot", "weight": 5, "functions": [ @@ -81,7 +81,7 @@ }, { "type": "item", - "name": "techreborn:ingotrefinediron", + "name": "techreborn:refined_iron_ingot", "entryName": "refined_iron_ingot", "weight": 5, "functions": [ @@ -96,7 +96,7 @@ }, { "type": "item", - "name": "techreborn:ingotadvancedalloy", + "name": "techreborn:advanced_alloy_ingot", "entryName": "advanced_alloy_ingot", "weight": 5, "functions": [ @@ -108,22 +108,7 @@ } } ] - }, - { - "type": "item", - "name": "techreborn:ingotmixedmetal", - "entryName": "mixed_metal_ingot", - "weight": 5, - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ] - }, + }, { "type": "item", "name": "techreborn:machineblockbasic", @@ -132,7 +117,7 @@ }, { "type": "item", - "name": "techreborn:circuitBasic", + "name": "techreborn:electronic_circuit", "entryName": "basic_circuit", "weight": 5 }, diff --git a/src/main/resources/assets/techreborn/loot_tables/chests/woodland_mansion.json b/src/main/resources/assets/techreborn/loot_tables/chests/woodland_mansion.json index f7fe2b76d..857153cdb 100644 --- a/src/main/resources/assets/techreborn/loot_tables/chests/woodland_mansion.json +++ b/src/main/resources/assets/techreborn/loot_tables/chests/woodland_mansion.json @@ -9,7 +9,7 @@ "entries": [ { "type": "item", - "name": "techreborn:ingotchrome", + "name": "techreborn:chrome_ingot", "entryName": "chrome_ingot", "weight": 10, "functions": [ @@ -24,7 +24,7 @@ }, { "type": "item", - "name": "techreborn:ingotiridium", + "name": "techreborn:iridium_ingot", "entryName": "iridium_ingot", "weight": 10, "functions": [ @@ -39,7 +39,7 @@ }, { "type": "item", - "name": "techreborn:ingotplatinum", + "name": "techreborn:platinum_ingot", "entryName": "platinum_ingot", "weight": 10, "functions": [ @@ -54,7 +54,7 @@ }, { "type": "item", - "name": "techreborn:ingottitanium", + "name": "techreborn:titanium_ingot", "entryName": "titanium_ingot", "weight": 10, "functions": [ @@ -69,7 +69,7 @@ }, { "type": "item", - "name": "techreborn:ingottungsten", + "name": "techreborn:tungsten_ingot", "entryName": "tungsten_ingot", "weight": 10, "functions": [ @@ -84,7 +84,7 @@ }, { "type": "item", - "name": "techreborn:ingottungstensteel", + "name": "techreborn:tungstensteel_ingot", "entryName": "tungstensteel_ingot", "weight": 10, "functions": [ @@ -100,15 +100,21 @@ { "type": "item", "name": "techreborn:machineblockelite", - "entryName": "advanced_frame", + "entryName": "highly_advanced_frame", "weight": 30 }, { "type": "item", - "name": "techreborn:energyflowcircuit", - "entryName": "energy_flow_circuit", + "name": "techreborn:industrial_circuit", + "entryName": "tier3_electronic_circuit", "weight": 30 }, + { + "type": "item", + "name": "techreborn:energy_flow_chip", + "entryName": "tier2_data_circuit", + "weight": 15 + }, { "type": "empty", "weight": 20 diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/steel_chainsaw_animated.json b/src/main/resources/assets/techreborn/models/item/tool/override/basic_chainsaw_animated.json similarity index 50% rename from src/main/resources/assets/techreborn/models/item/tool/override/steel_chainsaw_animated.json rename to src/main/resources/assets/techreborn/models/item/tool/override/basic_chainsaw_animated.json index 32c295415..32d5cbf5b 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/override/steel_chainsaw_animated.json +++ b/src/main/resources/assets/techreborn/models/item/tool/override/basic_chainsaw_animated.json @@ -1,6 +1,6 @@ { "parent": "techreborn:item/tool/tool", "textures": { - "layer0": "techreborn:items/tool/steel_chainsaw_animated" + "layer0": "techreborn:items/tool/basic_chainsaw_animated" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/diamond_chainsaw_animated.json b/src/main/resources/assets/techreborn/models/item/tool/override/diamond_chainsaw_animated.json deleted file mode 100644 index 09326dc4b..000000000 --- a/src/main/resources/assets/techreborn/models/item/tool/override/diamond_chainsaw_animated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/diamond_chainsaw_animated" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/industrial_chainsaw_animated.json b/src/main/resources/assets/techreborn/models/item/tool/override/industrial_chainsaw_animated.json new file mode 100644 index 000000000..6401ae259 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/override/industrial_chainsaw_animated.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/tool/tool", + "textures": { + "layer0": "techreborn:items/tool/industrial_chainsaw_animated" + } +} \ No newline at end of file