diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index 8b71c3b5f..27dbccb8c 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -89,6 +89,7 @@ public class ModItems { public static final RegistryObject SENPAI_SPAWN_EGG = ITEMS.register("senpai_spawn_egg", () -> new ForgeSpawnEggItem(ModEntities.SENPAI, -11584987, -14014413, new Item.Properties())); public static final RegistryObject MK_42_SPAWN_EGG = ITEMS.register("mk42_spawn_egg", () -> new ForgeSpawnEggItem(ModEntities.MK_42, -8348258, -2630437, new Item.Properties())); public static final RegistryObject MLE_1934_SPAWN_EGG = ITEMS.register("mle1934_spawn_egg", () -> new ForgeSpawnEggItem(ModEntities.MLE_1934, -3355444, -14146005, new Item.Properties())); + public static final RegistryObject ANCIENT_CPU = ITEMS.register("ancient_cpu", () -> new Item(new Item.Properties().rarity(Rarity.RARE))); public static final RegistryObject DRONE = ITEMS.register("drone", Drone::new); public static final RegistryObject MONITOR = ITEMS.register("monitor", Monitor::new); diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index d0ee37651..eee6151dc 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -125,6 +125,7 @@ "item.superbwarfare.he_5_inches": "HE Shell", "item.superbwarfare.ap_5_inches": "AP Shell", + "item.superbwarfare.ancient_cpu": "Ancient CPU", "item.superbwarfare.target_deployer": "Target", "item.superbwarfare.senpai_spawn_egg": "Senpai Spawn Egg", "item.superbwarfare.light_saber": "Light Saber", @@ -150,7 +151,6 @@ "attribute.superbwarfare.spread": "Spread", - "block.superbwarfare.gun_recycle": "Gun Recycle Table", "block.superbwarfare.jump_pad": "Jump Pad", "block.superbwarfare.sandbag": "Sandbag", "block.superbwarfare.barbed_wire": "Barbed Wire", @@ -314,8 +314,5 @@ "des.superbwarfare.drone.kamikaze": "KAMIKAZE", "des.superbwarfare.drone.warning": "WARNING!", - "container.superbwarfare.reforging_table": "Gun Reforge Table", - "button.superbwarfare.downgrade": "↓", - "button.superbwarfare.upgrade": "↑", - "button.superbwarfare.reforge": "Reforge" + "container.superbwarfare.reforging_table": "Gun Reforge Table" } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index ef86d2389..c15bad9fc 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -125,6 +125,7 @@ "item.superbwarfare.he_5_inches": "高爆弹", "item.superbwarfare.ap_5_inches": "穿甲弹", + "item.superbwarfare.ancient_cpu": "古代处理器", "item.superbwarfare.target_deployer": "标靶", "item.superbwarfare.senpai_spawn_egg": "野兽先辈刷怪蛋", "item.superbwarfare.light_saber": "光剑", @@ -150,7 +151,6 @@ "attribute.superbwarfare.spread": "散布", - "block.superbwarfare.gun_recycle": "枪械拆解台", "block.superbwarfare.jump_pad": "弹射台", "block.superbwarfare.sandbag": "沙袋", "block.superbwarfare.barbed_wire": "铁丝网", @@ -314,8 +314,5 @@ "des.superbwarfare.drone.kamikaze": "自爆模式", "des.superbwarfare.drone.warning": "警告!", - "container.superbwarfare.reforging_table": "枪械重铸台", - "button.superbwarfare.downgrade": "↓", - "button.superbwarfare.upgrade": "↑", - "button.superbwarfare.reforge": "重铸" + "container.superbwarfare.reforging_table": "枪械重铸台" } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/ancient_cpu.json b/src/main/resources/assets/superbwarfare/models/item/ancient_cpu.json new file mode 100644 index 000000000..76de3c0b6 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/ancient_cpu.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/ancient_cpu" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/item/ancient_cpu.png b/src/main/resources/assets/superbwarfare/textures/item/ancient_cpu.png new file mode 100644 index 000000000..de9a7ce2e Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/ancient_cpu.png differ diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/ancient_cpu_chest.json b/src/main/resources/data/superbwarfare/loot_modifiers/ancient_cpu_chest.json new file mode 100644 index 000000000..f9e961f6f --- /dev/null +++ b/src/main/resources/data/superbwarfare/loot_modifiers/ancient_cpu_chest.json @@ -0,0 +1,10 @@ +{ + "type": "superbwarfare:superbwarfare_loot_modifier", + "conditions": [ + { + "condition": "forge:loot_table_id", + "loot_table_id": "minecraft:chests/ancient_city" + } + ], + "lootTable": "superbwarfare:chests/ancient_cpu" +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/ancient_cpu.json b/src/main/resources/data/superbwarfare/loot_tables/chests/ancient_cpu.json new file mode 100644 index 000000000..0c87d4a99 --- /dev/null +++ b/src/main/resources/data/superbwarfare/loot_tables/chests/ancient_cpu.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "rolls": 1, + "bonus_rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "superbwarfare:ancient_cpu" + } + ], + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.2 + } + ] + } + ], + "random_sequence": "superbwarfare:chests/ancient_cpu" +} \ No newline at end of file