diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index 76bfdb916..b7c9c5a37 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -97,6 +97,8 @@ public class ModItems { public static final RegistryObject MORTAR_BIPOD = ITEMS.register("mortar_bipod", () -> new Item(new Item.Properties())); public static final RegistryObject FUSEE = ITEMS.register("fusee", () -> new Item(new Item.Properties())); public static final RegistryObject PRIMER = ITEMS.register("primer", () -> new Item(new Item.Properties())); + public static final RegistryObject AP_HEAD = ITEMS.register("ap_head", () -> new Item(new Item.Properties())); + public static final RegistryObject HE_HEAD = ITEMS.register("he_head", () -> new Item(new Item.Properties())); public static final RegistryObject SOUL_STEEL_NUGGET = ITEMS.register("soul_steel_nugget", () -> new Item(new Item.Properties())); public static final RegistryObject COPPERPLATE = ITEMS.register("copperplate", () -> new Item(new Item.Properties())); public static final RegistryObject INGOT_STEEL = ITEMS.register("ingot_steel", () -> new Item(new Item.Properties())); @@ -104,6 +106,8 @@ public class ModItems { public static final RegistryObject TUNGSTEN_INGOT = ITEMS.register("tungsten_ingot", () -> new Item(new Item.Properties())); public static final RegistryObject CEMENTED_CARBIDE_INGOT = ITEMS.register("cemented_carbide_ingot", () -> new Item(new Item.Properties())); public static final RegistryObject SOUL_STEEL_INGOT = ITEMS.register("soul_steel_ingot", () -> new Item(new Item.Properties())); + public static final RegistryObject HIGH_ENERGY_EXPLOSIVES = ITEMS.register("high_energy_explosives", () -> new Item(new Item.Properties())); + public static final RegistryObject GRAIN = ITEMS.register("grain", () -> new Item(new Item.Properties())); public static final RegistryObject IRON_POWDER = ITEMS.register("iron_powder", () -> new Item(new Item.Properties())); public static final RegistryObject TUNGSTEN_POWDER = ITEMS.register("tungsten_powder", () -> new Item(new Item.Properties())); public static final RegistryObject COAL_POWDER = ITEMS.register("coal_powder", () -> new Item(new Item.Properties())); @@ -118,6 +122,7 @@ public class ModItems { public static final RegistryObject DOG_TAG = ITEMS.register("dog_tag", DogTag::new); public static final RegistryObject SHIELD_CELL = ITEMS.register("shield_cell", () -> new Item(new Item.Properties().rarity(Rarity.RARE))); + public static final RegistryObject TUNGSTEN_ROD = ITEMS.register("tungsten_rod", () -> new Item(new Item.Properties())); public static final RegistryObject IRON_BARREL = ITEMS.register("iron_barrel", () -> new Item(new Item.Properties())); public static final RegistryObject IRON_ACTION = ITEMS.register("iron_action", () -> new Item(new Item.Properties())); public static final RegistryObject IRON_TRIGGER = ITEMS.register("iron_trigger", () -> new Item(new Item.Properties())); diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 085ea3635..ce38625cc 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -122,6 +122,8 @@ "item.superbwarfare.claymore_mine": "Claymore", "item.superbwarfare.fusee": "Fusee", "item.superbwarfare.primer": "Primer", + "item.superbwarfare.ap_head": "AP Warhead", + "item.superbwarfare.he_head": "HE Warhead", "item.superbwarfare.dog_tag": "Dog Tag", "curios.identifier.dog_tag": "Dog Tag", "item.superbwarfare.shield_cell": "Cell", @@ -143,6 +145,9 @@ "block.superbwarfare.deepslate_scheelite_ore": "Deepslate Scheelite 0re", "block.superbwarfare.deepslate_galena_ore": "Deepslate Galena 0re", + "item.superbwarfare.high_energy_explosives": "High Energy Explosives", + "item.superbwarfare.grain": "Grain", + "item.superbwarfare.tungsten_rod": "Tungsten Rod", "item.superbwarfare.coal_powder": "Coal Powder", "item.superbwarfare.iron_powder": "Iron Powder", "item.superbwarfare.coal_iron_powder": "Coal-Iron Powder", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 3b85ed3d8..595c15037 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -122,6 +122,8 @@ "item.superbwarfare.claymore_mine": "阔剑地雷", "item.superbwarfare.fusee": "引信", "item.superbwarfare.primer": "底火", + "item.superbwarfare.ap_head": "穿甲弹头", + "item.superbwarfare.he_head": "高爆弹头", "item.superbwarfare.dog_tag": "狗牌", "curios.identifier.dog_tag": "狗牌", "item.superbwarfare.shield_cell": "电池", @@ -143,6 +145,9 @@ "block.superbwarfare.deepslate_scheelite_ore": "深层白钨矿石", "block.superbwarfare.deepslate_galena_ore": "深层方铅矿石", + "item.superbwarfare.high_energy_explosives": "高能炸药", + "item.superbwarfare.grain": "推进药柱", + "item.superbwarfare.tungsten_rod": "钨棒", "item.superbwarfare.coal_powder": "煤粉", "item.superbwarfare.iron_powder": "铁粉", "item.superbwarfare.coal_iron_powder": "煤铁混合粉末", diff --git a/src/main/resources/assets/superbwarfare/models/item/ap_head.json b/src/main/resources/assets/superbwarfare/models/item/ap_head.json new file mode 100644 index 000000000..7b270ab68 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/ap_head.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/ap_head" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/grain.json b/src/main/resources/assets/superbwarfare/models/item/grain.json new file mode 100644 index 000000000..2dc1cd27e --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/grain.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/grain" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/he_head.json b/src/main/resources/assets/superbwarfare/models/item/he_head.json new file mode 100644 index 000000000..a15eacf5a --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/he_head.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/he_head" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/high_energy_explosives.json b/src/main/resources/assets/superbwarfare/models/item/high_energy_explosives.json new file mode 100644 index 000000000..690e18aa4 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/high_energy_explosives.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/high_energy_explosives" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/tungsten_rod.json b/src/main/resources/assets/superbwarfare/models/item/tungsten_rod.json new file mode 100644 index 000000000..892fcf205 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/tungsten_rod.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/tungsten_rod" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/item/ap_head.png b/src/main/resources/assets/superbwarfare/textures/item/ap_head.png new file mode 100644 index 000000000..18fca0758 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/ap_head.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/copper_plate.png b/src/main/resources/assets/superbwarfare/textures/item/copper_plate.png index b0270d15a..0f345f982 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/copper_plate.png and b/src/main/resources/assets/superbwarfare/textures/item/copper_plate.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/grain.png b/src/main/resources/assets/superbwarfare/textures/item/grain.png new file mode 100644 index 000000000..9658cb606 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/grain.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/he_head.png b/src/main/resources/assets/superbwarfare/textures/item/he_head.png new file mode 100644 index 000000000..77a5f96d2 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/he_head.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/high_energy_explosives.png b/src/main/resources/assets/superbwarfare/textures/item/high_energy_explosives.png new file mode 100644 index 000000000..6874c826f Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/high_energy_explosives.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/tungsten_rod.png b/src/main/resources/assets/superbwarfare/textures/item/tungsten_rod.png new file mode 100644 index 000000000..b7f20a87b Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/tungsten_rod.png differ diff --git a/src/main/resources/data/superbwarfare/recipes/ap_head_crafting.json b/src/main/resources/data/superbwarfare/recipes/ap_head_crafting.json new file mode 100644 index 000000000..b0c1949ba --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/ap_head_crafting.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + " b ", + "bdb", + "cac" + ], + "key": { + "a": { + "item": "superbwarfare:high_energy_explosives" + }, + "b": { + "item": "minecraft:iron_ingot" + }, + "c": { + "item": "superbwarfare:ingot_steel" + }, + "d": { + "item": "superbwarfare:tungsten_rod" + } + }, + "result": { + "item": "superbwarfare:ap_head", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/ap_shell_crafting.json b/src/main/resources/data/superbwarfare/recipes/ap_shell_crafting.json new file mode 100644 index 000000000..487b710c8 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/ap_shell_crafting.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "c", + "a", + "b" + ], + "key": { + "a": { + "item": "superbwarfare:ap_head" + }, + "b": { + "item": "superbwarfare:grain" + }, + "c": { + "item": "superbwarfare:fusee" + } + }, + "result": { + "item": "superbwarfare:ap_5_inches", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/grain_crafting.json b/src/main/resources/data/superbwarfare/recipes/grain_crafting.json new file mode 100644 index 000000000..7074c16f4 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/grain_crafting.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "aba", + "aba", + " c " + ], + "key": { + "a": { + "tag": "forge:plates/copper" + }, + "b": { + "item": "minecraft:gunpowder" + }, + "c": { + "item": "superbwarfare:primer" + } + }, + "result": { + "item": "superbwarfare:grain", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/granade_40mm.json b/src/main/resources/data/superbwarfare/recipes/granade_40mm.json index 64fd35eb2..6a9c2703b 100644 --- a/src/main/resources/data/superbwarfare/recipes/granade_40mm.json +++ b/src/main/resources/data/superbwarfare/recipes/granade_40mm.json @@ -14,7 +14,7 @@ "item": "minecraft:iron_ingot" }, "c": { - "item": "minecraft:tnt" + "item": "superbwarfare:high_energy_explosives" }, "d": { "item": "superbwarfare:primer" diff --git a/src/main/resources/data/superbwarfare/recipes/hang_grenade_crafting.json b/src/main/resources/data/superbwarfare/recipes/hang_grenade_crafting.json new file mode 100644 index 000000000..8c55404d2 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/hang_grenade_crafting.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + " a ", + "bcb", + "bcb" + ], + "key": { + "a": { + "item": "minecraft:tripwire_hook" + }, + "b": { + "item": "minecraft:iron_ingot" + }, + "c": { + "item": "superbwarfare:high_energy_explosives" + } + }, + "result": { + "item": "superbwarfare:hand_grenade", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/he_exp_crafting.json b/src/main/resources/data/superbwarfare/recipes/he_exp_crafting.json new file mode 100644 index 000000000..ea3daca57 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/he_exp_crafting.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "aba", + "cac", + "aba" + ], + "key": { + "a": { + "item": "minecraft:gunpowder" + }, + "b": { + "item": "minecraft:netherrack" + }, + "c": { + "item": "minecraft:blaze_powder" + } + }, + "result": { + "item": "superbwarfare:high_energy_explosives", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/he_head_crafting.json b/src/main/resources/data/superbwarfare/recipes/he_head_crafting.json new file mode 100644 index 000000000..9c7df384c --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/he_head_crafting.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + " b ", + "bab", + "cac" + ], + "key": { + "a": { + "item": "superbwarfare:high_energy_explosives" + }, + "b": { + "item": "minecraft:iron_ingot" + }, + "c": { + "item": "superbwarfare:ingot_steel" + } + }, + "result": { + "item": "superbwarfare:he_head", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/he_shell_crafting.json b/src/main/resources/data/superbwarfare/recipes/he_shell_crafting.json new file mode 100644 index 000000000..c5f1ec5a5 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/he_shell_crafting.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "c", + "a", + "b" + ], + "key": { + "a": { + "item": "superbwarfare:he_head" + }, + "b": { + "item": "superbwarfare:grain" + }, + "c": { + "item": "superbwarfare:fusee" + } + }, + "result": { + "item": "superbwarfare:he_5_inches", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/mortar_he_shells.json b/src/main/resources/data/superbwarfare/recipes/mortar_he_shells.json index 7f2d501d9..c5fa6b23a 100644 --- a/src/main/resources/data/superbwarfare/recipes/mortar_he_shells.json +++ b/src/main/resources/data/superbwarfare/recipes/mortar_he_shells.json @@ -11,13 +11,13 @@ "item": "superbwarfare:fusee" }, "b": { - "item": "minecraft:iron_ingot" + "item": "superbwarfare:ingot_steel" }, "c": { - "item": "minecraft:tnt" + "item": "superbwarfare:high_energy_explosives" }, "d": { - "item": "superbwarfare:primer" + "item": "superbwarfare:grain" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/rgo_grenade_crafting.json b/src/main/resources/data/superbwarfare/recipes/rgo_grenade_crafting.json new file mode 100644 index 000000000..85d5cb880 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/rgo_grenade_crafting.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "abc", + "aba", + " da" + ], + "key": { + "a": { + "item": "minecraft:iron_ingot" + }, + "b": { + "item": "superbwarfare:high_energy_explosives" + }, + "c": { + "item": "minecraft:tripwire_hook" + }, + "d": { + "item": "minecraft:stone_button" + } + }, + "result": { + "item": "superbwarfare:rgo_grenade", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/rocket_crafting.json b/src/main/resources/data/superbwarfare/recipes/rocket_crafting.json index f3d3bc634..532b08cc5 100644 --- a/src/main/resources/data/superbwarfare/recipes/rocket_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/rocket_crafting.json @@ -14,10 +14,10 @@ "item": "minecraft:iron_ingot" }, "c": { - "item": "minecraft:tnt" + "item": "superbwarfare:high_energy_explosives" }, "d": { - "item": "minecraft:firework_rocket" + "item": "superbwarfare:grain" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/tungsten_rod_crafting.json b/src/main/resources/data/superbwarfare/recipes/tungsten_rod_crafting.json new file mode 100644 index 000000000..86ae944fb --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/tungsten_rod_crafting.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "a", + "a" + ], + "key": { + "a": { + "tag": "forge:ingots/tungsten" + } + }, + "result": { + "item": "superbwarfare:tungsten_rod", + "count": 1 + } +} \ No newline at end of file