From 7d2a42d466136abf2405ce25462d28c96de701d5 Mon Sep 17 00:00:00 2001 From: Me <135455255+IcarussOne@users.noreply.github.com> Date: Fri, 22 Nov 2024 07:15:16 -0600 Subject: [PATCH] Add IC2 Experimental Bronze compat --- README.md | 3 +- build.gradle | 8 +- .../mod/emt/balkonsexpansion/BEConfig.java | 18 ++--- .../balkonsexpansion/BalkonsExpansion.java | 2 +- .../compat/CompatHandler.java | 28 ++++++- .../ic2classic/IC2ClassicRegistration.java | 6 +- .../IC2ExperimentalMaterialColors.java | 44 ++++++++++ .../IC2ExperimentalRegistration.java | 80 +++++++++++++++++++ .../assets/balkonsexpansion/lang/en_us.lang | 13 ++- .../item/battleaxe.bronze.ic2e.block.json | 6 ++ .../models/item/battleaxe.bronze.ic2e.json | 14 ++++ .../models/item/boomerang.bronze.ic2e.json | 14 ++++ .../item/boomerang.bronze.ic2e_ready.json | 6 ++ .../models/item/flail.bronze.ic2e-thrown.json | 6 ++ .../models/item/flail.bronze.ic2e.json | 14 ++++ .../models/item/halberd.bronze.ic2e.json | 50 ++++++++++++ .../item/halberd.bronze.ic2e_state.json | 76 ++++++++++++++++++ .../models/item/katana.bronze.ic2e.block.json | 6 ++ .../models/item/katana.bronze.ic2e.json | 14 ++++ .../models/item/knife.bronze.ic2e.json | 6 ++ .../item/musketbayonet.bronze.ic2e.json | 50 ++++++++++++ .../musketbayonet.bronze.ic2e_reload.json | 42 ++++++++++ .../models/item/spear.bronze.ic2e.json | 42 ++++++++++ .../models/item/warhammer.bronze.ic2e.json | 6 ++ 24 files changed, 532 insertions(+), 22 deletions(-) create mode 100644 src/main/java/mod/emt/balkonsexpansion/compat/ic2experimental/IC2ExperimentalMaterialColors.java create mode 100644 src/main/java/mod/emt/balkonsexpansion/compat/ic2experimental/IC2ExperimentalRegistration.java create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/battleaxe.bronze.ic2e.block.json create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/battleaxe.bronze.ic2e.json create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/boomerang.bronze.ic2e.json create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/boomerang.bronze.ic2e_ready.json create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/flail.bronze.ic2e-thrown.json create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/flail.bronze.ic2e.json create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/halberd.bronze.ic2e.json create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/halberd.bronze.ic2e_state.json create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/katana.bronze.ic2e.block.json create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/katana.bronze.ic2e.json create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/knife.bronze.ic2e.json create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/musketbayonet.bronze.ic2e.json create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/musketbayonet.bronze.ic2e_reload.json create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/spear.bronze.ic2e.json create mode 100644 src/main/resources/assets/balkonsexpansion/models/item/warhammer.bronze.ic2e.json diff --git a/README.md b/README.md index 3ad41f1..beac028 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ ___ - Desh - Heavy Duty - Titanium -- **IC2 Classic:** +- **IndustrialCraft 2 (Classic and Experimental):** - Bronze - **Project Red Exploration:** - Peridot @@ -29,3 +29,4 @@ ___ - Steel - **Thaumcraft:** - Thaumium + - Void diff --git a/build.gradle b/build.gradle index 4c58353..6b503c8 100644 --- a/build.gradle +++ b/build.gradle @@ -106,13 +106,15 @@ dependencies { } // Balkon's WeaponMod Legacy - implementation rfg.deobf('curse.maven:balkons-weaponmod-legacy-1033985:5600030') + implementation rfg.deobf('curse.maven:balkons-weaponmod-legacy-1033985:5853367') // Galacticraft Legacy implementation rfg.deobf('curse.maven:galacticraft-legacy-564236:4671122') // IC2 Classic - implementation rfg.deobf('curse.maven:ic2-classic-242942:5554368') + implementation rfg.deobf('curse.maven:ic2-classic-242942:5800761') + // IC2 Experimental + implementation rfg.deobf('curse.maven:industrial-craft-242638:3838713') // Mo' Creatures Extended - implementation rfg.deobf('curse.maven:mo-creatures-extended-867351:5393397') + implementation rfg.deobf('curse.maven:mo-creatures-extended-867351:5654788') // Project Red compileOnly 'curse.maven:codechickenlib-242818:2779848' compileOnly 'curse.maven:mrtjpcore-229002:2735197' diff --git a/src/main/java/mod/emt/balkonsexpansion/BEConfig.java b/src/main/java/mod/emt/balkonsexpansion/BEConfig.java index 2c1c6ba..d640a5b 100644 --- a/src/main/java/mod/emt/balkonsexpansion/BEConfig.java +++ b/src/main/java/mod/emt/balkonsexpansion/BEConfig.java @@ -17,8 +17,8 @@ public class BEConfig { @Config.Comment("Galacticraft Legacy") public static GalacticraftSettings galacticraft_settings = new GalacticraftSettings(); - @Config.Comment("Industrial Craft 2 Classic") - public static IC2ClassicSettings ic2_classic_settings = new IC2ClassicSettings(); + @Config.Comment("IndustrialCraft 2") + public static IC2Settings ic2_settings = new IC2Settings(); @Config.Comment("Project Red Exploration") public static ProjectRedSettings project_red_settings = new ProjectRedSettings(); @@ -47,10 +47,10 @@ public static class ModIntegrationSettings { @Config.RequiresMcRestart public boolean GALACTICRAFT_INTEGRATION = true; - @Config.Name("Industrial Craft 2 Classic") - @Config.Comment("Enables Industrial Craft 2 Classic integration [default: true]") + @Config.Name("IndustrialCraft 2") + @Config.Comment("Enables IndustrialCraft 2 Classic and IndustrialCraft 2 Experimental integration [default: true]") @Config.RequiresMcRestart - public boolean IC2_CLASSIC_INTEGRATION = true; + public boolean IC2_INTEGRATION = true; @Config.Name("Project Red Exploration") @Config.Comment("Enables Project Red Exploration integration [default: true]") @@ -85,11 +85,11 @@ public static class GalacticraftSettings { public boolean GC_TITANIUM_MATERIAL = true; } - public static class IC2ClassicSettings { - @Config.Name("Material: Bronze (IC2 Classic)") - @Config.Comment("Enables support for the Bronze material from IC2 Classic [default: true]") + public static class IC2Settings { + @Config.Name("Material: Bronze (IC2 Classic and IC2 Experimental)") + @Config.Comment("Enables support for the Bronze material from IC2 Classic and IC2 Experimental [default: true]") @Config.RequiresWorldRestart - public boolean IC2C_BRONZE_MATERIAL = true; + public boolean IC2_BRONZE_MATERIAL = true; } public static class ProjectRedSettings { diff --git a/src/main/java/mod/emt/balkonsexpansion/BalkonsExpansion.java b/src/main/java/mod/emt/balkonsexpansion/BalkonsExpansion.java index 1a3cbff..c117794 100644 --- a/src/main/java/mod/emt/balkonsexpansion/BalkonsExpansion.java +++ b/src/main/java/mod/emt/balkonsexpansion/BalkonsExpansion.java @@ -15,7 +15,7 @@ public class BalkonsExpansion { public static final String NAME = "Balkon's Expansion"; public static final String VERSION = Tags.VERSION; public static final String ACCEPTED_VERSIONS = "[1.12.2]"; - public static final String DEPENDENCIES = "required-after:weaponmod@[1.22.1,);after:galacticraftcore;after:galacticraftplanets;after:ic2-classic-spmod;after:mocreatures@[12.4.3,);after:railcraft;" + public static final String DEPENDENCIES = "required-after:weaponmod@[1.22.1,);after:galacticraftcore;after:galacticraftplanets;after:ic2;after:mocreatures@[12.4.3,);after:railcraft;" + "after:projectred-exploration;after:thaumcraft@[1.12.2-6.1.BETA26,);"; public static final Logger LOGGER = LogManager.getLogger(NAME); diff --git a/src/main/java/mod/emt/balkonsexpansion/compat/CompatHandler.java b/src/main/java/mod/emt/balkonsexpansion/compat/CompatHandler.java index 2ef2e06..7586eaf 100644 --- a/src/main/java/mod/emt/balkonsexpansion/compat/CompatHandler.java +++ b/src/main/java/mod/emt/balkonsexpansion/compat/CompatHandler.java @@ -6,6 +6,8 @@ import mod.emt.balkonsexpansion.compat.galacticraft.GalacticraftRegistration; import mod.emt.balkonsexpansion.compat.ic2classic.IC2ClassicMaterialColors; import mod.emt.balkonsexpansion.compat.ic2classic.IC2ClassicRegistration; +import mod.emt.balkonsexpansion.compat.ic2experimental.IC2ExperimentalMaterialColors; +import mod.emt.balkonsexpansion.compat.ic2experimental.IC2ExperimentalRegistration; import mod.emt.balkonsexpansion.compat.projectred.ProjectRedMaterialColors; import mod.emt.balkonsexpansion.compat.projectred.ProjectRedRegistration; import mod.emt.balkonsexpansion.compat.railcraft.RailcraftMaterialColors; @@ -37,24 +39,37 @@ public static void registerItems(RegistryEvent.Register event) { if (Loader.isModLoaded("galacticraftcore") && (Loader.isModLoaded("galacticraftplanets") && BEConfig.mod_integration_settings.GALACTICRAFT_INTEGRATION)) { GalacticraftRegistration.registerItems(event); GalacticraftMaterialColors.registerMaterialColors(); + if (FMLLaunchHandler.side().isClient()) { GalacticraftRegistration.registerRenderersItem(); } } - // Industrial Craft 2 Classic - if (Loader.isModLoaded("ic2-classic-spmod") && BEConfig.mod_integration_settings.IC2_CLASSIC_INTEGRATION) { + // IndustrialCraft 2 Classic + if (Loader.isModLoaded("ic2-classic-spmod") && BEConfig.mod_integration_settings.IC2_INTEGRATION) { IC2ClassicRegistration.registerItems(event); IC2ClassicMaterialColors.registerMaterialColors(); + if (FMLLaunchHandler.side().isClient()) { IC2ClassicRegistration.registerRenderersItem(); } } + // IndustrialCraft 2 Experimental + if (Loader.isModLoaded("ic2") && !Loader.isModLoaded("ic2-classic-spmod") && BEConfig.mod_integration_settings.IC2_INTEGRATION) { + IC2ExperimentalRegistration.registerItems(event); + IC2ExperimentalMaterialColors.registerMaterialColors(); + + if (FMLLaunchHandler.side().isClient()) { + IC2ExperimentalRegistration.registerRenderersItem(); + } + } + // Project Red if (Loader.isModLoaded("projectred-exploration") && BEConfig.mod_integration_settings.PROJECT_RED_INTEGRATION) { ProjectRedRegistration.registerItems(event); ProjectRedMaterialColors.registerMaterialColors(); + if (FMLLaunchHandler.side().isClient()) { ProjectRedRegistration.registerRenderersItem(); } @@ -64,6 +79,7 @@ public static void registerItems(RegistryEvent.Register event) { if (Loader.isModLoaded("railcraft") && BEConfig.mod_integration_settings.RAILCRAFT_INTEGRATION) { RailcraftRegistration.registerItems(event); RailcraftMaterialColors.registerMaterialColors(); + if (FMLLaunchHandler.side().isClient()) { RailcraftRegistration.registerRenderersItem(); } @@ -73,6 +89,7 @@ public static void registerItems(RegistryEvent.Register event) { if (Loader.isModLoaded("thaumcraft") && BEConfig.mod_integration_settings.THAUMCRAFT_INTEGRATION) { ThaumcraftRegistration.registerItems(event); ThaumcraftMaterialColors.registerMaterialColors(); + if (FMLLaunchHandler.side().isClient()) { ThaumcraftRegistration.registerRenderersItem(); } @@ -84,9 +101,12 @@ public static void registerRecipes(RegistryEvent.Register event) { // Galacticraft Legacy if (Loader.isModLoaded("galacticraftcore") && (Loader.isModLoaded("galacticraftplanets") && BEConfig.mod_integration_settings.GALACTICRAFT_INTEGRATION)) GalacticraftRegistration.registerRecipes(event); - // Industrial Craft 2 Classic - if (Loader.isModLoaded("ic2-classic-spmod") && BEConfig.mod_integration_settings.IC2_CLASSIC_INTEGRATION) + // IndustrialCraft 2 Classic + if (Loader.isModLoaded("ic2-classic-spmod") && BEConfig.mod_integration_settings.IC2_INTEGRATION) IC2ClassicRegistration.registerRecipes(event); + // IndustrialCraft 2 Experimental + if (Loader.isModLoaded("ic2") && !Loader.isModLoaded("ic2-classic-spmod") && BEConfig.mod_integration_settings.IC2_INTEGRATION) + IC2ExperimentalRegistration.registerRecipes(event); // Project Red if (Loader.isModLoaded("projectred-exploration") && BEConfig.mod_integration_settings.PROJECT_RED_INTEGRATION) ProjectRedRegistration.registerRecipes(event); diff --git a/src/main/java/mod/emt/balkonsexpansion/compat/ic2classic/IC2ClassicRegistration.java b/src/main/java/mod/emt/balkonsexpansion/compat/ic2classic/IC2ClassicRegistration.java index 97053b1..e5d7d09 100644 --- a/src/main/java/mod/emt/balkonsexpansion/compat/ic2classic/IC2ClassicRegistration.java +++ b/src/main/java/mod/emt/balkonsexpansion/compat/ic2classic/IC2ClassicRegistration.java @@ -30,7 +30,7 @@ public class IC2ClassicRegistration { public static void registerItems(RegistryEvent.Register event) { IForgeRegistry registry = event.getRegistry(); - if (BEConfig.ic2_classic_settings.IC2C_BRONZE_MATERIAL) { + if (BEConfig.ic2_settings.IC2_BRONZE_MATERIAL) { registry.register(spearBronze = BEItemBuilder.createCustomSpear("spear.bronze.ic2c", ToolHelper.bronzeToolMaterial, -0.15F, 1.0F)); registry.register(halberdBronze = BEItemBuilder.createCustomHalberd("halberd.bronze.ic2c", ToolHelper.bronzeToolMaterial, 0.4F, 1.0F)); registry.register(battleaxeBronze = BEItemBuilder.createCustomBattleaxe("battleaxe.bronze.ic2c", ToolHelper.bronzeToolMaterial, 0.25F, 1.0F)); @@ -47,7 +47,7 @@ public static void registerItems(RegistryEvent.Register event) { public static void registerRecipes(RegistryEvent.Register event) { IForgeRegistry registry = event.getRegistry(); - if (BEConfig.ic2_classic_settings.IC2C_BRONZE_MATERIAL) { + if (BEConfig.ic2_settings.IC2_BRONZE_MATERIAL) { registry.register(BERecipes.registerBattleaxeRecipe("ingotBronze", "stickWood", battleaxeBronze)); registry.register(BERecipes.registerBoomerangRecipe("ingotBronze", "plankWood", boomerangBronze)); registry.register(BERecipes.registerBayonetRecipe(knifeBronze, bayonetBronze)); @@ -65,7 +65,7 @@ public static void registerRecipes(RegistryEvent.Register event) { @SideOnly(Side.CLIENT) public static void registerRenderersItem() { - if (BEConfig.ic2_classic_settings.IC2C_BRONZE_MATERIAL) { + if (BEConfig.ic2_settings.IC2_BRONZE_MATERIAL) { BERegistry.registerWeaponItemModel(battleaxeBronze); BERegistry.registerWeaponItemModel(boomerangBronze); BERegistry.registerWeaponItemModel(bayonetBronze); diff --git a/src/main/java/mod/emt/balkonsexpansion/compat/ic2experimental/IC2ExperimentalMaterialColors.java b/src/main/java/mod/emt/balkonsexpansion/compat/ic2experimental/IC2ExperimentalMaterialColors.java new file mode 100644 index 0000000..25183d5 --- /dev/null +++ b/src/main/java/mod/emt/balkonsexpansion/compat/ic2experimental/IC2ExperimentalMaterialColors.java @@ -0,0 +1,44 @@ +package mod.emt.balkonsexpansion.compat.ic2experimental; + +import ckathode.weaponmod.entity.projectile.ICustomProjectileMaterials; +import ckathode.weaponmod.entity.projectile.MaterialRegistry; +import ckathode.weaponmod.item.IItemWeapon; +import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemStack; + +// Some entities of BWM: Legacy such as flails can change their color, which is what this is used for. +public class IC2ExperimentalMaterialColors { + public static final int MATERIAL_BRONZE = ToolMaterial.valueOf("IC2_BRONZE").ordinal(); + + public static void registerMaterialColors() { + MaterialRegistry.registerCustomProjectileMaterial(new ICustomProjectileMaterials() { + @Override + public int[] getAllMaterialIDs() { + return new int[]{MATERIAL_BRONZE}; + } + + @Override + public int getMaterialID(ItemStack itemStack) { + if (itemStack != null && itemStack.getItem() instanceof IItemWeapon) { + IItemWeapon weapon = ((IItemWeapon) itemStack.getItem()); + + if (weapon.getMeleeComponent() != null) { + if (weapon.getMeleeComponent().weaponMaterial == ToolMaterial.valueOf("IC2_BRONZE")) + return MATERIAL_BRONZE; + } + } + + return -1; + } + + @Override + public float[] getColorFromMaterialID(int i) { + // The color for the given item tier must be returned as + // {R,G,B}, where each value is between 0 and 1. + if (i == MATERIAL_BRONZE) return new float[]{0.78F, 0.345F, 0.173F}; + + return null; + } + }); + } +} diff --git a/src/main/java/mod/emt/balkonsexpansion/compat/ic2experimental/IC2ExperimentalRegistration.java b/src/main/java/mod/emt/balkonsexpansion/compat/ic2experimental/IC2ExperimentalRegistration.java new file mode 100644 index 0000000..0acfab0 --- /dev/null +++ b/src/main/java/mod/emt/balkonsexpansion/compat/ic2experimental/IC2ExperimentalRegistration.java @@ -0,0 +1,80 @@ +package mod.emt.balkonsexpansion.compat.ic2experimental; + +import mod.emt.balkonsexpansion.BEConfig; +import mod.emt.balkonsexpansion.BEItemBuilder; +import mod.emt.balkonsexpansion.BERecipes; +import mod.emt.balkonsexpansion.BERegistry; +import mod.emt.balkonsexpansion.item.BEItemFlail; +import mod.emt.balkonsexpansion.item.BEItemMelee; +import mod.emt.balkonsexpansion.item.BEItemMusket; +import net.minecraft.item.Item; +import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.registries.IForgeRegistry; + +public class IC2ExperimentalRegistration { + public static BEItemMelee battleaxeBronze; + public static BEItemMelee boomerangBronze; + public static BEItemMusket bayonetBronze; + public static BEItemFlail flailBronze; + public static BEItemMelee halberdBronze; + public static BEItemMelee katanaBronze; + public static BEItemMelee knifeBronze; + public static BEItemMelee spearBronze; + public static BEItemMelee warhammerBronze; + + public static void registerItems(RegistryEvent.Register event) { + IForgeRegistry registry = event.getRegistry(); + + if (BEConfig.ic2_settings.IC2_BRONZE_MATERIAL) { + registry.register(spearBronze = BEItemBuilder.createCustomSpear("spear.bronze.ic2e", ToolMaterial.valueOf("IC2_BRONZE"), -0.15F, 1.0F)); + registry.register(halberdBronze = BEItemBuilder.createCustomHalberd("halberd.bronze.ic2e", ToolMaterial.valueOf("IC2_BRONZE"), 0.4F, 1.0F)); + registry.register(battleaxeBronze = BEItemBuilder.createCustomBattleaxe("battleaxe.bronze.ic2e", ToolMaterial.valueOf("IC2_BRONZE"), 0.25F, 1.0F)); + registry.register(knifeBronze = BEItemBuilder.createCustomKnife("knife.bronze.ic2e", ToolMaterial.valueOf("IC2_BRONZE"), -0.15F)); + registry.register(warhammerBronze = BEItemBuilder.createCustomWarhammer("warhammer.bronze.ic2e", ToolMaterial.valueOf("IC2_BRONZE"), 0.55F)); + registry.register(flailBronze = BEItemBuilder.createCustomFlail("flail.bronze.ic2e", ToolMaterial.valueOf("IC2_BRONZE"))); + registry.register(katanaBronze = BEItemBuilder.createCustomKatana("katana.bronze.ic2e", ToolMaterial.valueOf("IC2_BRONZE"))); + registry.register(boomerangBronze = BEItemBuilder.createCustomBoomerang("boomerang.bronze.ic2e", ToolMaterial.valueOf("IC2_BRONZE"), 0.1F)); + registry.register(bayonetBronze = BEItemBuilder.createCustomMusketBayonet("musketbayonet.bronze.ic2e", ToolMaterial.valueOf("IC2_BRONZE"), knifeBronze, -0.15F)); + } + } + + @SubscribeEvent + public static void registerRecipes(RegistryEvent.Register event) { + IForgeRegistry registry = event.getRegistry(); + + if (BEConfig.ic2_settings.IC2_BRONZE_MATERIAL) { + registry.register(BERecipes.registerBattleaxeRecipe("ingotBronze", "stickWood", battleaxeBronze)); + registry.register(BERecipes.registerBoomerangRecipe("ingotBronze", "plankWood", boomerangBronze)); + registry.register(BERecipes.registerBayonetRecipe(knifeBronze, bayonetBronze)); + registry.register(BERecipes.registerFlailRecipe("ingotBronze", "stickWood", "string", flailBronze)); + registry.register(BERecipes.registerHalberdRecipe("ingotBronze", "stickWood", halberdBronze)); + registry.register(BERecipes.registerKatanaRecipe("ingotBronze", "stickWood", katanaBronze)); + registry.register(BERecipes.registerKnifeRecipe("ingotBronze", "stickWood", knifeBronze)); + registry.register(BERecipes.registerKnifeAltRecipe("ingotBronze", "stickWood", knifeBronze)); + registry.register(BERecipes.registerSpearRecipe("ingotBronze", "stickWood", spearBronze)); + registry.register(BERecipes.registerWarhammerRecipe("ingotBronze", "stickWood", warhammerBronze)); + } + + // IC2 Classic tools have no smelting recipes so none needs to be added. + } + + @SideOnly(Side.CLIENT) + public static void registerRenderersItem() { + if (BEConfig.ic2_settings.IC2_BRONZE_MATERIAL) { + BERegistry.registerWeaponItemModel(battleaxeBronze); + BERegistry.registerWeaponItemModel(boomerangBronze); + BERegistry.registerWeaponItemModel(bayonetBronze); + BERegistry.registerWeaponItemModel(flailBronze); + BERegistry.registerWeaponItemModel(halberdBronze); + BERegistry.registerWeaponItemModel(katanaBronze); + BERegistry.registerWeaponItemModel(knifeBronze); + BERegistry.registerWeaponItemModel(spearBronze); + BERegistry.registerWeaponItemModel(warhammerBronze); + } + } +} diff --git a/src/main/resources/assets/balkonsexpansion/lang/en_us.lang b/src/main/resources/assets/balkonsexpansion/lang/en_us.lang index 3562f29..51ec6e0 100644 --- a/src/main/resources/assets/balkonsexpansion/lang/en_us.lang +++ b/src/main/resources/assets/balkonsexpansion/lang/en_us.lang @@ -27,7 +27,7 @@ item.warhammer.desh.name=Desh Warhammer item.warhammer.heavy_duty.name=Heavy Duty Warhammer item.warhammer.titanium.name=Titanium Warhammer -# Industrial Craft 2 Classic +# IndustrialCraft 2 Classic item.battleaxe.bronze.ic2c.name=Bronze Battleaxe item.boomerang.bronze.ic2c.name=Bronze Boomerang item.flail.bronze.ic2c.name=Bronze Flail @@ -38,6 +38,17 @@ item.musketbayonet.bronze.ic2c.name=Musket with Bronze Bayonet item.spear.bronze.ic2c.name=Bronze Spear item.warhammer.bronze.ic2c.name=Bronze Warhammer +# IndustrialCraft 2 Experimental +item.battleaxe.bronze.ic2e.name=Bronze Battleaxe +item.boomerang.bronze.ic2e.name=Bronze Boomerang +item.flail.bronze.ic2e.name=Bronze Flail +item.halberd.bronze.ic2e.name=Bronze Halberd +item.katana.bronze.ic2e.name=Bronze Katana +item.knife.bronze.ic2e.name=Bronze Knife +item.musketbayonet.bronze.ic2e.name=Musket with Bronze Bayonet +item.spear.bronze.ic2e.name=Bronze Spear +item.warhammer.bronze.ic2e.name=Bronze Warhammer + # Mo' Creatures Extended item.battleaxe.ancient_silver.name=Ancient Silver Battleaxe item.battleaxe.dark_scorpion.name=Dark Scorpion Battleaxe diff --git a/src/main/resources/assets/balkonsexpansion/models/item/battleaxe.bronze.ic2e.block.json b/src/main/resources/assets/balkonsexpansion/models/item/battleaxe.bronze.ic2e.block.json new file mode 100644 index 0000000..c541176 --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/battleaxe.bronze.ic2e.block.json @@ -0,0 +1,6 @@ +{ + "parent": "weaponmod:item/handheld_block", + "textures": { + "layer0": "balkonsexpansion:ic2/items/battleaxe.bronze" + } +} diff --git a/src/main/resources/assets/balkonsexpansion/models/item/battleaxe.bronze.ic2e.json b/src/main/resources/assets/balkonsexpansion/models/item/battleaxe.bronze.ic2e.json new file mode 100644 index 0000000..a34a217 --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/battleaxe.bronze.ic2e.json @@ -0,0 +1,14 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "balkonsexpansion:ic2/items/battleaxe.bronze" + }, + "overrides": [ + { + "predicate": { + "weaponmod:block": 1 + }, + "model": "balkonsexpansion:item/battleaxe.bronze.ic2e.block" + } + ] +} diff --git a/src/main/resources/assets/balkonsexpansion/models/item/boomerang.bronze.ic2e.json b/src/main/resources/assets/balkonsexpansion/models/item/boomerang.bronze.ic2e.json new file mode 100644 index 0000000..1cf72e3 --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/boomerang.bronze.ic2e.json @@ -0,0 +1,14 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "balkonsexpansion:ic2/items/boomerang.bronze" + }, + "overrides": [ + { + "predicate": { + "weaponmod:ready-to-throw": 1 + }, + "model": "balkonsexpansion:item/boomerang.bronze.ic2e_ready" + } + ] +} diff --git a/src/main/resources/assets/balkonsexpansion/models/item/boomerang.bronze.ic2e_ready.json b/src/main/resources/assets/balkonsexpansion/models/item/boomerang.bronze.ic2e_ready.json new file mode 100644 index 0000000..bec8e21 --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/boomerang.bronze.ic2e_ready.json @@ -0,0 +1,6 @@ +{ + "parent": "weaponmod:item/handheld_block", + "textures": { + "layer0": "balkonsexpansion:ic2/items/boomerang.bronze" + } +} diff --git a/src/main/resources/assets/balkonsexpansion/models/item/flail.bronze.ic2e-thrown.json b/src/main/resources/assets/balkonsexpansion/models/item/flail.bronze.ic2e-thrown.json new file mode 100644 index 0000000..1e01724 --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/flail.bronze.ic2e-thrown.json @@ -0,0 +1,6 @@ +{ + "parent": "balkonsexpansion:item/flail.bronze.ic2e", + "textures": { + "layer0": "weaponmod:items/flail-thrown" + } +} diff --git a/src/main/resources/assets/balkonsexpansion/models/item/flail.bronze.ic2e.json b/src/main/resources/assets/balkonsexpansion/models/item/flail.bronze.ic2e.json new file mode 100644 index 0000000..2085a29 --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/flail.bronze.ic2e.json @@ -0,0 +1,14 @@ +{ + "parent": "weaponmod:item/handheld_rod", + "textures": { + "layer0": "balkonsexpansion:ic2/items/flail.bronze" + }, + "overrides": [ + { + "predicate": { + "weaponmod:thrown": 1 + }, + "model": "balkonsexpansion:item/flail.bronze.ic2e-thrown" + } + ] +} diff --git a/src/main/resources/assets/balkonsexpansion/models/item/halberd.bronze.ic2e.json b/src/main/resources/assets/balkonsexpansion/models/item/halberd.bronze.ic2e.json new file mode 100644 index 0000000..590f713 --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/halberd.bronze.ic2e.json @@ -0,0 +1,50 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "balkonsexpansion:ic2/items/halberd.bronze" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ + 20, + -90, + 55 + ], + "translation": [ + 0, + 3.0, + 2.0 + ], + "scale": [ + 1.7, + 1.7, + 1.7 + ] + }, + "thirdperson_lefthand": { + "rotation": [ + 20, + 90, + -55 + ], + "translation": [ + 0, + 3.0, + 2.0 + ], + "scale": [ + 1.7, + 1.7, + 1.7 + ] + } + }, + "overrides": [ + { + "predicate": { + "weaponmod:state": 1 + }, + "model": "balkonsexpansion:item/halberd.bronze.ic2e_state" + } + ] +} diff --git a/src/main/resources/assets/balkonsexpansion/models/item/halberd.bronze.ic2e_state.json b/src/main/resources/assets/balkonsexpansion/models/item/halberd.bronze.ic2e_state.json new file mode 100644 index 0000000..1a78962 --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/halberd.bronze.ic2e_state.json @@ -0,0 +1,76 @@ +{ + "parent": "balkonsexpansion:item/halberd.bronze.ic2e", + "textures": { + "layer0": "balkonsexpansion:ic2/items/halberd.bronze" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ + 0, + 90, + 35 + ], + "translation": [ + 0, + 3.0, + 1 + ], + "scale": [ + 1.7, + 1.7, + 1.7 + ] + }, + "thirdperson_lefthand": { + "rotation": [ + 0, + -90, + -35 + ], + "translation": [ + 0, + 3.0, + 1 + ], + "scale": [ + 1.7, + 1.7, + 1.7 + ] + }, + "firstperson_righthand": { + "rotation": [ + 0, + 90, + 25 + ], + "translation": [ + 0.50, + 3.2, + 0.0 + ], + "scale": [ + 0.68, + 0.68, + 0.68 + ] + }, + "firstperson_lefthand": { + "rotation": [ + 0, + -90, + -25 + ], + "translation": [ + 0.50, + 3.2, + 0.0 + ], + "scale": [ + 0.68, + 0.68, + 0.68 + ] + } + } +} diff --git a/src/main/resources/assets/balkonsexpansion/models/item/katana.bronze.ic2e.block.json b/src/main/resources/assets/balkonsexpansion/models/item/katana.bronze.ic2e.block.json new file mode 100644 index 0000000..8d983b0 --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/katana.bronze.ic2e.block.json @@ -0,0 +1,6 @@ +{ + "parent": "weaponmod:item/handheld_block", + "textures": { + "layer0": "balkonsexpansion:ic2/items/katana.bronze" + } +} diff --git a/src/main/resources/assets/balkonsexpansion/models/item/katana.bronze.ic2e.json b/src/main/resources/assets/balkonsexpansion/models/item/katana.bronze.ic2e.json new file mode 100644 index 0000000..097d1e8 --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/katana.bronze.ic2e.json @@ -0,0 +1,14 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "balkonsexpansion:ic2/items/katana.bronze" + }, + "overrides": [ + { + "predicate": { + "weaponmod:block": 1 + }, + "model": "balkonsexpansion:item/katana.bronze.ic2e.block" + } + ] +} diff --git a/src/main/resources/assets/balkonsexpansion/models/item/knife.bronze.ic2e.json b/src/main/resources/assets/balkonsexpansion/models/item/knife.bronze.ic2e.json new file mode 100644 index 0000000..19fee87 --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/knife.bronze.ic2e.json @@ -0,0 +1,6 @@ +{ + "parent": "weaponmod:item/handheld_short", + "textures": { + "layer0": "balkonsexpansion:ic2/items/knife.bronze" + } +} diff --git a/src/main/resources/assets/balkonsexpansion/models/item/musketbayonet.bronze.ic2e.json b/src/main/resources/assets/balkonsexpansion/models/item/musketbayonet.bronze.ic2e.json new file mode 100644 index 0000000..4d31259 --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/musketbayonet.bronze.ic2e.json @@ -0,0 +1,50 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "balkonsexpansion:ic2/items/musketbayonet.bronze" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ + 10, + -90, + 55 + ], + "translation": [ + 0, + 2.0, + 0.5 + ], + "scale": [ + 0.85, + 0.85, + 0.85 + ] + }, + "thirdperson_lefthand": { + "rotation": [ + 10, + 90, + -55 + ], + "translation": [ + 0, + 2.0, + 0.5 + ], + "scale": [ + 0.85, + 0.85, + 0.85 + ] + } + }, + "overrides": [ + { + "predicate": { + "weaponmod:reload": 1 + }, + "model": "balkonsexpansion:item/musketbayonet.bronze.ic2e_reload" + } + ] +} diff --git a/src/main/resources/assets/balkonsexpansion/models/item/musketbayonet.bronze.ic2e_reload.json b/src/main/resources/assets/balkonsexpansion/models/item/musketbayonet.bronze.ic2e_reload.json new file mode 100644 index 0000000..4f969ce --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/musketbayonet.bronze.ic2e_reload.json @@ -0,0 +1,42 @@ +{ + "parent": "weaponmod:item/handheld_block", + "textures": { + "layer0": "balkonsexpansion:ic2/items/musketbayonet.bronze" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ + 40, + -40, + 65 + ], + "translation": [ + -2.5, + 2.0, + 1.2 + ], + "scale": [ + 0.85, + 0.85, + 0.85 + ] + }, + "thirdperson_lefthand": { + "rotation": [ + 40, + 140, + -65 + ], + "translation": [ + -2.5, + 2.0, + 1.2 + ], + "scale": [ + 0.85, + 0.85, + 0.85 + ] + } + } +} diff --git a/src/main/resources/assets/balkonsexpansion/models/item/spear.bronze.ic2e.json b/src/main/resources/assets/balkonsexpansion/models/item/spear.bronze.ic2e.json new file mode 100644 index 0000000..11e4e7f --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/spear.bronze.ic2e.json @@ -0,0 +1,42 @@ +{ + "parent": "weaponmod:item/handheld_short", + "textures": { + "layer0": "balkonsexpansion:ic2/items/spear.bronze" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ + 0, + 90, + 35 + ], + "translation": [ + 0, + 3.0, + 1 + ], + "scale": [ + 1.7, + 1.7, + 1.7 + ] + }, + "thirdperson_lefthand": { + "rotation": [ + 0, + -90, + -35 + ], + "translation": [ + 0, + 3.0, + 1 + ], + "scale": [ + 1.7, + 1.7, + 1.7 + ] + } + } +} diff --git a/src/main/resources/assets/balkonsexpansion/models/item/warhammer.bronze.ic2e.json b/src/main/resources/assets/balkonsexpansion/models/item/warhammer.bronze.ic2e.json new file mode 100644 index 0000000..f67e9a3 --- /dev/null +++ b/src/main/resources/assets/balkonsexpansion/models/item/warhammer.bronze.ic2e.json @@ -0,0 +1,6 @@ +{ + "parent": "item/handheld", + "textures": { + "layer0": "balkonsexpansion:ic2/items/warhammer.bronze" + } +}